里程位置修改

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

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

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

@@ -935,6 +935,7 @@ 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())) {
@@ -956,13 +957,14 @@ public class GeoHazardMonitorTokenController {
                         log.info("list1-------------->>" + list1.size());
                         for (BaseCameraManagement baseCameraManagement : list1) {
                             boolean finalType3 = type;
-                            List<String> finalCodeList3 = codeList;
-                            CompletableFuture.runAsync(() -> {
-                                cameraUtil.heartbeatgetUrl(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel(), finalType3);
-                                if (!ObjectUtils.isEmpty(finalCodeList3)) {
+                            cameraUtil.heartbeatgetUrl(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel(), finalType3);
+                            log.info("-------------->>codeList-------"+ codeList);
+                                if (!ObjectUtils.isEmpty(codeList)) {
                                     //判断心跳相机日志表后两条数据是否包含该相机编码
-                                    if (!finalCodeList3.contains(baseCameraManagement.getCameraCode())) {
+                                    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());
@@ -970,7 +972,6 @@ public class GeoHazardMonitorTokenController {
                                     }
                                 }
                                 //添加心跳相机日志信息
-                            });
                             int add6 = terminalHeartbeatLogService.add(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel());
                             log.info("-----add6----" + add6);
                         }