Merge pull request #110 from hotleave/playback

解决录像播放相关问题

Merge pull request #110 from hotleave/playback
解决录像播放相关问题
648540858 · GitHub
2 parents 858093fe 6dc8d52d
Showing 2 changed files with 3 additions and 2 deletions
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
web_src/src/components/dialog/devicePlayer.vue
@@ -154,7 +154,7 @@ public class PlayController {
 	})
 	@PostMapping("/convert/{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) {
 			logger.warn("视频转码API调用失败！, 视频流已经停止!");
 			return new ResponseEntity<String>("未找到视频流信息, 视频流可能已经停止", HttpStatus.OK);
@@ -424,8 +424,9 @@ export default {
                         row.endTime
                 }).then(function (res) {
                     var streamInfo = res.data;
+                    that.app = streamInfo.app;
                     that.streamId = streamInfo.streamId;
-                    that.videoUrl = this.getUrlByStreamInfo(streamInfo);
+                    that.videoUrl = that.getUrlByStreamInfo(streamInfo);
                     that.recordPlay = true;
                 });
             }