From 97105c24f4e5f1beff995ea95e6464e3f0ffa038 Mon Sep 17 00:00:00 2001 From: hotleave Date: Fri, 18 Jun 2021 11:50:21 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=92=AD=E6=94=BE?= =?UTF-8?q?=E5=BD=95=E5=83=8F=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web_src/src/components/dialog/devicePlayer.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/src/components/dialog/devicePlayer.vue b/web_src/src/components/dialog/devicePlayer.vue index bc6d3e80..5edcefff 100644 --- a/web_src/src/components/dialog/devicePlayer.vue +++ b/web_src/src/components/dialog/devicePlayer.vue @@ -425,7 +425,7 @@ export default { }).then(function (res) { var streamInfo = res.data; that.streamId = streamInfo.streamId; - that.videoUrl = this.getUrlByStreamInfo(streamInfo); + that.videoUrl = that.getUrlByStreamInfo(streamInfo); that.recordPlay = true; }); } From 5a13e79410270850e809210239e8739e16e9f88c Mon Sep 17 00:00:00 2001 From: hotleave Date: Fri, 18 Jun 2021 11:51:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=BD=95=E5=83=8F?= =?UTF-8?q?=E5=9B=9E=E6=94=BE=E6=97=A0=E6=B3=95=E8=8E=B7=E5=8F=96=E7=BC=96?= =?UTF-8?q?=E7=A0=81=E4=BF=A1=E6=81=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web_src/src/components/dialog/devicePlayer.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/web_src/src/components/dialog/devicePlayer.vue b/web_src/src/components/dialog/devicePlayer.vue index 5edcefff..1dfc4610 100644 --- a/web_src/src/components/dialog/devicePlayer.vue +++ b/web_src/src/components/dialog/devicePlayer.vue @@ -424,6 +424,7 @@ export default { row.endTime }).then(function (res) { var streamInfo = res.data; + that.app = streamInfo.app; that.streamId = streamInfo.streamId; that.videoUrl = that.getUrlByStreamInfo(streamInfo); that.recordPlay = true; From c69990036fa050912e644f2994201f033f304e12 Mon Sep 17 00:00:00 2001 From: hotleave Date: Fri, 18 Jun 2021 11:51:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=BD=95=E5=83=8F?= =?UTF-8?q?=E5=9B=9E=E6=94=BE=E6=97=A0=E6=B3=95=E8=BD=AC=E7=A0=81=E6=92=AD?= =?UTF-8?q?=E6=94=BE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 783542de..953f61d8 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 @@ public class PlayController { }) @PostMapping("/convert/{streamId}") public ResponseEntity 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("未找到视频流信息, 视频流可能已经停止", HttpStatus.OK);