报警接口修改

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

@@ -867,7 +867,7 @@ public class GeoHazardMonitorTokenController {
                                         log.info("--------------str--------------:" + str);
                                         String[] parts = str.split("/");
                                         log.info("--------------parts--------------:" + parts);
-                                        if (parts.length==2) {
+                                        if (parts.length == 2) {
                                             cameraUtil.stopStream(parts[0], parts[1]);
                                         }
                                     }
@@ -879,7 +879,7 @@ public class GeoHazardMonitorTokenController {
                                 String code = baseCameraManagement.getCameraCode() + "/" + baseCameraManagement.getChannel();
                                 list3.add(code);
                             }
-                            log.info("--------------heartbeat--------------:"+list3);
+                            log.info("--------------heartbeat--------------:" + list3);
                             redisCache.setCacheObject("heartbeat", list3);
                         } else {
                             log.info("-------------->>已进入拉一路视频");
@@ -905,7 +905,7 @@ public class GeoHazardMonitorTokenController {
                                         log.info("--------------str--------------:" + str);
                                         String[] parts = str.split("/");
                                         log.info("--------------parts--------------:" + parts);
-                                        if (parts.length==2) {
+                                        if (parts.length == 2) {
                                             cameraUtil.stopStream(parts[0], parts[1]);
                                         }
                                     }
@@ -917,7 +917,7 @@ public class GeoHazardMonitorTokenController {
                                 String code = baseCameraManagement.getCameraCode() + "/" + baseCameraManagement.getChannel();
                                 list3.add(code);
                             }
-                            log.info("--------------heartbeat--------------:"+list3);
+                            log.info("--------------heartbeat--------------:" + list3);
                             redisCache.setCacheObject("heartbeat", list3);
                         }
                         twoMap.put("currentStream", playFlv);
@@ -985,7 +985,7 @@ public class GeoHazardMonitorTokenController {
                                     log.info("--------------str--------------:" + str);
                                     String[] parts = str.split("/");
                                     log.info("--------------parts--------------:" + parts);
-                                    if (parts.length==2) {
+                                    if (parts.length == 2) {
                                         cameraUtil.stopStream(parts[0], parts[1]);
                                     }
                                 }
@@ -997,7 +997,7 @@ public class GeoHazardMonitorTokenController {
                             String code = baseCameraManagement.getCameraCode() + "/" + baseCameraManagement.getChannel();
                             list3.add(code);
                         }
-                        log.info("--------------heartbeat--------------:"+list3);
+                        log.info("--------------heartbeat--------------:" + list3);
                         redisCache.setCacheObject("heartbeat", list3);
 //                        List<String> finalCodeList2 = codeList;
 //                        CompletableFuture.runAsync(() -> {
@@ -1038,7 +1038,7 @@ public class GeoHazardMonitorTokenController {
                                     log.info("--------------str--------------:" + str);
                                     String[] parts = str.split("/");
                                     log.info("--------------parts--------------:" + parts);
-                                    if (parts.length==2) {
+                                    if (parts.length == 2) {
                                         cameraUtil.stopStream(parts[0], parts[1]);
                                     }
                                 }
@@ -1050,7 +1050,7 @@ public class GeoHazardMonitorTokenController {
                             String code = baseCameraManagement.getCameraCode() + "/" + baseCameraManagement.getChannel();
                             list3.add(code);
                         }
-                        log.info("--------------heartbeat--------------:"+list3);
+                        log.info("--------------heartbeat--------------:" + list3);
                         redisCache.setCacheObject("heartbeat", list3);
                     }
                     twoMap.put("currentStream", playFlv);
@@ -1289,6 +1289,11 @@ public class GeoHazardMonitorTokenController {
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
             }
             String playFlv = cameraUtil.heartbeatgetUrl(one.getCameraCode(), one.getChannel(), false);
+            ArrayList<String> list3 = new ArrayList<>();
+            String code = one.getCameraCode() + "/" + one.getChannel();
+            list3.add(code);
+            log.info("--------------cameraPlay--------------:" + list3);
+            redisCache.setCacheObject("cameraPlay", list3);
             map.put("url", playFlv);
             jsonObject.put("resultCode", 1);
             jsonObject.put("message", "ok");
@@ -1338,6 +1343,7 @@ public class GeoHazardMonitorTokenController {
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
             }
             String code = cameraUtil.stopStream(one.getCameraCode(), one.getChannel());
+            redisCache.deleteObject("cameraPlay");
             log.info("---------------code------------->" + code);
             jsonObject.put("resultCode", 1);
             jsonObject.put("message", "ok");