Bladeren bron

没有报警信息,右侧直接展示无数据。

gao.qiang 2 jaren geleden
bovenliggende
commit
9b4a69be2c

+ 1 - 1
hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseCameraManagementController.java

@@ -678,7 +678,7 @@ public class BaseCameraManagementController extends BaseController {
             msgAlarmResp.setAlarmMile(baseCameraManagement.getInstallMile().toString());
             return AjaxResult.success(msgAlarmResp);
         } else {
-            return error("该相机编码:"+cameraCode+"没有报警消息");
+            return success("无报警信息数据");
         }
     }
 }

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

@@ -178,28 +178,32 @@ public class MsgAlarmController extends BaseController {
     @ApiOperation("根据报警信息ID获取详细信息")
     public AjaxResult getInfo(@PathVariable Long id) {
         MsgAlarm msgAlarm = msgAlarmService.getById(id);
-        LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
-        if (!ObjectUtils.isEmpty(msgAlarm.getCameraCode())) {
-            lw.eq(BaseCameraManagement::getCameraCode, msgAlarm.getCameraCode());
+        if (!ObjectUtils.isEmpty(msgAlarm)) {
+            LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
+            if (!ObjectUtils.isEmpty(msgAlarm.getCameraCode())) {
+                lw.eq(BaseCameraManagement::getCameraCode, msgAlarm.getCameraCode());
+            }
+            BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(lw);
+            LambdaQueryWrapper<BaseRailwayManagement> wrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
+            if (!ObjectUtils.isEmpty(baseCameraManagement.getRailwayCode())) {
+                wrapper.eq(BaseRailwayManagement::getRailwayCode, baseCameraManagement.getRailwayCode());
+            }
+            BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(wrapper);
+            MsgAlarmResp msgAlarmResp = new MsgAlarmResp();
+            BeanUtils.copyProperties(msgAlarm, msgAlarmResp);
+            msgAlarmResp.setRailwayName(baseRailwayManagement.getRailwayName());
+            msgAlarmResp.setDeptId(baseCameraManagement.getDeptId());
+            String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
+            String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
+            String endMile = begin + "-" + end;
+            msgAlarmResp.setBeginMile(endMile);
+            String mile = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
+            msgAlarmResp.setAlarmMile(mile);
+            msgAlarmResp.setInstallLongitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLatitude());
+            return AjaxResult.success(msgAlarmResp);
+        }else {
+            return success("无报警信息数据");
         }
-        BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(lw);
-        LambdaQueryWrapper<BaseRailwayManagement> wrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
-        if (!ObjectUtils.isEmpty(baseCameraManagement.getRailwayCode())) {
-            wrapper.eq(BaseRailwayManagement::getRailwayCode, baseCameraManagement.getRailwayCode());
-        }
-        BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(wrapper);
-        MsgAlarmResp msgAlarmResp = new MsgAlarmResp();
-        BeanUtils.copyProperties(msgAlarm, msgAlarmResp);
-        msgAlarmResp.setRailwayName(baseRailwayManagement.getRailwayName());
-        msgAlarmResp.setDeptId(baseCameraManagement.getDeptId());
-        String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
-        String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
-        String endMile = begin + "-" + end;
-        msgAlarmResp.setBeginMile(endMile);
-        String mile = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
-        msgAlarmResp.setAlarmMile(mile);
-        msgAlarmResp.setInstallLongitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLatitude());
-        return AjaxResult.success(msgAlarmResp);
     }
 
     @PutMapping(value = "/{id}")