第三方接口修改

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

@@ -264,27 +264,34 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
     public String heartbeatgetPlayFlv(String cameraCode, String channel) {
         List<String> pathList = new ArrayList<>();
         String data = HttpUtils.sendGet(webUrl + "/rtsp/api/list");
+        log.info("data------------------>"+data);
         if (StringUtils.isNotEmpty(data)) {
             JSONArray jsonArray = JSONArray.parseArray(data);
-            for (int i = 0; i < jsonArray.size(); i++) {
-                JSONObject jsonObject = jsonArray.getJSONObject(i);
-                String name = jsonObject.getString("Path");
-                pathList.add(name);
-            }
-            boolean contains = pathList.contains(cameraCode + "/" + channel);
-            if (!contains) {
-                return null;
-            } else {
-                return getPlayFlvRtsp(cameraCode, channel, true);
+            log.info("jsonArray------------------>"+jsonArray);
+            if (!ObjectUtils.isEmpty(jsonArray)) {
+                for (int i = 0; i < jsonArray.size(); i++) {
+                    JSONObject jsonObject = jsonArray.getJSONObject(i);
+                    String name = jsonObject.getString("Path");
+                    pathList.add(name);
+                }
+                boolean contains = pathList.contains(cameraCode + "/" + channel);
+                if (!contains) {
+                    return null;
+                } else {
+                    return getPlayFlvRtsp(cameraCode, channel, true);
+                }
             }
+            return null;
         }
         return null;
     }
 
     public String heartbeatgetUrl(String cameraCode, String channel) {
-        CamerasVo camerasVo = new CamerasVo();
-        camerasVo.setCameraIndexCode(cameraCode);
-        previewURLs(camerasVo, channel);
+        CompletableFuture.runAsync(() -> {
+            CamerasVo camerasVo = new CamerasVo();
+            camerasVo.setCameraIndexCode(cameraCode);
+            previewURLs(camerasVo, channel);
+        });
         return getPlayFlvRtsp(cameraCode, channel, true);
     }
 

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

@@ -720,24 +720,22 @@ public class GeoHazardMonitorTokenController {
                         AlarmListVo[] array = listVos.toArray(new AlarmListVo[]{});
                         respHeartbeatVo.setAlarmList(array);
                         //获取机车前两路视频
-                        CompletableFuture.runAsync(() -> {
-                            int mile = heartbeatVo.getVisualDistance() + heartbeatVo.getCurrentMile();
-                            LambdaQueryWrapper<BaseCameraManagement> base = new LambdaQueryWrapper<>();
-                            if (heartbeatVo.getLineDir() == 1) {
-                                base.gt(BaseCameraManagement::getInstallMile, mile);
-                            }
-                            if (heartbeatVo.getLineDir() == 2) {
-                                base.lt(BaseCameraManagement::getInstallMile, mile);
-                            }
-                            base.eq(BaseCameraManagement::getRailwayCode, heartbeatVo.getRailwayCode());
-                            base.orderByAsc(BaseCameraManagement::getInstallMile);
-                            base.eq(BaseCameraManagement::getEnableOrNot, 1);
-                            base.last("limit 2");
-                            List<BaseCameraManagement> list1 = baseCameraManagementService.list(base);
-                            for (BaseCameraManagement baseCameraManagement : list1) {
-                                cameraUtil.heartbeatgetUrl(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel());
-                            }
-                        });
+                        int mile = heartbeatVo.getVisualDistance() + heartbeatVo.getCurrentMile();
+                        LambdaQueryWrapper<BaseCameraManagement> base = new LambdaQueryWrapper<>();
+                        if (heartbeatVo.getLineDir() == 1) {
+                            base.gt(BaseCameraManagement::getInstallMile, mile);
+                        }
+                        if (heartbeatVo.getLineDir() == 2) {
+                            base.lt(BaseCameraManagement::getInstallMile, mile);
+                        }
+                        base.eq(BaseCameraManagement::getRailwayCode, heartbeatVo.getRailwayCode());
+                        base.orderByAsc(BaseCameraManagement::getInstallMile);
+                        base.eq(BaseCameraManagement::getEnableOrNot, 1);
+                        base.last("limit 2");
+                        List<BaseCameraManagement> list1 = baseCameraManagementService.list(base);
+                        for (BaseCameraManagement baseCameraManagement : list1) {
+                            cameraUtil.heartbeatgetUrl(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel());
+                        }
                     } else {
                         //没有报警信息的时候
                         distance = heartbeatVo.getVisualDistance() + heartbeatVo.getCurrentMile();
@@ -762,7 +760,7 @@ public class GeoHazardMonitorTokenController {
                         log.info("流程1----------------->");
                         //判断流媒体是否有流
                         String playFlv = cameraUtil.heartbeatgetPlayFlv(list1.get(0).getCameraCode(), list1.get(0).getChannel());
-                        log.info("playFlv------------>"+playFlv);
+                        log.info("playFlv------------>" + playFlv);
                         //拉四路视频
                         if (StringUtils.isEmpty(playFlv)) {
                             log.info("--------------->>已进入拉四路视频");
@@ -774,7 +772,7 @@ public class GeoHazardMonitorTokenController {
                         } else {
                             log.info("-------------->>已进入拉三路路视频");
                             list1.remove(0);
-                            log.info("list1-------------->>"+list1.size());
+                            log.info("list1-------------->>" + list1.size());
                             for (BaseCameraManagement baseCameraManagement : list1) {
                                 CompletableFuture.runAsync(() -> {
                                     cameraUtil.heartbeatgetUrl(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel());
@@ -813,7 +811,7 @@ public class GeoHazardMonitorTokenController {
                     log.info("流程2----------------->");
                     //判断流媒体是否有流
                     String playFlv = cameraUtil.heartbeatgetPlayFlv(list1.get(0).getCameraCode(), list1.get(0).getChannel());
-                    log.info("playFlv------------>"+playFlv);
+                    log.info("playFlv------------>" + playFlv);
                     //拉四路视频
                     if (StringUtils.isEmpty(playFlv)) {
                         log.info("--------------->>已进入拉四路视频");
@@ -825,7 +823,7 @@ public class GeoHazardMonitorTokenController {
                     } else {
                         log.info("-------------->>已进入拉三路路视频");
                         list1.remove(0);
-                        log.info("list1-------------->>"+list1.size());
+                        log.info("list1-------------->>" + list1.size());
                         for (BaseCameraManagement baseCameraManagement : list1) {
                             CompletableFuture.runAsync(() -> {
                                 cameraUtil.heartbeatgetUrl(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel());