From 0898c63ca3de75669f88354b23eeb2798d1db471 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Mon, 16 Nov 2020 17:24:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=81=9C=E6=AD=A2=E7=82=B9?= =?UTF-8?q?=E6=92=AD=E5=90=8E,=E5=86=8D=E6=AC=A1=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E5=81=9C=E6=AD=A2=E6=97=A0=E6=B3=95=E8=AF=86=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 5 +++-- .../com/genersoft/iot/vmp/vmanager/play/PlayController.java | 3 +-- web_src/src/components/channelList.vue | 6 ++++++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 75261cae..460e5c86 100644 --- a/README.md +++ b/README.md @@ -48,10 +48,11 @@ web界面系统设置 使用mysql作为数据库 # 项目部署 -参考:[编译运行](https://github.com/648540858/wvp-GB28181/wiki/%E7%BC%96%E8%AF%91%E8%BF%90%E8%A1%8C) +参考:[WIKI](https://github.com/648540858/wvp-GB28181-pro/wiki) # gitee同步仓库 -https://gitee.com/18010473990/wvp-GB28181.git +https://gitee.com/18010473990/wvp-GB28181.git + # 使用帮助 QQ群: 901799015 diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java index c9b2d34d..a01748e2 100644 --- a/src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java +++ b/src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java @@ -61,7 +61,6 @@ public class PlayController { storager.stopPlay(streamInfo); streamInfo = cmder.playStreamCmd(device, channelId); } - } String streamId = String.format("%08x", Integer.parseInt(streamInfo.getSsrc())).toUpperCase(); // 等待推流, TODO 默认超时30s @@ -135,7 +134,7 @@ public class PlayController { cmder.streamByeCmd(ssrc); StreamInfo streamInfo = storager.queryPlayBySSRC(ssrc); if (streamInfo == null) - return new ResponseEntity(HttpStatus.PAYMENT_REQUIRED); + return new ResponseEntity("ssrc not found", HttpStatus.OK); storager.stopPlay(streamInfo); if (logger.isDebugEnabled()) { logger.debug(String.format("设备预览停止API调用,ssrc:%s", ssrc)); diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue index b539e8cb..b3872eed 100644 --- a/web_src/src/components/channelList.vue +++ b/web_src/src/components/channelList.vue @@ -234,6 +234,12 @@ export default { }).then(function (res) { console.log(JSON.stringify(res)); that.initData(); + }).catch(function (error) { + if (error.response.status == 402) { // 已经停止过 + that.initData(); + }else { + console.log(e) + } }); },