From 0eee65bc424cbdb348052ba4ef6b91add28bc6a4 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Wed, 24 Nov 2021 10:02:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=8B=89=E6=B5=81=E4=BB=A3?= =?UTF-8?q?=E7=90=86=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=9C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?streamInfo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot/vmp/service/IStreamProxyService.java | 4 +++- .../service/impl/StreamProxyServiceImpl.java | 23 +++++++++++++++---- .../streamProxy/StreamProxyController.java | 7 +++--- .../src/components/dialog/StreamProxyEdit.vue | 2 +- 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/service/IStreamProxyService.java b/src/main/java/com/genersoft/iot/vmp/service/IStreamProxyService.java index 12e48983..4c68c61c 100644 --- a/src/main/java/com/genersoft/iot/vmp/service/IStreamProxyService.java +++ b/src/main/java/com/genersoft/iot/vmp/service/IStreamProxyService.java @@ -1,8 +1,10 @@ package com.genersoft.iot.vmp.service; import com.alibaba.fastjson.JSONObject; +import com.genersoft.iot.vmp.common.StreamInfo; import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem; import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem; +import com.genersoft.iot.vmp.vmanager.bean.WVPResult; import com.github.pagehelper.PageInfo; public interface IStreamProxyService { @@ -11,7 +13,7 @@ public interface IStreamProxyService { * 保存视频代理 * @param param */ - String save(StreamProxyItem param); + WVPResult save(StreamProxyItem param); /** * 添加视频代理到zlm diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java index bbcad1c3..a10e3404 100644 --- a/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java @@ -1,18 +1,21 @@ package com.genersoft.iot.vmp.service.impl; import com.alibaba.fastjson.JSONObject; +import com.genersoft.iot.vmp.common.StreamInfo; import com.genersoft.iot.vmp.gb28181.bean.GbStream; import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils; import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem; import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem; import com.genersoft.iot.vmp.service.IGbStreamService; import com.genersoft.iot.vmp.service.IMediaServerService; +import com.genersoft.iot.vmp.service.IMediaService; import com.genersoft.iot.vmp.storager.IRedisCatchStorage; import com.genersoft.iot.vmp.storager.IVideoManagerStorager; import com.genersoft.iot.vmp.storager.dao.GbStreamMapper; import com.genersoft.iot.vmp.storager.dao.PlatformGbStreamMapper; import com.genersoft.iot.vmp.storager.dao.StreamProxyMapper; import com.genersoft.iot.vmp.service.IStreamProxyService; +import com.genersoft.iot.vmp.vmanager.bean.WVPResult; import com.github.pagehelper.PageInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,7 +37,7 @@ public class StreamProxyServiceImpl implements IStreamProxyService { private IVideoManagerStorager videoManagerStorager; @Autowired - private IRedisCatchStorage redisCatchStorage; + private IMediaService mediaService; @Autowired private ZLMRESTfulUtils zlmresTfulUtils;; @@ -56,8 +59,10 @@ public class StreamProxyServiceImpl implements IStreamProxyService { @Override - public String save(StreamProxyItem param) { + public WVPResult save(StreamProxyItem param) { MediaServerItem mediaInfo; + WVPResult wvpResult = new WVPResult<>(); + wvpResult.setCode(0); if ("auto".equals(param.getMediaServerId())){ mediaInfo = mediaServerService.getMediaServerForMinimumLoad(); }else { @@ -65,7 +70,8 @@ public class StreamProxyServiceImpl implements IStreamProxyService { } if (mediaInfo == null) { logger.warn("保存代理未找到在线的ZLM..."); - return "保存失败"; + wvpResult.setMsg("保存失败"); + return wvpResult; } String dstUrl = String.format("rtmp://%s:%s/%s/%s", "127.0.0.1", mediaInfo.getRtmpPort(), param.getApp(), param.getStream() ); @@ -83,6 +89,10 @@ public class StreamProxyServiceImpl implements IStreamProxyService { result.append(", 但是启用失败，请检查流地址是否可用"); param.setEnable(false); videoManagerStorager.updateStreamProxy(param); + }else { + StreamInfo streamInfo = mediaService.getStreamInfoByAppAndStream( + mediaInfo, param.getApp(), param.getStream(), null); + wvpResult.setData(streamInfo); } } } @@ -97,6 +107,10 @@ public class StreamProxyServiceImpl implements IStreamProxyService { result.append(", 但是启用失败，请检查流地址是否可用"); param.setEnable(false); videoManagerStorager.updateStreamProxy(param); + }else { + StreamInfo streamInfo = mediaService.getStreamInfoByAppAndStream( + mediaInfo, param.getApp(), param.getStream(), null); + wvpResult.setData(streamInfo); } } }else { @@ -113,7 +127,8 @@ public class StreamProxyServiceImpl implements IStreamProxyService { result.append(", 关联国标平台[ " + param.getPlatformGbId() + " ]失败"); } } - return result.toString(); + wvpResult.setMsg(result.toString()); + return wvpResult; } @Override diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java index f8c01dd7..4390bfc5 100644 --- a/src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java +++ b/src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java @@ -1,9 +1,11 @@ package com.genersoft.iot.vmp.vmanager.streamProxy; import com.alibaba.fastjson.JSONObject; +import com.genersoft.iot.vmp.common.StreamInfo; import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem; import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem; import com.genersoft.iot.vmp.service.IMediaServerService; +import com.genersoft.iot.vmp.service.IMediaService; import com.genersoft.iot.vmp.storager.IRedisCatchStorage; import com.genersoft.iot.vmp.service.IStreamProxyService; import com.genersoft.iot.vmp.vmanager.bean.WVPResult; @@ -68,10 +70,7 @@ public class StreamProxyController { public WVPResult save(@RequestBody StreamProxyItem param){ logger.info("添加代理： " + JSONObject.toJSONString(param)); if (StringUtils.isEmpty(param.getMediaServerId())) param.setMediaServerId("auto"); - String msg = streamProxyService.save(param); - WVPResult result = new WVPResult<>(); - result.setCode(0); - result.setMsg(msg); + WVPResult result = streamProxyService.save(param); return result; } diff --git a/web_src/src/components/dialog/StreamProxyEdit.vue b/web_src/src/components/dialog/StreamProxyEdit.vue index ea3a64f9..c9330fdf 100644 --- a/web_src/src/components/dialog/StreamProxyEdit.vue +++ b/web_src/src/components/dialog/StreamProxyEdit.vue @@ -160,7 +160,7 @@ export default { type: "default", app: null, stream: null, - url: "rtmp://58.200.131.2/livetv/cctv5hd", + url: "", src_url: null, timeout_ms: null, ffmpeg_cmd_key: null,