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/1642/head
panlinlin 2024-07-20 06:44:53 +08:00
parent d201be2f88
commit 80ac701748
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/genersoft/iot/vmp/media/service/impl/MediaServerServiceImpl.java
View File

@ -762,7 +762,7 @@ public class MediaServerServiceImpl implements IMediaServerService {
calld = streamAuthorityInfo.getCallId(); calld = streamAuthorityInfo.getCallId();
} }
List<StreamInfo> streamInfoList = getMediaList(mediaInfo, app, stream, calld); List<StreamInfo> streamInfoList = getMediaList(mediaInfo, app, stream, calld);
if (streamInfoList.isEmpty()) { if (streamInfoList == null || streamInfoList.isEmpty()) {
return null; return null;
}else { }else {
return streamInfoList.get(0); return streamInfoList.get(0);

5
src/main/java/com/genersoft/iot/vmp/streamProxy/service/impl/StreamProxyServiceImpl.java
View File

@ -216,9 +216,10 @@ public class StreamProxyServiceImpl implements IStreamProxyService {
// 判断是否需要重启代理 // 判断是否需要重启代理
if (!streamProxyInDb.getApp().equals(streamProxy.getApp()) if (!streamProxyInDb.getApp().equals(streamProxy.getApp())
|| !streamProxyInDb.getStream().equals(streamProxy.getStream()) || !streamProxyInDb.getStream().equals(streamProxy.getStream())
|| !streamProxyInDb.getMediaServerId().equals(streamProxy.getMediaServerId()) || (streamProxyInDb.getMediaServerId() != null && streamProxyInDb.getMediaServerId().equals(streamProxy.getMediaServerId()))
|| (streamProxyInDb.getMediaServerId() == null && streamProxy.getMediaServerId() != null)
) { ) {
// app/stream 变化则重启代理 // 变化则重启代理
stopProxy(streamProxyInDb); stopProxy(streamProxyInDb);
startProxy(streamProxy); startProxy(streamProxy);
} }

2
web_src/src/components/StreamProxyEdit.vue
View File

@ -152,6 +152,7 @@ export default {
}).then((res)=> { }).then((res)=> {
if (typeof (res.data.code) != "undefined" && res.data.code === 0) { if (typeof (res.data.code) != "undefined" && res.data.code === 0) {
this.$message.success("保存成功"); this.$message.success("保存成功");
this.locading = false;
this.streamProxy = res.data.data this.streamProxy = res.data.data
}else { }else {
this.$message.error(res.data.msg); this.$message.error(res.data.msg);
@ -169,6 +170,7 @@ export default {
}).then((res)=> { }).then((res)=> {
if (typeof (res.data.code) != "undefined" && res.data.code === 0) { if (typeof (res.data.code) != "undefined" && res.data.code === 0) {
this.$message.success("保存成功"); this.$message.success("保存成功");
this.locading = false;
this.streamProxy = res.data.data this.streamProxy = res.data.data
}else { }else {
this.$message.error(res.data.msg); this.$message.error(res.data.msg);