瀏覽代碼

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

648540858 5 年之前
父節點
當前提交
0898c63ca3

+ 3 - 2
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
 

+ 1 - 2
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<String>(HttpStatus.PAYMENT_REQUIRED);
+			return new ResponseEntity<String>("ssrc not found", HttpStatus.OK);
 		storager.stopPlay(streamInfo);
 		if (logger.isDebugEnabled()) {
 			logger.debug(String.format("设备预览停止API调用,ssrc:%s", ssrc));

+ 6 - 0
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)
+              }
             });
         },