添加日志

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

@@ -1198,10 +1198,11 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
         } else {
             long end = System.currentTimeMillis();
             JSONObject outJson = JSONObject.parse(previewURLs);
-            stringBuilder.append("测试结果:" + ("0".equals(outJson.getString("code")) ? "成功" : "失败") + "\t");
-            stringBuilder.append("调用时间:" + sdf.format(new Date(begin)) + "\t");
-            stringBuilder.append("数据返回时间:" + sdf.format(new Date(end)) + "\t");
-            stringBuilder.append("延迟:" + (end - begin) + "毫秒");
+//            stringBuilder.append("测试结果:" + ("0".equals(outJson.getString("code")) ? "成功" : "失败") + "\t");
+//            stringBuilder.append("调用时间:" + sdf.format(new Date(begin)) + "\t");
+//            stringBuilder.append("数据返回时间:" + sdf.format(new Date(end)) + "\t");
+//            stringBuilder.append("延迟:" + (end - begin) + "毫秒");
+            stringBuilder.append("结果："+previewURLs);
             return stringBuilder.toString();
         }
     }

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

@@ -710,13 +710,44 @@ public class GeoHazardMonitorTokenController {
                             respHeartbeatVo.setCameraList(cameraVosList);
                             respHeartbeatVo.setIsAlarm(1);
                         } else {
+                            LambdaQueryWrapper<BaseCameraManagement> base = new LambdaQueryWrapper<>();
+                            if (heartbeatVo.getLineDir() == 1) {
+                                distance = heartbeatVo.getVisualDistance() + heartbeatVo.getCurrentMile();
+                                base.ge(BaseCameraManagement::getInstallMile, distance);
+                                base.in(BaseCameraManagement::getMonitoringDirection, 1, 3);
+                                base.orderByAsc(BaseCameraManagement::getGrou).orderByAsc(BaseCameraManagement::getSort);
+                                base.le(BaseCameraManagement::getInstallMile, (heartbeatVo.getCurrentMile() + 10000));
+                            }
+                            if (heartbeatVo.getLineDir() == 2) {
+                                distance = heartbeatVo.getCurrentMile() - heartbeatVo.getVisualDistance();
+                                base.le(BaseCameraManagement::getInstallMile, distance);
+                                base.ge(BaseCameraManagement::getInstallMile, (heartbeatVo.getCurrentMile() - 10000));
+                                base.in(BaseCameraManagement::getMonitoringDirection, 2, 3);
+                                base.orderByDesc(BaseCameraManagement::getGrou).orderByDesc(BaseCameraManagement::getSort);
+                            }
+                            base.eq(BaseCameraManagement::getRailwayCode, heartbeatVo.getRailwayCode());
+                            base.eq(BaseCameraManagement::getOnline, 2);
+                            base.eq(BaseCameraManagement::getEnableOrNot, 1);
+                            base.last("limit 1");
+                            List<BaseCameraManagement> list1 = baseCameraManagementService.list(base);
                             CameraVos cameraVos = new CameraVos();
-                            cameraVos.setCameraCode("该里程位置，没有可用的报警相机");
-                            cameraVos.setCurrentStream("");
+                            cameraVos.setCameraCode(list1.get(0).getCameraCode());
+                            cameraVos.setCurrentStream(cameraUtil.getPlayFlvRtsp(list1.get(0).getCameraCode(), list1.get(0).getGraphicsCard(), type, httpUrl));
                             List<CameraVos> cameraVosList = new ArrayList<>();
                             cameraVosList.add(cameraVos);
                             respHeartbeatVo.setCameraList(cameraVosList);
                             respHeartbeatVo.setIsAlarm(1);
+                            boolean finalType6 = type;
+                            CompletableFuture.runAsync(() -> {
+                                String playFlv = cameraUtil.heartbeatgetPlayFlv(list1.get(0).getCameraCode(), list1.get(0).getGraphicsCard(), finalType6);
+                                if (StringUtils.isEmpty(playFlv)) {
+                                    try {
+                                        cameraUtil.heartbeatgetUrl(list1.get(0).getCameraCode(), list1.get(0).getGraphicsCard(), finalType6, httpUrl);
+                                    } catch (Exception e) {
+                                        e.printStackTrace();
+                                    }
+                                }
+                            });
                         }
                         for (int i = 0; i < list.size(); i++) {
                             MsgHeartbeatAlarmMessage msgHearbeatAlarmMessage = new MsgHeartbeatAlarmMessage();
@@ -950,6 +981,17 @@ public class GeoHazardMonitorTokenController {
                                     respHeartbeatVo.setIsAlarm(1);
                                     preAlarmListResponse.setCameraCode("");
                                     preAlarmListResponse.setCameraStream("");
+                                    boolean finalType6 = type;
+                                    CompletableFuture.runAsync(() -> {
+                                        String playFlv = cameraUtil.heartbeatgetPlayFlv(list1.get(0).getCameraCode(), list1.get(0).getGraphicsCard(), finalType6);
+                                        if (StringUtils.isEmpty(playFlv)) {
+                                            try {
+                                                cameraUtil.heartbeatgetUrl(list1.get(0).getCameraCode(), list1.get(0).getGraphicsCard(), finalType6, httpUrl);
+                                            } catch (Exception e) {
+                                                e.printStackTrace();
+                                            }
+                                        }
+                                    });
                                 } else {
                                     preAlarmListResponse.setCameraCode("");
                                     preAlarmListResponse.setCameraStream("");
@@ -1210,6 +1252,17 @@ public class GeoHazardMonitorTokenController {
                                 respHeartbeatVo.setIsAlarm(1);
                                 preAlarmListResponse.setCameraCode("");
                                 preAlarmListResponse.setCameraStream("");
+                                boolean finalType6 = type;
+                                CompletableFuture.runAsync(() -> {
+                                    String playFlv = cameraUtil.heartbeatgetPlayFlv(list1.get(0).getCameraCode(), list1.get(0).getGraphicsCard(), finalType6);
+                                    if (StringUtils.isEmpty(playFlv)) {
+                                        try {
+                                            cameraUtil.heartbeatgetUrl(list1.get(0).getCameraCode(), list1.get(0).getGraphicsCard(), finalType6, httpUrl);
+                                        } catch (Exception e) {
+                                            e.printStackTrace();
+                                        }
+                                    }
+                                });
                             } else {
                                 preAlarmListResponse.setCameraCode("");
                                 preAlarmListResponse.setCameraStream("");

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

@@ -1,5 +1,6 @@
 package com.ozs.controller.upload;
 
+import com.ozs.config.AjaxResults;
 import com.ozs.entity.BaseCameraManagement;
 import com.ozs.entity.vo.CamerasVo;
 import com.ozs.service.BaseCameraManagementService;
@@ -7,6 +8,7 @@ import com.ozs.utils.CameraUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
@@ -27,17 +29,11 @@ public class PressureController {
     /**
      * 天网数据压测
      */
-    @GetMapping("/api/pressurePreviewURLs")
-    public void getWebToken() throws InterruptedException {
-        List<BaseCameraManagement> list = baseCameraManagementService.list();
-        for (int i = 0; i < 12; i++) {
-            for (BaseCameraManagement baseCameraManagement : list) {
-                TimeUnit.SECONDS.sleep(2);
-                CamerasVo camerasVo = new CamerasVo();
-                camerasVo.setCameraIndexCode(baseCameraManagement.getCameraCode());
-                String msg = cameraUtil.apiPreviewURLs(camerasVo);
-                log.info(msg);
-            }   
-        }
+    @GetMapping("/api/pressurePreviewURLs/{code}")
+    public AjaxResults getWebToken(@PathVariable String code) throws InterruptedException {
+        CamerasVo camerasVo = new CamerasVo();
+        camerasVo.setCameraIndexCode(code);
+        String msg = cameraUtil.apiPreviewURLs(camerasVo);
+        return AjaxResults.success(msg);
     }
 }