web 消息推送

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

@@ -42,6 +42,7 @@ public class MsgAlarmResp implements Serializable {
      * 报警行别(1上行2下行)
      */
     private Integer lineDir;
+    private String lineDirStr;
 
     /**
      * 所属工务段编码(单位id)

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

@@ -90,7 +90,7 @@ public class BaseCameraManagementController extends BaseController {
     /**
      * 所有相机列表+权限
      */
-    @ApiOperation(value = "相机台账管理分页")
+    @ApiOperation(value = "相机台账管理")
     @GetMapping("/selectCameraAll")
     public AjaxResult selectCameraAll() {
         String userId = getUserId();

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

@@ -63,7 +63,8 @@ public class WebSocketConteoller extends BaseController {
         msgAlarmResp.setAlarmMile(mile);
         String cameraCode = baseCameraManagement.getCameraCode();
         String cameraName = baseRailwayManagementService.getCameraNameByCameraCode(cameraCode);
-        msgAlarmResp.setRailwayName(cameraName);
+        msgAlarmResp.setRailwayName(cameraName != null ? cameraName : "");
+        msgAlarmResp.setLineDirStr(baseCameraManagement.getLineDir() == 1 ? "上行" : "下行");
         // 推送消息reqMsgAlarmVo
         webSocketServer.sendMoreMessage(list, objStr(msgAlarmResp));
 
@@ -77,8 +78,8 @@ public class WebSocketConteoller extends BaseController {
         String formatDate = sdf.format(alarmTime != null ? alarmTime : new Date());
         JPushUtil.sendToRegistrationId(
                 alias,
-                "报警通知！", cameraName,
-                formatDate + "     " + (msgAlarmResp.getAlarmType() == 1 ? "泥石流" : msgAlarmResp.getAlarmType()) + "     " + mile + "     " + endMile,
+                "报警通知！", cameraName != null ? cameraName : "",
+                formatDate + "     " + (msgAlarmResp.getAlarmType() == 1 ? "泥石流" : msgAlarmResp.getAlarmType())+ "     " + (baseCameraManagement.getLineDir() == 1 ? "上行" : "下行") + "     " + mile + "     " + endMile,
                 "");
         HashMap<String, Object> map = new HashMap<>();
         map.put("code", 200);
@@ -87,7 +88,8 @@ public class WebSocketConteoller extends BaseController {
 
     private String objStr(MsgAlarmResp msgAlarmResp) {
         JSONObject obj = new JSONObject();
-        obj.put("pipelineId", msgAlarmResp); //流水线ID
+        obj.put("data", msgAlarmResp); //data
+        obj.put("code", 110); //code
         log.info("【websocket消息】 单点消息:" + obj.toJSONString());
         return obj.toJSONString();
     }