webSocket接口修改

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

@@ -176,5 +176,14 @@ public class MsgAlarmResp implements Serializable {
      * 版本名称
      */
     private String versionName;
+    /**
+     * 未解除报警总数
+     */
+    private  Long unlockNum;
+    /**
+     * 线路类型
+     */
+    private Integer railwayType;
+
 
 }

hazard-admin/src/main/java/com/ozs/web/controller/websocket/WebSocketConteoller.java

@@ -52,6 +52,8 @@ public class WebSocketConteoller extends BaseController {
     private MsgAppPushService msgAppPushService;
     @Autowired
     private ISysDictDataService dictDataService;
+    @Autowired
+    private  MsgAlarmService  msgAlarmService;
 
     /**
      * 获取项目名称
@@ -149,9 +151,17 @@ public class WebSocketConteoller extends BaseController {
         msgAlarmResp.setAlarmMile(mile);
         String cameraCode = baseCameraManagement.getCameraCode();
         msgAlarmResp.setCameraCode(cameraCode);
-        
-        String cameraName = baseRailwayManagementService.getCameraNameByCameraCode(cameraCode);
-        msgAlarmResp.setRailwayName(cameraName != null ? cameraName : "");
+        BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(new LambdaQueryWrapper<BaseRailwayManagement>()
+                .eq(BaseRailwayManagement::getRailwayCode, baseCameraManagement.getRailwayCode()));
+        if (!StringUtils.isEmpty(baseRailwayManagement)){
+            msgAlarmResp.setRailwayName(baseRailwayManagement.getRailwayName());
+            msgAlarmResp.setRailwayType(baseRailwayManagement.getRailwayType());
+            msgAlarmResp.setIsLock(2);
+        }else {
+            msgAlarmResp.setRailwayName("");
+        }
+        long count = msgAlarmService.count(new LambdaQueryWrapper<MsgAlarm>().eq(MsgAlarm::getCameraCode, cameraCode));
+        msgAlarmResp.setUnlockNum(count);
         if (baseCameraManagement.getLineDir() == 1) {
             msgAlarmResp.setLineDirStr("上行");
         } else if (baseCameraManagement.getLineDir() == 2) {
@@ -259,7 +269,7 @@ public class WebSocketConteoller extends BaseController {
                         userList.add(userRegistrationid.getRegistrationId());
                         JPushUtil.sendToRegistrationId(
                                 userList,
-                                "报警通知！", cameraName != null ? cameraName : "",
+                                "报警通知！", baseRailwayManagement.getRailwayName() != null ? baseRailwayManagement.getRailwayName() : "",
                                 // content,
                                 formatDate + "     " + (msgAlarmResp.getAlarmType() == 1 ? "泥石流" : msgAlarmResp.getAlarmType()) + "     " + lineDirName + "     " + mile + "     " + endMile,
                                 content);