aunix/wvp-GB28181-pro
1
0
Fork 0
mirror of https://gitee.com/pan648540858/wvp-GB28181-pro.git synced 2026-05-27 15:37:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

下载进度接口返回值改回StreamInfo

Browse Source
This commit is contained in:
xuhong 2022-12-14 11:31:08 +08:00
parent fcb509c1f4
commit 87e01cbe56
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
View File

@ -44,7 +44,7 @@ public interface IPlayService {
DeferredResult<WVPResult<StreamContent>> download(String deviceId, String channelId, String startTime, String endTime, int downloadSpeed, InviteStreamCallback infoCallBack, PlayBackCallback hookCallBack); DeferredResult<WVPResult<StreamContent>> download(String deviceId, String channelId, String startTime, String endTime, int downloadSpeed, InviteStreamCallback infoCallBack, PlayBackCallback hookCallBack);
DeferredResult<WVPResult<StreamContent>> download(MediaServerItem mediaServerItem, SSRCInfo ssrcInfo,String deviceId, String channelId, String startTime, String endTime, int downloadSpeed, InviteStreamCallback infoCallBack, PlayBackCallback hookCallBack); DeferredResult<WVPResult<StreamContent>> 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); void zlmServerOnline(String mediaServerId);

6
src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
View File

@ -681,11 +681,11 @@ public class PlayServiceImpl implements IPlayService {
} }
@Override @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); StreamInfo streamInfo = redisCatchStorage.queryDownload(deviceId, channelId, stream, null);
if (streamInfo != null) { if (streamInfo != null) {
if (streamInfo.getProgress() == 1) { 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 @Override

2
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/record/GBRecordController.java
View File

@ -169,7 +169,7 @@ public class GBRecordController {
@Parameter(name = "channelId", description = "通道国标编号", required = true) @Parameter(name = "channelId", description = "通道国标编号", required = true)
@Parameter(name = "stream", description = "流ID", required = true) @Parameter(name = "stream", description = "流ID", required = true)
@GetMapping("/download/progress/{deviceId}/{channelId}/{stream}") @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); return playService.getDownLoadInfo(deviceId, channelId, stream);
} }
} }

4
web_src/src/components/dialog/devicePlayer.vue
View File

@ -579,7 +579,7 @@ export default {
// 处理时间信息 // 处理时间信息
that.videoHistory.searchHistoryResult = res.data.data.recordList; that.videoHistory.searchHistoryResult = res.data.data.recordList;
}else { }else {
this.$message({ that.$message({
showClose: true, showClose: true,
message: res.data.msg, message: res.data.msg,
type: "error", type: "error",
@ -652,7 +652,7 @@ export default {
that.streamId = ""; that.streamId = "";
that.downloadRecord(row); that.downloadRecord(row);
}else { }else {
this.$message({ that.$message({
showClose: true, showClose: true,
message: res.data.msg, message: res.data.msg,
type: "error", type: "error",