Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/GeoHazardMonitor

hazard-sdk/src/main/java/com/ozs/controller/upload/GeoHazardMonitorTokenController.java

@@ -134,22 +134,24 @@ public class GeoHazardMonitorTokenController {
             }
             BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(wrapper);
             // 获取推送人ID列表
-            Set<String> set1 = baseUserService.getUserIdList(baseCameraManagement.getCreateBy(), baseCameraManagement.getDeptId());
+            Set<String> set = baseUserService.getUserIdList(baseCameraManagement.getCreateBy(), baseCameraManagement.getDeptId());
+            // List<String> list = new ArrayList<>(set);
+            String[] list = set.toArray(new String[set.size()]);
             // 推送消息reqMsgAlarmVo
             // 初始化 -> 运行中 -> 成功或失败
-//            try {
-//                // 1、初始化
-//                webSocketServer.sendMoreMessage(ids,objStr(pipelineId,1));
-//                Thread.sleep(3 * 1000);
-//                // 2、运行中
-//                webSocketServer.sendMoreMessage(ids,objStr(pipelineId,2));
-//                Thread.sleep(5 * 1000);
-//                // 3、成功或失败
-//                webSocketServer.sendMoreMessage(ids,Math.random() * 10 > 5 ? objStr(pipelineId,6) : objStr(pipelineId,7));
-//            } catch (InterruptedException e) {
-//                e.printStackTrace();
-//                throw new RuntimeException("构建失败");
-//            }
+            try {
+                // 1、初始化
+                webSocketServer.sendMoreMessage(list, objStr(baseCameraManagement, 1));
+                Thread.sleep(3 * 1000);
+                // 2、运行中
+                webSocketServer.sendMoreMessage(list, objStr(baseCameraManagement, 2));
+                Thread.sleep(5 * 1000);
+                // 3、成功或失败
+                webSocketServer.sendMoreMessage(list, Math.random() * 10 > 5 ? objStr(baseCameraManagement, 6) : objStr(baseCameraManagement, 7));
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+                throw new RuntimeException("构建失败");
+            }
             log.info("baseCameraManagement:{}", baseCameraManagement);
             if (ObjectUtils.isEmpty(reqMsgAlarmVo.getLineDir())) {
                 reqMsgAlarmVo.setLineDir(baseCameraManagement.getLineDir());
@@ -213,6 +215,12 @@ public class GeoHazardMonitorTokenController {
         }
     }
 
+    private String objStr(BaseCameraManagement baseCameraManagement, int status) {
+        JSONObject obj = new JSONObject();
+        obj.put("pipelineId", baseCameraManagement); //流水线ID
+        obj.put("status", status);
+        return obj.toJSONString();
+    }
 
     /**
      * 设备状态数据传输