异物侵限报警修改

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

@@ -175,7 +175,7 @@ public class MsgAlarmController extends BaseController {
         if (!ObjectUtils.isEmpty(msgAlarmVo.getEndMile())) {
             msgAlarmVo.setEndMile(msgAlarmVo.getEndMile() * 1000);
         }
-        IPage<MsgAlarm> page = msgAlarmService.queryPageHome(msgAlarmVo); 
+        IPage<MsgAlarm> page = msgAlarmService.queryPageHome(msgAlarmVo);
         page.setTotal(page.getTotal());
         page.setCurrent(page.getCurrent());
         page.setPages(page.getPages());
@@ -332,6 +332,16 @@ public class MsgAlarmController extends BaseController {
             }
             BaseCameraManagement cameraManagement = baseCameraManagementService.getOne(cameraManagementLambdaQueryWrapper);
             msgAlarm.setCameraSn(cameraManagement.getCameraSn());
+            if (!StringUtils.isEmpty(cameraManagement.getVersionName())) {
+                msgAlarm.setVersionName(cameraManagement.getVersionName());
+            } else {
+                msgAlarm.setVersionName(" ");
+            }
+            if (!StringUtils.isEmpty(cameraManagement.getVersionNum())) {
+                msgAlarm.setVersionNum(cameraManagement.getVersionNum());
+            } else {
+                msgAlarm.setVersionNum(" ");
+            }
             SysDept sysDept = deptService.selectDeptById(cameraManagement.getDeptId());
             msgAlarm.setDeptName(sysDept.getDeptName());
             LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
@@ -365,9 +375,9 @@ public class MsgAlarmController extends BaseController {
             if (msgAlarm.getLineDir() == 1) {
                 msgAlarm.setLineDirName("上行");
             } else if (msgAlarm.getLineDir() == 2) {
-                msgAlarm.setLineDirName( "下行");
+                msgAlarm.setLineDirName("下行");
             } else if (msgAlarm.getLineDir() == 3) {
-                msgAlarm.setLineDirName( "上下行");
+                msgAlarm.setLineDirName("上下行");
             }
 
 
@@ -413,7 +423,7 @@ public class MsgAlarmController extends BaseController {
             BeanUtils.copyProperties(msgAlarm, msgAlarmResp);
             msgAlarmResp.setRailwayName(baseRailwayManagement.getRailwayName());
             msgAlarmResp.setDeptId(baseCameraManagement.getDeptId());
-            if (!ObjectUtils.isEmpty(baseCameraManagement.getEndMile())&&!ObjectUtils.isEmpty(baseCameraManagement.getBeginMile())) {
+            if (!ObjectUtils.isEmpty(baseCameraManagement.getEndMile()) && !ObjectUtils.isEmpty(baseCameraManagement.getBeginMile())) {
                 String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
                 String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
                 String endMile = begin + "-" + end;
@@ -460,7 +470,7 @@ public class MsgAlarmController extends BaseController {
             BeanUtils.copyProperties(msgAlarm, msgAlarmResp);
             msgAlarmResp.setRailwayName(baseRailwayManagement.getRailwayName());
             msgAlarmResp.setDeptId(baseCameraManagement.getDeptId());
-            if (!ObjectUtils.isEmpty(baseCameraManagement.getEndMile())&&!ObjectUtils.isEmpty(baseCameraManagement.getBeginMile())) {
+            if (!ObjectUtils.isEmpty(baseCameraManagement.getEndMile()) && !ObjectUtils.isEmpty(baseCameraManagement.getBeginMile())) {
                 String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
                 String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
                 String endMile = "[" + begin + "]-[" + end + "]";
@@ -481,12 +491,12 @@ public class MsgAlarmController extends BaseController {
             if (!ObjectUtils.isEmpty(baseCameraManagement)) {
                 if (!StringUtils.isEmpty(baseCameraManagement.getVersionName())) {
                     msgAlarmResp.setVersionName(baseCameraManagement.getVersionName());
-                }else {
+                } else {
                     msgAlarmResp.setVersionName(" ");
                 }
                 if (!StringUtils.isEmpty(baseCameraManagement.getVersionNum())) {
                     msgAlarmResp.setVersionNum(baseCameraManagement.getVersionNum());
-                }else {
+                } else {
                     msgAlarmResp.setVersionNum(" ");
                 }
             }
@@ -631,9 +641,9 @@ public class MsgAlarmController extends BaseController {
                     if (o.getLineDir() == 1) {
                         o.setLineDirName("上行");
                     } else if (o.getLineDir() == 2) {
-                        o.setLineDirName( "下行");
+                        o.setLineDirName("下行");
                     } else if (o.getLineDir() == 3) {
-                        o.setLineDirName( "上下行");
+                        o.setLineDirName("上下行");
                     }
                 }
                 if (!ObjectUtils.isEmpty(o.getAlarmType())) {
@@ -651,7 +661,7 @@ public class MsgAlarmController extends BaseController {
                 }
                 return o;
             }).collect(Collectors.toList());
-                        page.setRecords(dto1);
+            page.setRecords(dto1);
         }
         return AjaxResult.success(page);
     }
@@ -847,7 +857,7 @@ public class MsgAlarmController extends BaseController {
     public AjaxResult alarmStatistics() {
         MsgAlarmVo msgAlarmVo1 = new MsgAlarmVo();
         MsgAlarmVo msgAlarmVo = (MsgAlarmVo) dataScoreUtil.setDataScore(getUserId(), msgAlarmVo1);
-      return   msgAlarmService.alarmStatistics(msgAlarmVo);
+        return msgAlarmService.alarmStatistics(msgAlarmVo);
     }
 
     @GetMapping(value = "/alarmCountSort")
@@ -855,7 +865,7 @@ public class MsgAlarmController extends BaseController {
     public AjaxResult alarmCountSort() {
         MsgAlarmVo msgAlarmVo1 = new MsgAlarmVo();
         MsgAlarmVo msgAlarmVo = (MsgAlarmVo) dataScoreUtil.setDataScore(getUserId(), msgAlarmVo1);
-        return   msgAlarmService.alarmCountSort(msgAlarmVo);
+        return msgAlarmService.alarmCountSort(msgAlarmVo);
     }
 
 }