web报警未读消息个数+未读消息列表

business-service/src/main/java/com/ozs/service/impl/MsgWebPushServiceImpl.java

@@ -78,19 +78,27 @@ public class MsgWebPushServiceImpl extends ServiceImpl<MsgWebPushMapper, MsgWebP
                     lw.le(BaseCameraManagement::getBeginMile, msgAlarm.getAlarmMile());
                     lw.gt(BaseCameraManagement::getEndMile, msgAlarm.getAlarmMile());
                 }
-                BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(lw);
+                List<BaseCameraManagement> baseCameraManagementList = baseCameraManagementService.list(lw);
+                BaseCameraManagement baseCameraManagement = new BaseCameraManagement();
+                if (!StringUtils.isEmptySunhh(baseCameraManagementList) && baseCameraManagementList.size() > 0) {
+                    baseCameraManagement = baseCameraManagementList.get(0);
+                }
+                if (StringUtils.isEmptySunhh(baseCameraManagement)) {
+                    return AjaxResult.error("里程位置：" + msgAlarm.getAlarmMile() + "，不存在关联相机！");
+                }
                 MsgAlarmResp msgAlarmResp = new MsgAlarmResp();
                 BeanUtils.copyProperties(msgAlarm, msgAlarmResp);
                 msgAlarmResp.setRailwayName(baseRailwayManagement.getRailwayName());
                 // msgAlarmResp.setDeptId(baseCameraManagement.getDeptId());
-                String begin = AppendUtils.stringAppend(Integer.parseInt(msgAlarm.getBeginMile()));
-                String end = AppendUtils.stringAppend(Integer.parseInt(msgAlarm.getEndMile()));
+                String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
+                String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
                 String endMile = begin + "-" + end;
                 msgAlarmResp.setBeginMile(endMile);
-                String mile = AppendUtils.stringAppend(msgAlarm.getAlarmMile());
+                String mile = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
                 msgAlarmResp.setAlarmMile(mile);
                 msgAlarmResp.setInstallLongitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLatitude());
                 msgAlarmResp.setPushId(msgAlarm.getMsgId());
+                msgAlarmResp.setCameraCode(baseCameraManagement.getCameraCode());
                 msgAlarmRespList.add(msgAlarmResp);
             }
         }