Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #110 from hotleave/playback 

解决录像播放相关问题
pull/115/head
648540858 2021-06-18 18:29:58 +08:00 committed by GitHub
parent 858093fe9a 6dc8d52deb
commit 513b810631
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
View File

@ -154,7 +154,7 @@ public class PlayController {
}) })
@PostMapping("/convert/{streamId}") @PostMapping("/convert/{streamId}")
public ResponseEntity<String> playConvert(@PathVariable String streamId) { public ResponseEntity<String> playConvert(@PathVariable String streamId) {
StreamInfo streamInfo = redisCatchStorage.queryPlayByStreamId(streamId); StreamInfo streamInfo = streamId.startsWith("gb_play_") ? redisCatchStorage.queryPlayByStreamId(streamId) : redisCatchStorage.queryPlaybackByStreamId(streamId);
if (streamInfo == null) { if (streamInfo == null) {
logger.warn("视频转码API调用失败！, 视频流已经停止!"); logger.warn("视频转码API调用失败！, 视频流已经停止!");
return new ResponseEntity<String>("未找到视频流信息, 视频流可能已经停止", HttpStatus.OK); return new ResponseEntity<String>("未找到视频流信息, 视频流可能已经停止", HttpStatus.OK);

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

@ -424,8 +424,9 @@ export default {
row.endTime row.endTime
}).then(function (res) { }).then(function (res) {
var streamInfo = res.data; var streamInfo = res.data;
that.app = streamInfo.app;
that.streamId = streamInfo.streamId; that.streamId = streamInfo.streamId;
that.videoUrl = this.getUrlByStreamInfo(streamInfo); that.videoUrl = that.getUrlByStreamInfo(streamInfo);
that.recordPlay = true; that.recordPlay = true;
}); });
} }