异物侵限报警修改

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

@@ -253,20 +253,27 @@ public class MsgAlarm extends BaseEntity implements Serializable {
     /**
      *所属工务段名称
      */
+    @Excel(name = "所属工务段")
     @TableField(exist = false)
     private String deptName;
 
     /**
      * 版本号
      */
-    @Excel(name = "版本号")
     @TableField(exist = false)
     private String versionNum;
 
     /**
      * 版本名称
      */
-    @Excel(name = "版本名称")
     @TableField(exist = false)
     private String versionName;
+
+    /**
+     * 相机序列号
+     */
+    @Excel(name = "设备序列号")
+    @TableField(exist = false)
+    private String cameraSn;
+
 }

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

@@ -240,4 +240,24 @@ public class MsgAlarmCloud extends BaseEntity implements Serializable {
      */
     @TableField(exist = false)
     private Integer failureToAlarm;
+
+    /**
+     *所属工务段名称
+     */
+    @TableField(exist = false)
+    private String deptName;
+
+    /**
+     * 版本号
+     */
+    @Excel(name = "版本号")
+    @TableField(exist = false)
+    private String versionNum;
+
+    /**
+     * 版本名称
+     */
+    @Excel(name = "版本名称")
+    @TableField(exist = false)
+    private String versionName;
 }

business-service/src/main/java/com/ozs/service/entity/vo/MsgAlarmResp.java

@@ -167,4 +167,14 @@ public class MsgAlarmResp implements Serializable {
 
     private String electricity;
 
+    /**
+     * 版本号
+     */
+    private String versionNum;
+
+    /**
+     * 版本名称
+     */
+    private String versionName;
+
 }

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

@@ -51,6 +51,6 @@ public class BaseDeviceResumeController extends BaseController {
                                    @RequestParam(value ="endTime", required = false) String endTime) {
         List<DeviceResumeResp> deviceResumeRespList = baseDeviceResumeService.exportDeviceResume(cameraCode, startTime, endTime);
         ExcelUtil<DeviceResumeResp> util = new ExcelUtil<>(DeviceResumeResp.class);
-        util.exportExcel(response, deviceResumeRespList, "设备状态履历数据导出失败");
+        util.exportExcel(response, deviceResumeRespList, "设备状态履历数据");
     }
 }

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

@@ -57,6 +57,6 @@ public class BaseElectricityResumeController extends BaseController {
                                    @RequestParam(value ="endTime", required = false) String endTime) {
         List<ElectricityResumeResp> electricityResumeRespList = baseElectricityResumeService.exportElectricityResume(cameraCode, startTime, endTime);
         ExcelUtil<ElectricityResumeResp> util = new ExcelUtil<>(ElectricityResumeResp.class);
-        util.exportExcel(response, electricityResumeRespList, "电池电量状态履历数据导出失败");
+        util.exportExcel(response, electricityResumeRespList, "电池电量状态履历数据");
     }
 }

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

@@ -21,6 +21,7 @@ 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.*;
+import com.ozs.service.mapper.BaseCameraVersionMapper;
 import com.ozs.service.mapper.MsgAlarmMapper;
 import com.ozs.service.service.*;
 import com.ozs.system.service.DataScoreUtil;
@@ -82,6 +83,8 @@ public class MsgAlarmController extends BaseController {
     private MsgAppPushService msgAppPushService;
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private BaseCameraVersionMapper baseCameraVersionMapper;
 
 
     /**
@@ -255,9 +258,7 @@ public class MsgAlarmController extends BaseController {
                     queryWrapper.eq(BaseRailwayManagement::getRailwayCode, cameraManagement.getRailwayCode());
                 }
                 BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
-                SysDept sysDept = deptService.selectDeptById(cameraManagement.getDeptId());
                 o.setRailwayName(baseRailwayManagement.getRailwayName());
-                o.setDeptName(sysDept.getDeptName());
                 if (StringUtils.isNotEmpty(o.getReleasedBy())) {
                     BaseUser user = baseUserService.getUser(o.getReleasedBy());
                     o.setReleasedByName(user.getNickName());
@@ -320,8 +321,9 @@ public class MsgAlarmController extends BaseController {
                 cameraManagementLambdaQueryWrapper.eq(BaseCameraManagement::getCameraCode, msgAlarm.getCameraCode());
             }
             BaseCameraManagement cameraManagement = baseCameraManagementService.getOne(cameraManagementLambdaQueryWrapper);
-            msgAlarm.setVersionNum(cameraManagement.getVersionNum());
-            msgAlarm.setVersionName(cameraManagement.getVersionName());
+            msgAlarm.setCameraSn(cameraManagement.getCameraSn());
+            SysDept sysDept = deptService.selectDeptById(cameraManagement.getDeptId());
+            msgAlarm.setDeptName(sysDept.getDeptName());
             LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
             if (!ObjectUtils.isEmpty(cameraManagement.getRailwayCode())) {
                 queryWrapper.eq(BaseRailwayManagement::getRailwayCode, cameraManagement.getRailwayCode());
@@ -466,6 +468,15 @@ 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 (!StringUtils.isEmpty(baseCameraVersion.getVersionNum())) {
+                    msgAlarmResp.setVersionNum(baseCameraVersion.getVersionNum());
+                }
+            }
             return AjaxResult.success(msgAlarmResp);
         } else {
             return success("无报警信息数据");