소스 검색

测试天网视频的分辨率和码率

gao.qiang 1 년 전
부모
커밋
fdf35647ae

+ 1 - 1
business-service/src/main/java/com/ozs/entity/vo/RespHeartbeatVo.java

@@ -33,5 +33,5 @@ public class RespHeartbeatVo implements Serializable {
     /**
      * 当前股道
      */
-    private Integer routeTrack;
+    private String routeTrack;
 }

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

@@ -251,10 +251,10 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
      */
     public static String getPlayFlvRtsp(String cameraCode, String channel, boolean flay) {
         if (!flay) {
-            log.info("-----getPlayFlvRtsp------------>" + bakUrlRtsp + "/hdl/" + cameraCode + "/" + channel + ".flv");
+            log.info("-----getPlayFlvRtsp------11------>" + bakUrlRtsp + "/hdl/" + cameraCode + "/" + channel + ".flv");
             return bakUrlRtsp + "/hdl/" + cameraCode + "/" + channel + "/h264_720.flv";
         }
-        log.info("-------getPlayFlvRtsp---------->" + bakUrlRtsp + "/hdl/" + cameraCode + "/" + channel + ".flv");
+        log.info("-------getPlayFlvRtsp----22------>" + bakUrlRtsp + "/hdl/" + cameraCode + "/" + channel + ".flv");
         return bakUrlRtsp + "/hdl/" + cameraCode + "/" + channel + "/h264_1080.flv";
 
 

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

@@ -1351,8 +1351,10 @@ public class GeoHazardMonitorTokenController {
                     List<BaseRouteMassage> list = baseRouteMassageService.list();
                     if (!ObjectUtils.isEmpty(list)) {
                         if (list.get(0).getMileagePosition() - heartbeatVo.getCurrentMile() <= 500 && list.get(0).getMileagePosition() - heartbeatVo.getCurrentMile() >= 0) {
-                            respHeartbeatVo.setRouteTrack(list.get(0).getRouteStationTrack());
+                            respHeartbeatVo.setRouteTrack(list.get(0).getRouteStationTrack().toString());
                         }
+                    }else {
+                        respHeartbeatVo.setRouteTrack("");  
                     }
                     respHeartbeatVo.setIsAlarm(2);
                     respHeartbeatVo.setCameraCode(list1.get(0).getCameraCode());
@@ -2055,7 +2057,7 @@ public class GeoHazardMonitorTokenController {
         }
         baseRouteMassage.setCreateTime(new Date());
         baseRouteMassage.setStationName("博野站");
-        baseRouteMassage.setMileagePosition(11111);
+        baseRouteMassage.setMileagePosition(371685);
         baseRouteMassageService.save(baseRouteMassage);
         return AjaxResult.success();
     }
@@ -2099,6 +2101,10 @@ public class GeoHazardMonitorTokenController {
      */
     @PostMapping("/api/ttt")
     public void ttt() {
-        cameraUtil.heartbeatGetPlayFlv();
+        List<BaseCameraManagement> list = baseCameraManagementService.list();
+        for (BaseCameraManagement baseCameraManagement : list) {
+            log.info("------------baseCameraManagement---------"+baseCameraManagement);
+            cameraUtil.heartbeatgetUrl(baseCameraManagement.getCameraCode(), baseCameraManagement.getChannel(), true);
+        }
     }
 }