diff --git a/src/main/java/com/genersoft/iot/vmp/service/IPlayService.java b/src/main/java/com/genersoft/iot/vmp/service/IPlayService.java index ba04d466a..b1c46eb62 100644 --- a/src/main/java/com/genersoft/iot/vmp/service/IPlayService.java +++ b/src/main/java/com/genersoft/iot/vmp/service/IPlayService.java @@ -44,7 +44,7 @@ public interface IPlayService { DeferredResult> download(String deviceId, String channelId, String startTime, String endTime, int downloadSpeed, InviteStreamCallback infoCallBack, PlayBackCallback hookCallBack); DeferredResult> download(MediaServerItem mediaServerItem, SSRCInfo ssrcInfo,String deviceId, String channelId, String startTime, String endTime, int downloadSpeed, InviteStreamCallback infoCallBack, PlayBackCallback hookCallBack); - StreamContent getDownLoadInfo(String deviceId, String channelId, String stream); + StreamInfo getDownLoadInfo(String deviceId, String channelId, String stream); void zlmServerOnline(String mediaServerId); diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java index 69405923a..39f104e8b 100644 --- a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java @@ -681,11 +681,11 @@ public class PlayServiceImpl implements IPlayService { } @Override - public StreamContent getDownLoadInfo(String deviceId, String channelId, String stream) { + public StreamInfo getDownLoadInfo(String deviceId, String channelId, String stream) { StreamInfo streamInfo = redisCatchStorage.queryDownload(deviceId, channelId, stream, null); if (streamInfo != null) { if (streamInfo.getProgress() == 1) { - return new StreamContent(streamInfo); + return streamInfo; } // 获取当前已下载时长 @@ -717,7 +717,7 @@ public class PlayServiceImpl implements IPlayService { } } } - return new StreamContent(streamInfo); + return streamInfo; } @Override diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/record/GBRecordController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/record/GBRecordController.java index 8758763b0..586d816ea 100644 --- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/record/GBRecordController.java +++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/record/GBRecordController.java @@ -169,7 +169,7 @@ public class GBRecordController { @Parameter(name = "channelId", description = "通道国标编号", required = true) @Parameter(name = "stream", description = "流ID", required = true) @GetMapping("/download/progress/{deviceId}/{channelId}/{stream}") - public StreamContent getProgress(@PathVariable String deviceId, @PathVariable String channelId, @PathVariable String stream) { + public StreamInfo getProgress(@PathVariable String deviceId, @PathVariable String channelId, @PathVariable String stream) { return playService.getDownLoadInfo(deviceId, channelId, stream); } } diff --git a/web_src/src/components/dialog/devicePlayer.vue b/web_src/src/components/dialog/devicePlayer.vue index 9ecbb9b2d..f1e20bd82 100644 --- a/web_src/src/components/dialog/devicePlayer.vue +++ b/web_src/src/components/dialog/devicePlayer.vue @@ -579,7 +579,7 @@ export default { // 处理时间信息 that.videoHistory.searchHistoryResult = res.data.data.recordList; }else { - this.$message({ + that.$message({ showClose: true, message: res.data.msg, type: "error", @@ -652,7 +652,7 @@ export default { that.streamId = ""; that.downloadRecord(row); }else { - this.$message({ + that.$message({ showClose: true, message: res.data.msg, type: "error",