异物侵限报警修改

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/MsgAlarmController.java

@@ -10,14 +10,9 @@ import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.core.domain.entity.SysDept;
 import com.ozs.common.core.domain.entity.SysDictData;
-import com.ozs.common.core.domain.entity.SysDictType;
-import com.ozs.common.core.domain.entity.SysUser;
-import com.ozs.common.core.domain.model.LoginUser;
-import com.ozs.common.core.redis.RedisCache;
 import com.ozs.common.enums.BusinessType;
 import com.ozs.common.utils.AppendUtils;
 import com.ozs.common.utils.StringUtils;
-import com.ozs.common.utils.file.FileUtils;
 import com.ozs.common.utils.poi.ExcelUtil;
 import com.ozs.service.entity.*;
 import com.ozs.service.entity.vo.*;
@@ -83,9 +78,6 @@ public class MsgAlarmController extends BaseController {
     private MsgAppPushService msgAppPushService;
     @Autowired
     private RedisService redisService;
-    @Autowired
-    private BaseCameraVersionMapper baseCameraVersionMapper;
-
 
     /**
      * web更多消息-总数，已读数
@@ -468,15 +460,14 @@ public class MsgAlarmController extends BaseController {
             msgAlarmResp.setAlarmAttrName(stringBuilder);
             msgAlarmResp.setCardNum(baseCameraManagement.getCardNum());
             msgAlarmResp.setCameraSn(baseCameraManagement.getCameraSn());
-            BaseCameraVersion baseCameraVersion = baseCameraVersionMapper.selectById(baseCameraManagement.getId());
-            if (!ObjectUtils.isEmpty(baseCameraVersion)) {
-                if (!StringUtils.isEmpty(baseCameraVersion.getVersionName())) {
-                    msgAlarmResp.setVersionName(baseCameraVersion.getVersionName());
+            if (!ObjectUtils.isEmpty(baseCameraManagement)) {
+                if (!StringUtils.isEmpty(baseCameraManagement.getVersionName())) {
+                    msgAlarmResp.setVersionName(baseCameraManagement.getVersionName());
                 }else {
                     msgAlarmResp.setVersionName(" ");
                 }
-                if (!StringUtils.isEmpty(baseCameraVersion.getVersionNum())) {
-                    msgAlarmResp.setVersionNum(baseCameraVersion.getVersionNum());
+                if (!StringUtils.isEmpty(baseCameraManagement.getVersionNum())) {
+                    msgAlarmResp.setVersionNum(baseCameraManagement.getVersionNum());
                 }else {
                     msgAlarmResp.setVersionNum(" ");
                 }