里程位置修改

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

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