lin
2023-02-01 2d492c5b6b33554d9512753e92dd1d89a489e3f2
国标回放超时时间使用点播超时一样的字段
2个文件已修改
10 ■■■■ 已修改文件
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/all-application.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/playback/PlaybackController.java
@@ -1,6 +1,7 @@
package com.genersoft.iot.vmp.vmanager.gb28181.playback;
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
import com.genersoft.iot.vmp.conf.exception.ServiceException;
import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;
@@ -64,13 +65,16 @@
    @Autowired
    private DeferredResultHolder resultHolder;
    @Autowired
    private UserSetting userSetting;
    @Operation(summary = "开始视频回放")
    @Parameter(name = "deviceId", description = "设备国标编号", required = true)
    @Parameter(name = "channelId", description = "通道国标编号", required = true)
    @Parameter(name = "startTime", description = "开始时间", required = true)
    @Parameter(name = "endTime", description = "结束时间", required = true)
    @GetMapping("/start/{deviceId}/{channelId}")
    public DeferredResult<WVPResult<StreamContent>> play(@PathVariable String deviceId, @PathVariable String channelId,
    public DeferredResult<WVPResult<StreamContent>> start(@PathVariable String deviceId, @PathVariable String channelId,
                                                         String startTime, String endTime) {
        if (logger.isDebugEnabled()) {
@@ -79,7 +83,7 @@
        String uuid = UUID.randomUUID().toString();
        String key = DeferredResultHolder.CALLBACK_CMD_PLAYBACK + deviceId + channelId;
        DeferredResult<WVPResult<StreamContent>> result = new DeferredResult<>(30000L);
        DeferredResult<WVPResult<StreamContent>> result = new DeferredResult<>(userSetting.getPlayTimeout().longValue());
        resultHolder.put(key, uuid, result);
        WVPResult<StreamContent> wvpResult = new WVPResult<>();
src/main/resources/all-application.yml
@@ -167,7 +167,7 @@
    senior-sdp: false
    # 保存移动位置历史轨迹:true:保留历史数据,false:仅保留最后的位置(默认)
    save-position-history: false
    # 点播等待超时时间,单位:毫秒
    # 点播/录像回放 等待超时时间,单位:毫秒
    play-timeout: 18000
    # 上级点播等待超时时间,单位:毫秒
    platform-play-timeout: 60000