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

修复停止点播后,再次调用停止无法识别

pull/13/head
648540858 2020-11-16 17:24:20 +08:00
parent 242a766794
commit 0898c63ca3
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -48,10 +48,11 @@ web界面系统设置
使用mysql作为数据库 使用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同步仓库 # gitee同步仓库
https://gitee.com/18010473990/wvp-GB28181.git https://gitee.com/18010473990/wvp-GB28181.git
# 使用帮助 # 使用帮助
QQ群: 901799015 QQ群: 901799015

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

@ -61,7 +61,6 @@ public class PlayController {
storager.stopPlay(streamInfo); storager.stopPlay(streamInfo);
streamInfo = cmder.playStreamCmd(device, channelId); streamInfo = cmder.playStreamCmd(device, channelId);
} }
} }
String streamId = String.format("%08x", Integer.parseInt(streamInfo.getSsrc())).toUpperCase(); String streamId = String.format("%08x", Integer.parseInt(streamInfo.getSsrc())).toUpperCase();
// 等待推流, TODO 默认超时30s // 等待推流, TODO 默认超时30s
@ -135,7 +134,7 @@ public class PlayController {
cmder.streamByeCmd(ssrc); cmder.streamByeCmd(ssrc);
StreamInfo streamInfo = storager.queryPlayBySSRC(ssrc); StreamInfo streamInfo = storager.queryPlayBySSRC(ssrc);
if (streamInfo == null) if (streamInfo == null)
return new ResponseEntity<String>(HttpStatus.PAYMENT_REQUIRED); return new ResponseEntity<String>("ssrc not found", HttpStatus.OK);
storager.stopPlay(streamInfo); storager.stopPlay(streamInfo);
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
logger.debug(String.format("设备预览停止API调用，ssrc：%s", ssrc)); logger.debug(String.format("设备预览停止API调用，ssrc：%s", ssrc));

6
web_src/src/components/channelList.vue
View File

@ -234,6 +234,12 @@ export default {
}).then(function (res) { }).then(function (res) {
console.log(JSON.stringify(res)); console.log(JSON.stringify(res));
that.initData(); that.initData();
}).catch(function (error) {
if (error.response.status == 402) { // 已经停止过
that.initData();
}else {
console.log(e)
}
}); });
}, },