心跳接口添加分组和排序

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

@@ -1344,7 +1344,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
      *
      * @param baseCameraManagement
      */
-    public List<BaseCameraManagement> getBaseCameraManagementList(Long id, boolean type) {
+    public List<BaseCameraManagement> getBaseCameraManagementList(Long id) {
         //根据ID获取当前相机的信息
         BaseCameraManagement baseCameraManagement = baseCameraManagementService.getById(id);
         if (!ObjectUtils.isEmpty(baseCameraManagement)) {
@@ -1352,9 +1352,6 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
             List<BaseCameraManagement> list = baseCameraManagementService.list(new LambdaQueryWrapper<BaseCameraManagement>()
                     .eq(BaseCameraManagement::getGrouping, baseCameraManagement.getGrouping()).orderByDesc(BaseCameraManagement::getSort));
             if (!ObjectUtils.isEmpty(list)) {
-//                for (BaseCameraManagement cameraManagement : list) {
-//                    heartbeatgetUrl(cameraManagement.getCameraCode(), cameraManagement.getChannel(), type);
-//                }
                   return list;
             }else {
                 return null;

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

@@ -851,7 +851,7 @@ public class GeoHazardMonitorTokenController {
                         //根据相机ID找出分组并排序
                         boolean finalType1 = type;
                         CompletableFuture.runAsync(() -> {
-                            List<BaseCameraManagement> baseCameraManagementList1 = cameraUtil.getBaseCameraManagementList(baseCameraManagement.getId(), finalType1);
+                            List<BaseCameraManagement> baseCameraManagementList1 = cameraUtil.getBaseCameraManagementList(baseCameraManagement.getId());
                             if (!ObjectUtils.isEmpty(baseCameraManagementList1)) {
                                 for (BaseCameraManagement cameraManagement : baseCameraManagementList1) {
                                     String playFlv = cameraUtil.heartbeatgetPlayFlv(cameraManagement.getCameraCode(), cameraManagement.getChannel(), finalType1);
@@ -926,13 +926,18 @@ public class GeoHazardMonitorTokenController {
                             for (BaseCameraManagement baseCameraManagement : list1) {
                                 boolean finalType = type;
                                 CompletableFuture.runAsync(() -> {
-                                    List<BaseCameraManagement> baseCameraManagementList1 = cameraUtil.getBaseCameraManagementList(baseCameraManagement.getId(), finalType);
+                                    List<BaseCameraManagement> baseCameraManagementList1 = cameraUtil.getBaseCameraManagementList(baseCameraManagement.getId());
                                     if (!ObjectUtils.isEmpty(baseCameraManagementList1)) {
                                         for (BaseCameraManagement cameraManagement : baseCameraManagementList1) {
                                             cameraUtil.heartbeatgetUrl(cameraManagement.getCameraCode(), cameraManagement.getChannel(), finalType);
                                         }
                                     }
                                 });
+                                BaseCameraManagement idOne = baseCameraManagementService.getById(list1.get(0).getId());
+                                BaseCameraManagement idTwo = baseCameraManagementService.getById(list1.get(1).getId());
+                                if (idOne.getGrouping().equals(idTwo.getGrouping())){
+                                    break;
+                                }
                             }
 //                            CompletableFuture.runAsync(() -> {
 //                                cameraUtil.removePlayFlv(heartbeatVo.getLineDir(), heartbeatVo.getCurrentMile(), heartbeatVo.getVisualDistance());
@@ -944,7 +949,7 @@ public class GeoHazardMonitorTokenController {
                                 boolean finalType = type;
                                 int finalI = i;
                                 CompletableFuture.runAsync(() -> {
-                                    List<BaseCameraManagement> baseCameraManagementList1 = cameraUtil.getBaseCameraManagementList(list1.get(finalI).getId(), finalType);
+                                    List<BaseCameraManagement> baseCameraManagementList1 = cameraUtil.getBaseCameraManagementList(list1.get(finalI).getId());
                                     if (!ObjectUtils.isEmpty(baseCameraManagementList1)) {
                                         for (BaseCameraManagement cameraManagement : baseCameraManagementList1) {
                                             cameraUtil.heartbeatgetUrl(cameraManagement.getCameraCode(), cameraManagement.getChannel(), finalType);
@@ -953,7 +958,7 @@ public class GeoHazardMonitorTokenController {
                                 });
                             }
                         }
-                        List<BaseCameraManagement> baseCameraManagementList1 = cameraUtil.getBaseCameraManagementList(list1.get(0).getId(), type);
+                        List<BaseCameraManagement> baseCameraManagementList1 = cameraUtil.getBaseCameraManagementList(list1.get(0).getId());
                         if (!ObjectUtils.isEmpty(baseCameraManagementList1)) {
                             List<CameraVos> cameraVosList = new ArrayList<>();
                             for (BaseCameraManagement baseCameraManagement : baseCameraManagementList1) {
@@ -1034,13 +1039,18 @@ public class GeoHazardMonitorTokenController {
                         for (BaseCameraManagement baseCameraManagement : list1) {
                             boolean finalType = type;
                             CompletableFuture.runAsync(() -> {
-                                List<BaseCameraManagement> baseCameraManagementList1 = cameraUtil.getBaseCameraManagementList(baseCameraManagement.getId(), finalType);
+                                List<BaseCameraManagement> baseCameraManagementList1 = cameraUtil.getBaseCameraManagementList(baseCameraManagement.getId());
                                 if (!ObjectUtils.isEmpty(baseCameraManagementList1)) {
                                     for (BaseCameraManagement cameraManagement : baseCameraManagementList1) {
                                         cameraUtil.heartbeatgetUrl(cameraManagement.getCameraCode(), cameraManagement.getChannel(), finalType);
                                     }
                                 }
                             });
+                            BaseCameraManagement idOne = baseCameraManagementService.getById(list1.get(0).getId());
+                            BaseCameraManagement idTwo = baseCameraManagementService.getById(list1.get(1).getId());
+                            if (idOne.getGrouping().equals(idTwo.getGrouping())){
+                                break;
+                            }
                         }
                     } else {
                         log.info("-------------->>已进入拉一路路视频");
@@ -1049,7 +1059,7 @@ public class GeoHazardMonitorTokenController {
                             boolean finalType = type;
                             int finalI = i;
                             CompletableFuture.runAsync(() -> {
-                                List<BaseCameraManagement> baseCameraManagementList1 = cameraUtil.getBaseCameraManagementList(list1.get(finalI).getId(), finalType);
+                                List<BaseCameraManagement> baseCameraManagementList1 = cameraUtil.getBaseCameraManagementList(list1.get(finalI).getId());
                                 if (!ObjectUtils.isEmpty(baseCameraManagementList1)) {
                                     for (BaseCameraManagement cameraManagement : baseCameraManagementList1) {
                                         cameraUtil.heartbeatgetUrl(cameraManagement.getCameraCode(), cameraManagement.getChannel(), finalType);
@@ -1058,7 +1068,7 @@ public class GeoHazardMonitorTokenController {
                             });
                         }
                     }
-                    List<BaseCameraManagement> baseCameraManagementList1 = cameraUtil.getBaseCameraManagementList(list1.get(0).getId(), type);
+                    List<BaseCameraManagement> baseCameraManagementList1 = cameraUtil.getBaseCameraManagementList(list1.get(0).getId());
                     if (!ObjectUtils.isEmpty(baseCameraManagementList1)) {
                         List<CameraVos> cameraVosList = new ArrayList<>();
                         for (BaseCameraManagement baseCameraManagement : baseCameraManagementList1) {