心跳接口修改

business-service/src/main/java/com/ozs/utils/CameraUtil.java

@@ -1048,8 +1048,8 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
     public  String stopStream(String cameraIndexCode, String channel) {
         try {
             //http://10.48.36.47:9080/api/gateway/stop?stream=0235538f5ec241abad7c29cb423f16bb/1
-            log.info("code---------->" + httpUrls + "/api/gateway/stop?stream=" + cameraIndexCode + "/" + channel);
-            String code = HttpUtils.sendGet(httpUrls + "/api/gateway/stop?stream=" + cameraIndexCode + "/" + channel);
+            log.info("code---------->" + httpUrl + "/api/gateway/stop?stream=" + cameraIndexCode + "/" + channel);
+            String code = HttpUtils.sendGet(httpUrl + "/api/gateway/stop?stream=" + cameraIndexCode + "/" + channel,"");
             log.info("code---------->" + code);
             return code;
         } catch (Exception e) {

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

@@ -660,15 +660,19 @@ public class GeoHazardMonitorTokenController {
                         List<AlarmListVo> listVos = new ArrayList<>();
                         if (baseCameraManagementList.size() > 0) {
                             String playFlv = cameraUtil.heartbeatgetUrl(baseCameraManagementList.get(0).getCameraCode(), baseCameraManagementList.get(0).getChannel(), type);
-                            //判断心跳相机日志表后两条数据是否包含该相机编码
-                            if (!ObjectUtils.isEmpty(codeList)) {
-                                if (!codeList.contains(baseCameraManagementList.get(0).getCameraCode())) {
-                                    //如果不包含此相机编码
-                                    for (TerminalHeartbeatLog terminalHeartbeatLog : heartbeatLogList) {
-                                        log.info("-----11111----" );
-                                        cameraUtil.stopStream(terminalHeartbeatLog.getCameraCode(), terminalHeartbeatLog.getChannel());
-                                    }
-                                }
+//                            //判断心跳相机日志表后两条数据是否包含该相机编码
+//                            if (!ObjectUtils.isEmpty(codeList)) {
+//                                if (!codeList.contains(baseCameraManagementList.get(0).getCameraCode())) {
+//                                    //如果不包含此相机编码
+//                                    for (TerminalHeartbeatLog terminalHeartbeatLog : heartbeatLogList) {
+//                                        log.info("-----11111----");
+//                                        cameraUtil.stopStream(terminalHeartbeatLog.getCameraCode(), terminalHeartbeatLog.getChannel());
+//                                    }
+//                                }
+//                            }
+                            for (TerminalHeartbeatLog terminalHeartbeatLog : heartbeatLogList) {
+                                log.info("-----11111----");
+                                cameraUtil.stopStream(terminalHeartbeatLog.getCameraCode(), terminalHeartbeatLog.getChannel());
                             }
                             //添加心跳相机日志信息
                             int add = terminalHeartbeatLogService.add(baseCameraManagementList.get(0).getCameraCode(), baseCameraManagementList.get(0).getChannel());
@@ -737,16 +741,16 @@ public class GeoHazardMonitorTokenController {
                                 for (int o = 0; o < baseList.size(); o++) {
                                     //判断流媒体是否有流
                                     String playFlv = cameraUtil.heartbeatgetUrl(baseList.get(o).getCameraCode(), baseList.get(o).getChannel(), type);
-                                    //判断心跳相机日志表后两条数据是否包含该相机编码
-                                    if (!ObjectUtils.isEmpty(codeList)) {
-                                        if (!codeList.contains(baseList.get(o).getCameraCode())) {
-                                            //如果不包含此相机编码
-                                            for (TerminalHeartbeatLog terminalHeartbeatLog : heartbeatLogList) {
-                                                log.info("-----22222----" );
-                                                cameraUtil.stopStream(terminalHeartbeatLog.getCameraCode(), terminalHeartbeatLog.getChannel());
-                                            }
-                                        }
-                                    }
+//                                    //判断心跳相机日志表后两条数据是否包含该相机编码
+//                                    if (!ObjectUtils.isEmpty(codeList)) {
+//                                        if (!codeList.contains(baseList.get(o).getCameraCode())) {
+//                                            //如果不包含此相机编码
+//                                            for (TerminalHeartbeatLog terminalHeartbeatLog : heartbeatLogList) {
+//                                                log.info("-----22222----");
+//                                                cameraUtil.stopStream(terminalHeartbeatLog.getCameraCode(), terminalHeartbeatLog.getChannel());
+//                                            }
+//                                        }
+//                                    }
                                     //添加心跳相机日志信息
                                     int add1 = terminalHeartbeatLogService.add(baseList.get(o).getCameraCode(), baseList.get(o).getChannel());
                                     log.info("-----add1----" + add1);
@@ -777,6 +781,10 @@ public class GeoHazardMonitorTokenController {
                                     alarmListVo.setAlarmInfo(alarmInfoVo1);
                                     listVos.add(alarmListVo);
                                 }
+                                for (TerminalHeartbeatLog terminalHeartbeatLog : heartbeatLogList) {
+                                    log.info("-----22222----");
+                                    cameraUtil.stopStream(terminalHeartbeatLog.getCameraCode(), terminalHeartbeatLog.getChannel());
+                                }
                             }
                         }
                         AlarmListVo[] array = listVos.toArray(new AlarmListVo[]{});
@@ -799,15 +807,19 @@ public class GeoHazardMonitorTokenController {
                         List<BaseCameraManagement> list1 = baseCameraManagementService.list(base);
                         for (BaseCameraManagement baseCameraManagement : list1) {
                             cameraUtil.heartbeatgetUrl(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel(), type);
-                            //判断心跳相机日志表后两条数据是否包含该相机编码
-                            if (!ObjectUtils.isEmpty(codeList)) {
-                                if (!codeList.contains(baseCameraManagement.getCameraCode())) {
-                                    //如果不包含此相机编码
-                                    for (TerminalHeartbeatLog terminalHeartbeatLog : heartbeatLogList) {
-                                        log.info("-----3333333----" );
-                                        cameraUtil.stopStream(terminalHeartbeatLog.getCameraCode(), terminalHeartbeatLog.getChannel());
-                                    }
-                                }
+//                            //判断心跳相机日志表后两条数据是否包含该相机编码
+//                            if (!ObjectUtils.isEmpty(codeList)) {
+//                                if (!codeList.contains(baseCameraManagement.getCameraCode())) {
+//                                    //如果不包含此相机编码
+//                                    for (TerminalHeartbeatLog terminalHeartbeatLog : heartbeatLogList) {
+//                                        log.info("-----3333333----");
+//                                        cameraUtil.stopStream(terminalHeartbeatLog.getCameraCode(), terminalHeartbeatLog.getChannel());
+//                                    }
+//                                }
+//                            }
+                            for (TerminalHeartbeatLog terminalHeartbeatLog : heartbeatLogList) {
+                                log.info("-----3333333----");
+                                cameraUtil.stopStream(terminalHeartbeatLog.getCameraCode(), terminalHeartbeatLog.getChannel());
                             }
                             //添加心跳相机日志信息
                             int add2 = terminalHeartbeatLogService.add(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel());
@@ -850,17 +862,21 @@ public class GeoHazardMonitorTokenController {
                                 List<String> finalCodeList4 = codeList;
                                 CompletableFuture.runAsync(() -> {
                                     cameraUtil.heartbeatgetUrl(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel(), finalType);
-                                    //判断心跳相机日志表后两条数据是否包含该相机编码
-                                    if (!ObjectUtils.isEmpty(finalCodeList4)) {
-                                        if (!finalCodeList4.contains(baseCameraManagement.getCameraCode())) {
-                                            //如果不包含此相机编码
-                                            for (TerminalHeartbeatLog terminalHeartbeatLog : heartbeatLogList) {
-                                                log.info("-----44444444----" );
-                                                cameraUtil.stopStream(terminalHeartbeatLog.getCameraCode(), terminalHeartbeatLog.getChannel());
-                                            }
-                                        }
-                                    }
+//                                    //判断心跳相机日志表后两条数据是否包含该相机编码
+//                                    if (!ObjectUtils.isEmpty(finalCodeList4)) {
+//                                        if (!finalCodeList4.contains(baseCameraManagement.getCameraCode())) {
+//                                            //如果不包含此相机编码
+//                                            for (TerminalHeartbeatLog terminalHeartbeatLog : heartbeatLogList) {
+//                                                log.info("-----44444444----");
+//                                                cameraUtil.stopStream(terminalHeartbeatLog.getCameraCode(), terminalHeartbeatLog.getChannel());
+//                                            }
+//                                        }
+//                                    }
                                 });
+                                for (TerminalHeartbeatLog terminalHeartbeatLog : heartbeatLogList) {
+                                    log.info("-----44444444----");
+                                    cameraUtil.stopStream(terminalHeartbeatLog.getCameraCode(), terminalHeartbeatLog.getChannel());
+                                }
                                 //添加心跳相机日志信息
                                 int add3 = terminalHeartbeatLogService.add(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel());
                                 log.info("-----add3----" + add3);
@@ -871,20 +887,24 @@ public class GeoHazardMonitorTokenController {
                             log.info("list1-------------->>" + list1.size());
                             for (BaseCameraManagement baseCameraManagement : list1) {
                                 cameraUtil.heartbeatgetUrl(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel(), type);
-                                    log.info("-------------->>finalCodeList5-------"+ codeList);
-                                    if (!ObjectUtils.isEmpty(codeList)) {
-                                        //判断心跳相机日志表后两条数据是否包含该相机编码
-                                        log.info("-------------->>baseCameraManagement.getCameraCode()-------"+baseCameraManagement.getCameraCode());
-                                        if (!codeList.contains(baseCameraManagement.getCameraCode())) {
-                                            //如果不包含此相机编码
-                                            log.info("-------------->>heartbeatLogList-------"+heartbeatLogList);
-                                            for (TerminalHeartbeatLog terminalHeartbeatLog : heartbeatLogList) {
-                                                log.info("-----5555555----" );
-                                                cameraUtil.stopStream(terminalHeartbeatLog.getCameraCode(), terminalHeartbeatLog.getChannel());
-                                            }
-                                        }
-                                    }
-                                    //添加心跳相机日志信息
+//                                log.info("-------------->>finalCodeList5-------" + codeList);
+//                                if (!ObjectUtils.isEmpty(codeList)) {
+//                                    //判断心跳相机日志表后两条数据是否包含该相机编码
+//                                    log.info("-------------->>baseCameraManagement.getCameraCode()-------" + baseCameraManagement.getCameraCode());
+//                                    if (!codeList.contains(baseCameraManagement.getCameraCode())) {
+//                                        //如果不包含此相机编码
+//                                        log.info("-------------->>heartbeatLogList-------" + heartbeatLogList);
+//                                        for (TerminalHeartbeatLog terminalHeartbeatLog : heartbeatLogList) {
+//                                            log.info("-----5555555----");
+//                                            cameraUtil.stopStream(terminalHeartbeatLog.getCameraCode(), terminalHeartbeatLog.getChannel());
+//                                        }
+//                                    }
+//                                }
+                                for (TerminalHeartbeatLog terminalHeartbeatLog : heartbeatLogList) {
+                                    log.info("-----5555555----" );
+                                    cameraUtil.stopStream(terminalHeartbeatLog.getCameraCode(), terminalHeartbeatLog.getChannel());
+                                }
+                                //添加心跳相机日志信息
                                 int add4 = terminalHeartbeatLogService.add(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel());
                                 log.info("-----add4----" + add4);
                             }
@@ -935,19 +955,20 @@ public class GeoHazardMonitorTokenController {
                             boolean finalType2 = type;
                             CompletableFuture.runAsync(() -> {
                                 cameraUtil.heartbeatgetUrl(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel(), finalType2);
-                                log.info("-------------->>finalCodeList2-------"+ finalCodeList2);
-                                if (!ObjectUtils.isEmpty(finalCodeList2)) {
-                                    //判断心跳相机日志表后两条数据是否包含该相机编码
-                                    if (!finalCodeList2.contains(baseCameraManagement.getCameraCode())) {
-                                        //如果不包含此相机编码
-                                        for (TerminalHeartbeatLog terminalHeartbeatLog : heartbeatLogList) {
-                                            log.info("-----6666666----" );
-                                            cameraUtil.stopStream(terminalHeartbeatLog.getCameraCode(), terminalHeartbeatLog.getChannel());
-                                        }
-                                    }
-                                }
-                                //添加心跳相机日志信息
+//                                log.info("-------------->>finalCodeList2-------" + finalCodeList2);
+//                                if (!ObjectUtils.isEmpty(finalCodeList2)) {
+//                                    //判断心跳相机日志表后两条数据是否包含该相机编码
+//                                    if (!finalCodeList2.contains(baseCameraManagement.getCameraCode())) {
+//                                        //如果不包含此相机编码
+//
+//                                    }
+//                                }
                             });
+                            for (TerminalHeartbeatLog terminalHeartbeatLog : heartbeatLogList) {
+                                log.info("-----6666666----" );
+                                cameraUtil.stopStream(terminalHeartbeatLog.getCameraCode(), terminalHeartbeatLog.getChannel());
+                            }
+                            //添加心跳相机日志信息
                             int add5 = terminalHeartbeatLogService.add(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel());
                             log.info("-----add5----" + add5);
                         }
@@ -958,20 +979,24 @@ public class GeoHazardMonitorTokenController {
                         for (BaseCameraManagement baseCameraManagement : list1) {
                             boolean finalType3 = type;
                             cameraUtil.heartbeatgetUrl(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel(), finalType3);
-                            log.info("-------------->>codeList-------"+ codeList);
-                                if (!ObjectUtils.isEmpty(codeList)) {
-                                    //判断心跳相机日志表后两条数据是否包含该相机编码
-                                    log.info("-------------->>baseCameraManagement.getCameraCode()-------"+ baseCameraManagement.getCameraCode());
-                                    if (!codeList.contains(baseCameraManagement.getCameraCode())) {
-                                        //如果不包含此相机编码
-                                        log.info("-------------->>heartbeatLogList-------"+ heartbeatLogList);
-                                        for (TerminalHeartbeatLog terminalHeartbeatLog : heartbeatLogList) {
-                                            log.info("-----77777----" );
-                                            cameraUtil.stopStream(terminalHeartbeatLog.getCameraCode(), terminalHeartbeatLog.getChannel());
-                                        }
-                                    }
-                                }
-                                //添加心跳相机日志信息
+//                            log.info("-------------->>codeList-------" + codeList);
+//                            if (!ObjectUtils.isEmpty(codeList)) {
+//                                //判断心跳相机日志表后两条数据是否包含该相机编码
+//                                log.info("-------------->>baseCameraManagement.getCameraCode()-------" + baseCameraManagement.getCameraCode());
+//                                if (!codeList.contains(baseCameraManagement.getCameraCode())) {
+//                                    //如果不包含此相机编码
+//                                    log.info("-------------->>heartbeatLogList-------" + heartbeatLogList);
+//                                    for (TerminalHeartbeatLog terminalHeartbeatLog : heartbeatLogList) {
+//                                        log.info("-----77777----");
+//                                        cameraUtil.stopStream(terminalHeartbeatLog.getCameraCode(), terminalHeartbeatLog.getChannel());
+//                                    }
+//                                }
+//                            }
+                            for (TerminalHeartbeatLog terminalHeartbeatLog : heartbeatLogList) {
+                                log.info("-----77777----" );
+                                cameraUtil.stopStream(terminalHeartbeatLog.getCameraCode(), terminalHeartbeatLog.getChannel());
+                            }
+                            //添加心跳相机日志信息
                             int add6 = terminalHeartbeatLogService.add(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel());
                             log.info("-----add6----" + add6);
                         }