From 4ac63a158d16a0d2bce63f8fbadb9b7896397cd1 Mon Sep 17 00:00:00 2001
From: 648540858 <456panlinlin>
Date: 星期五, 01 四月 2022 17:13:11 +0800
Subject: [PATCH] 使用getHostAddress代替getHostName避免经过DNS时间过久
---
src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java | 76 ++++++++++++++++++++++++++------------
1 files changed, 52 insertions(+), 24 deletions(-)
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 1c8f191..aca3082 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
@@ -3,23 +3,20 @@
import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.conf.SipConfig;
-import com.genersoft.iot.vmp.conf.UserSetup;
-import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
+import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.gb28181.bean.GbStream;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
import com.genersoft.iot.vmp.gb28181.event.subscribe.catalog.CatalogEvent;
import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;
-import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig;
import com.genersoft.iot.vmp.media.zlm.dto.MediaItem;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
-import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
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.IVideoManagerStorage;
import com.genersoft.iot.vmp.storager.dao.GbStreamMapper;
import com.genersoft.iot.vmp.storager.dao.ParentPlatformMapper;
import com.genersoft.iot.vmp.storager.dao.PlatformGbStreamMapper;
@@ -44,7 +41,7 @@
private final static Logger logger = LoggerFactory.getLogger(StreamProxyServiceImpl.class);
@Autowired
- private IVideoManagerStorager videoManagerStorager;
+ private IVideoManagerStorage videoManagerStorager;
@Autowired
private IMediaService mediaService;
@@ -59,7 +56,10 @@
private IRedisCatchStorage redisCatchStorage;
@Autowired
- private UserSetup userSetup;
+ private IVideoManagerStorage storager;
+
+ @Autowired
+ private UserSetting userSetting;
@Autowired
private SipConfig sipConfig;
@@ -88,7 +88,7 @@
MediaServerItem mediaInfo;
WVPResult<StreamInfo> wvpResult = new WVPResult<>();
wvpResult.setCode(0);
- if ("auto".equals(param.getMediaServerId())){
+ if (param.getMediaServerId() == null || "auto".equals(param.getMediaServerId())){
mediaInfo = mediaServerService.getMediaServerForMinimumLoad();
}else {
mediaInfo = mediaServerService.getOne(param.getMediaServerId());
@@ -129,7 +129,7 @@
}else {
streamLive = true;
StreamInfo streamInfo = mediaService.getStreamInfoByAppAndStream(
- mediaInfo, param.getApp(), param.getStream(), null);
+ mediaInfo, param.getApp(), param.getStream(), null, null);
wvpResult.setData(streamInfo);
}
@@ -146,20 +146,23 @@
result.append(", 鍏宠仈鍥芥爣骞冲彴[ " + param.getPlatformGbId() + " ]澶辫触");
}
}
- // 鏌ユ壘寮�鍚簡鍏ㄩ儴鐩存挱娴佸叡浜殑涓婄骇骞冲彴
- List<ParentPlatform> parentPlatforms = parentPlatformMapper.selectAllAhareAllLiveStream();
- if (parentPlatforms.size() > 0) {
- for (ParentPlatform parentPlatform : parentPlatforms) {
- param.setPlatformId(parentPlatform.getServerGBId());
- param.setCatalogId(parentPlatform.getCatalogId());
- String stream = param.getStream();
- StreamProxyItem streamProxyItems = platformGbStreamMapper.selectOne(param.getApp(), stream, parentPlatform.getServerGBId());
- if (streamProxyItems == null) {
- platformGbStreamMapper.add(param);
- eventPublisher.catalogEventPublishForStream(parentPlatform.getServerGBId(), param, CatalogEvent.ADD);
+ if (!StringUtils.isEmpty(param.getGbId())) {
+ // 鏌ユ壘寮�鍚簡鍏ㄩ儴鐩存挱娴佸叡浜殑涓婄骇骞冲彴
+ List<ParentPlatform> parentPlatforms = parentPlatformMapper.selectAllAhareAllLiveStream();
+ if (parentPlatforms.size() > 0) {
+ for (ParentPlatform parentPlatform : parentPlatforms) {
+ param.setPlatformId(parentPlatform.getServerGBId());
+ param.setCatalogId(parentPlatform.getCatalogId());
+ String stream = param.getStream();
+ StreamProxyItem streamProxyItems = platformGbStreamMapper.selectOne(param.getApp(), stream, parentPlatform.getServerGBId());
+ if (streamProxyItems == null) {
+ platformGbStreamMapper.add(param);
+ eventPublisher.catalogEventPublishForStream(parentPlatform.getServerGBId(), param, CatalogEvent.ADD);
+ }
}
}
}
+
wvpResult.setMsg(result.toString());
return wvpResult;
}
@@ -275,7 +278,27 @@
@Override
public void zlmServerOnline(String mediaServerId) {
- zlmServerOffline(mediaServerId);
+ // 绉婚櫎寮�鍚簡鏃犱汉瑙傜湅鑷姩绉婚櫎鐨勬祦
+ List<StreamProxyItem> streamProxyItemList = streamProxyMapper.selecAutoRemoveItemByMediaServerId(mediaServerId);
+ if (streamProxyItemList.size() > 0) {
+ gbStreamMapper.batchDel(streamProxyItemList);
+ }
+ streamProxyMapper.deleteAutoRemoveItemByMediaServerId(mediaServerId);
+
+ // 鎭㈠娴佷唬鐞�, 鍙煡鎵捐繖涓繖涓祦濯掍綋
+ List<StreamProxyItem> streamProxyListForEnable = storager.getStreamProxyListForEnableInMediaServer(
+ mediaServerId, true, false);
+ for (StreamProxyItem streamProxyDto : streamProxyListForEnable) {
+ logger.info("鎭㈠娴佷唬鐞嗭紝" + streamProxyDto.getApp() + "/" + streamProxyDto.getStream());
+ JSONObject jsonObject = addStreamProxyToZlm(streamProxyDto);
+ if (jsonObject == null) {
+ // 璁剧疆涓虹绾�
+ logger.info("鎭㈠娴佷唬鐞嗗け璐�" + streamProxyDto.getApp() + "/" + streamProxyDto.getStream());
+ updateStatus(false, streamProxyDto.getApp(), streamProxyDto.getStream());
+ }else {
+ updateStatus(true, streamProxyDto.getApp(), streamProxyDto.getStream());
+ }
+ }
}
@Override
@@ -286,8 +309,8 @@
gbStreamMapper.batchDel(streamProxyItemList);
}
streamProxyMapper.deleteAutoRemoveItemByMediaServerId(mediaServerId);
- // 鍏朵粬鐨勬祦璁剧疆鏈惎鐢�
- streamProxyMapper.updateStatus(false, mediaServerId);
+ // 鍏朵粬鐨勬祦璁剧疆绂荤嚎
+ streamProxyMapper.updateStatusByMediaServerId(false, mediaServerId);
String type = "PULL";
// 鍙戦�乺edis娑堟伅
@@ -295,7 +318,7 @@
if (mediaItems.size() > 0) {
for (MediaItem mediaItem : mediaItems) {
JSONObject jsonObject = new JSONObject();
- jsonObject.put("serverId", userSetup.getServerId());
+ jsonObject.put("serverId", userSetting.getServerId());
jsonObject.put("app", mediaItem.getApp());
jsonObject.put("stream", mediaItem.getStream());
jsonObject.put("register", false);
@@ -311,4 +334,9 @@
public void clean() {
}
+
+ @Override
+ public int updateStatus(boolean status, String app, String stream) {
+ return streamProxyMapper.updateStatus(status, app, stream);
+ }
}
--
Gitblit v1.8.0