From 513b810631e339f765456d95f487139a192c4a9c Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 18 六月 2021 18:29:58 +0800
Subject: [PATCH] Merge pull request #110 from hotleave/playback
---
web_src/src/components/dialog/devicePlayer.vue | 3 ++-
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
index 783542d..953f61d 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
@@ -154,7 +154,7 @@
})
@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);
diff --git a/web_src/src/components/dialog/devicePlayer.vue b/web_src/src/components/dialog/devicePlayer.vue
index bc6d3e8..1dfc461 100644
--- a/web_src/src/components/dialog/devicePlayer.vue
+++ b/web_src/src/components/dialog/devicePlayer.vue
@@ -424,8 +424,9 @@
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;
});
}
--
Gitblit v1.8.0