新的视频服务的回放视频接口修改

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseCameraManagementController.java

@@ -1004,7 +1004,7 @@ public class BaseCameraManagementController extends BaseController {
             throw new BaseException("相机编号【" + vo.getCameraCode() + "】不存在");
         }
         String recordUrl = CameraUtil.getRecordUrl(one.getCameraCode(), one.getChannel(), vo.getStartTime(), vo.getEntTime());
-        if (recordUrl.contains("当前相机暂无回放视频")||recordUrl.contains("目前回放视频数已超过带宽限制,请您稍后重试")) {
+        if (recordUrl.contains("当前相机暂无回放视频")||recordUrl.contains("当前回放视频数已超过带宽限制,请您10分钟以后重试")) {
             return AjaxResult.error(recordUrl);
         } else {
             return AjaxResult.success("ok", recordUrl);

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseRailwayManagementController.java

@@ -289,8 +289,8 @@ public class BaseRailwayManagementController extends BaseController {
     @GetMapping("/query")
     @Log(title = "线路台账管理", businessType = BusinessType.SELECT)
     public AjaxResult query() {
-        // List<BaseRailwayManagement> list = baseRailwayManagementService.list();
-        List<BaseRailwayManagement> list = baseRailwayManagementService.listRailway();
+         List<BaseRailwayManagement> list = baseRailwayManagementService.list();
+//        List<BaseRailwayManagement> list = baseRailwayManagementService.listRailway();
         list.sort(new Comparator<BaseRailwayManagement>() {
             @Override
             public int compare(BaseRailwayManagement o1, BaseRailwayManagement o2) {

hazard-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java

@@ -549,7 +549,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
         log.info("getRecordUrl--->" + cameraCode + "--" + channel + "--" + startTm + "--" + endTm);
         Integer count = streamPathCount(cameraCode);
         log.info("getRecordUrl--count->" + count);
-        if (count>1){
+        if (count>3){
             return "当前回放视频数已超过带宽限制,请您10分钟以后重试";
         }
         log.info(bakUrl + "/gb28181/api/invite?id=" + cameraCode + "&channel=" + channel + "&startTime=" + startTm.getTime()/1000 + "&endTime=" + endTm.getTime()/1000);