相机升级日志修改操作人

business-service/src/main/java/com/ozs/service/entity/CameraUpdateLog.java

@@ -66,6 +66,12 @@ public class CameraUpdateLog implements Serializable {
      */
     private String createBy;
 
+    /**
+     * 创建人名称
+     */
+    @TableField(exist = false)
+    private String createByName;
+
     /**
      * 创建时间
      */

hazard-admin/src/main/java/com/ozs/web/controller/monitor/CameraUpdateLogController.java

@@ -8,9 +8,11 @@ import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.enums.BusinessType;
 import com.ozs.common.utils.poi.ExcelUtil;
+import com.ozs.service.entity.BaseUser;
 import com.ozs.service.entity.CameraLogDetail;
 import com.ozs.service.entity.CameraUpdateLog;
 import com.ozs.service.entity.vo.CameraUpdateLogResp;
+import com.ozs.service.service.BaseUserService;
 import com.ozs.service.service.CameraLogDetailService;
 import com.ozs.service.service.CameraUpdateLogService;
 import com.ozs.system.service.ISysDictDataService;
@@ -24,6 +26,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.text.ParseException;
 import java.util.List;
@@ -44,6 +47,8 @@ public class CameraUpdateLogController extends BaseController {
     private CameraLogDetailService cameraLogDetailService;
     @Autowired
     private ISysDictDataService dictDataService;
+    @Resource
+    private BaseUserService baseUserService;
 
     /**
      * 获取相机升级日志分页列表
@@ -69,6 +74,8 @@ public class CameraUpdateLogController extends BaseController {
                 for (CameraUpdateLog li : list) {
                     if (li.getUpgradeType().equals(o.getUpgradeType())) {
                         o.setUpgradeTypeName(dictDataService.selectDictLabel("upgrade_type", String.valueOf(li.getUpgradeType())));
+                        BaseUser baseUser = baseUserService.getUser(o.getCreateBy());
+                        o.setCreateByName(baseUser.getUserName());
                     }
                 }
                 return o;