Browse Source

获取机车前向摄像机视频接口添加字段abSection;添加车载终端实时流调用的远程天网接口添加入参日志

wyyay 6 months ago
parent
commit
4881c34614

+ 7 - 2
business-service/src/main/java/com/ozs/entity/BaseCameraManagement.java

@@ -226,7 +226,12 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
      */
     private String graphicsCard;
     /**
-     * 车载终端编码
+     * 车
      */
-    private String terminalCode;
+    private String trainNum;
+
+    /**
+     * AB节
+     */
+    private String abSection;
 }

+ 5 - 0
business-service/src/main/java/com/ozs/entity/response/VehicleVedioResponse.java

@@ -15,4 +15,9 @@ public class VehicleVedioResponse {
      * 车号
      */
     private Integer trainNum;
+    /**
+     * AB节
+     */
+    private String abSection;
+
 }

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

@@ -1224,11 +1224,11 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
          */
         camerasVo.setStreamType(0);
         camerasVo.setProtocol("rtsp");
-        camerasVo.setTransmode(1);
+        camerasVo.setTransmode(0);
         camerasVo.setExpand("streamform=rtp");
         String body = JSONObject.toJSONString(camerasVo);
         String previewURLs = getPreviewURLs("/api/video/v1/cameras/previewURLs", body);
-        log.info("-------------------------------->>>>>previewURLs" + previewURLs);
+        log.info("-------------------------------->>>>>previewURLs" + previewURLs+"camerasVo:"+camerasVo);
         if (StringUtils.isEmpty(previewURLs)) {
             log.info("天网接口异常");
             return "天网接口异常";

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

@@ -2282,7 +2282,7 @@ public class GeoHazardMonitorTokenController {
                 AjaxResults1 = new AjaxResults(0, "车号不能为空");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);
             }
-            BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(new LambdaQueryWrapper<BaseCameraManagement>().eq(BaseCameraManagement::getTerminalCode, vehicleVedioResponse.getTerminalCode()));
+            BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(new LambdaQueryWrapper<BaseCameraManagement>().eq(BaseCameraManagement::getTrainNum, vehicleVedioResponse.getTrainNum()).eq(BaseCameraManagement::getAbSection,vehicleVedioResponse.getAbSection()));
             if (!ObjectUtils.isEmpty(baseCameraManagement)) {
                 CompletableFuture.runAsync(() -> {
                     String playFlv = cameraUtil.heartbeatgetPlayFlv(baseCameraManagement.getCameraCode(), baseCameraManagement.getGraphicsCard(), true);