From 335916f1f15eb9d0b34dea38cacee2300eac0606 Mon Sep 17 00:00:00 2001
From: 李防 <liguofang0703@126.com>
Date: 星期一, 07 三月 2022 14:20:27 +0800
Subject: [PATCH] InviteRequestProcessor类中，channelid从invite消息的header subject获取，不再从第一行request line获取。原因是和第三方平台对接时，发送的invite消息第一行为国标平台编码而不是设备通道编码，导致报错通道不存在，返回404。
---
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java | 108 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 81 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
index cd5f8ab..f226a37 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.common.VideoManagerConstants;
+import com.genersoft.iot.vmp.conf.MediaConfig;
import com.genersoft.iot.vmp.conf.SipConfig;
import com.genersoft.iot.vmp.conf.UserSetup;
import com.genersoft.iot.vmp.gb28181.bean.Device;
@@ -14,8 +15,11 @@
import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory;
import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig;
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.IStreamProxyService;
import com.genersoft.iot.vmp.service.bean.SSRCInfo;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import com.genersoft.iot.vmp.storager.dao.MediaServerMapper;
import com.genersoft.iot.vmp.utils.redis.JedisUtil;
import com.genersoft.iot.vmp.utils.redis.RedisUtil;
@@ -27,7 +31,11 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.CommandLineRunner;
import org.springframework.core.annotation.Order;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.security.core.parameters.P;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.TransactionStatus;
import org.springframework.util.StringUtils;
import java.text.ParseException;
@@ -38,8 +46,7 @@
* 濯掍綋鏈嶅姟鍣ㄨ妭鐐圭鐞�
*/
@Service
-@Order(value=2)
-public class MediaServerServiceImpl implements IMediaServerService, CommandLineRunner {
+public class MediaServerServiceImpl implements IMediaServerService {
private final static Logger logger = LoggerFactory.getLogger(MediaServerServiceImpl.class);
@@ -62,6 +69,12 @@
private MediaServerMapper mediaServerMapper;
@Autowired
+ DataSourceTransactionManager dataSourceTransactionManager;
+
+ @Autowired
+ TransactionDefinition transactionDefinition;
+
+ @Autowired
private VideoStreamSessionManager streamSession;
@Autowired
@@ -69,6 +82,12 @@
@Autowired
private RedisUtil redisUtil;
+
+ @Autowired
+ private IVideoManagerStorager storager;
+
+ @Autowired
+ private IStreamProxyService streamProxyService;
@Autowired
private EventPublisher publisher;
@@ -82,9 +101,8 @@
* 鍒濆鍖�
*/
@Override
- public void run(String... args) throws Exception {
+ public void updateVmServer(List<MediaServerItem> mediaServerItemList) {
logger.info("[缂撳瓨鍒濆鍖朷 Media Server ");
- List<MediaServerItem> mediaServerItemList = mediaServerMapper.queryAll();
for (MediaServerItem mediaServerItem : mediaServerItemList) {
if (StringUtils.isEmpty(mediaServerItem.getId())) {
continue;
@@ -142,15 +160,16 @@
}
@Override
- public void closeRTPServer(Device device, String channelId) {
- String mediaServerId = streamSession.getMediaServerId(device.getDeviceId(), channelId);
+ public void closeRTPServer(String deviceId, String channelId, String stream) {
+ String mediaServerId = streamSession.getMediaServerId(deviceId, channelId, stream);
+ String ssrc = streamSession.getSSRC(deviceId, channelId, stream);
MediaServerItem mediaServerItem = this.getOne(mediaServerId);
if (mediaServerItem != null) {
- String streamId = String.format("%s_%s", device.getDeviceId(), channelId);
+ String streamId = String.format("%s_%s", deviceId, channelId);
zlmrtpServerFactory.closeRTPServer(mediaServerItem, streamId);
- releaseSsrc(mediaServerItem, streamSession.getSSRC(device.getDeviceId(), channelId));
+ releaseSsrc(mediaServerItem, ssrc);
}
- streamSession.remove(device.getDeviceId(), channelId);
+ streamSession.remove(deviceId, channelId, stream);
}
@Override
@@ -204,7 +223,8 @@
String key = (String) mediaServerKey;
MediaServerItem mediaServerItem = (MediaServerItem) redisUtil.get(key);
// 妫�鏌ョ姸鎬�
- if (redisUtil.zScore(onlineKey, mediaServerItem.getId()) != null) {
+ Double aDouble = redisUtil.zScore(onlineKey, mediaServerItem.getId());
+ if (aDouble != null) {
mediaServerItem.setStatus(true);
}
result.add(mediaServerItem);
@@ -231,6 +251,7 @@
public List<MediaServerItem> getAllOnline() {
String key = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX + userSetup.getServerId();
Set<String> mediaServerIdSet = redisUtil.zRevRange(key, 0, -1);
+
List<MediaServerItem> result = new ArrayList<>();
if (mediaServerIdSet != null && mediaServerIdSet.size() > 0) {
for (String mediaServerId : mediaServerIdSet) {
@@ -238,6 +259,7 @@
result.add((MediaServerItem) redisUtil.get(serverKey));
}
}
+ Collections.reverse(result);
return result;
}
@@ -256,12 +278,8 @@
}
@Override
- public MediaServerItem getOneByHostAndPort(String host, int port) {
- return mediaServerMapper.queryOneByHostAndPort(host, port);
- }
-
- @Override
public MediaServerItem getDefaultMediaServer() {
+
return mediaServerMapper.queryDefault();
}
@@ -312,7 +330,22 @@
@Override
public int updateToDatabase(MediaServerItem mediaSerItem) {
- return mediaServerMapper.update(mediaSerItem);
+ int result = 0;
+ if (mediaSerItem.isDefaultServer()) {
+ TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
+ int delResult = mediaServerMapper.delDefault();
+ if (delResult == 0) {
+ logger.error("绉婚櫎鏁版嵁搴撻粯璁lm鑺傜偣澶辫触");
+ //浜嬪姟鍥炴粴
+ dataSourceTransactionManager.rollback(transactionStatus);
+ return 0;
+ }
+ result = mediaServerMapper.add(mediaSerItem);
+ dataSourceTransactionManager.commit(transactionStatus); //鎵嬪姩鎻愪氦
+ }else {
+ result = mediaServerMapper.update(mediaSerItem);
+ }
+ return result;
}
/**
@@ -321,15 +354,13 @@
*/
@Override
public void zlmServerOnline(ZLMServerConfig zlmServerConfig) {
- logger.info("[ ZLM锛歿} ]-[ {}:{} ]宸茶繛鎺�",
+ logger.info("[ ZLM锛歿} ]-[ {}:{} ]姝ｅ湪杩炴帴",
zlmServerConfig.getGeneralMediaServerId(), zlmServerConfig.getIp(), zlmServerConfig.getHttpPort());
MediaServerItem serverItem = mediaServerMapper.queryOne(zlmServerConfig.getGeneralMediaServerId());
if (serverItem == null) {
- serverItem = mediaServerMapper.queryOneByHostAndPort(zlmServerConfig.getIp(), zlmServerConfig.getHttpPort());
- }
- if (serverItem == null) {
- logger.warn("[鏈敞鍐岀殑zlm] 鎷掓帴鎺ュ叆锛氭潵鑷獅}锛歿}", zlmServerConfig.getIp(),zlmServerConfig.getHttpPort() );
+ logger.warn("[鏈敞鍐岀殑zlm] 鎷掓帴鎺ュ叆锛歿}鏉ヨ嚜{}锛歿}", zlmServerConfig.getGeneralMediaServerId(), zlmServerConfig.getIp(),zlmServerConfig.getHttpPort() );
+ logger.warn("璇锋鏌LM鐨�<general.mediaServerId>閰嶇疆鏄惁涓嶹VP鐨�<media.id>涓�鑷�");
return;
}
serverItem.setHookAliveInterval(zlmServerConfig.getHookAliveInterval());
@@ -357,11 +388,10 @@
serverItem.setStatus(true);
if (StringUtils.isEmpty(serverItem.getId())) {
- serverItem.setId(zlmServerConfig.getGeneralMediaServerId());
- mediaServerMapper.updateByHostAndPort(serverItem);
- }else {
- mediaServerMapper.update(serverItem);
+ logger.warn("[鏈敞鍐岀殑zlm] serverItem缂哄皯ID锛� 鏃犳硶鎺ュ叆锛歿}锛歿}", zlmServerConfig.getIp(),zlmServerConfig.getHttpPort() );
+ return;
}
+ mediaServerMapper.update(serverItem);
String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetup.getServerId() + "_" + zlmServerConfig.getGeneralMediaServerId();
if (redisUtil.get(key) == null) {
SsrcConfig ssrcConfig = new SsrcConfig(zlmServerConfig.getGeneralMediaServerId(), null, sipConfig.getDomain());
@@ -374,8 +404,10 @@
resetOnlineServerItem(serverItem);
updateMediaServerKeepalive(serverItem.getId(), null);
setZLMConfig(serverItem, "0".equals(zlmServerConfig.getHookEnable()));
- publisher.zlmOnlineEventPublish(serverItem.getId());
+ publisher.zlmOnlineEventPublish(serverItem.getId());
+ logger.info("[ ZLM锛歿} ]-[ {}:{} ]杩炴帴鎴愬姛",
+ zlmServerConfig.getGeneralMediaServerId(), zlmServerConfig.getIp(), zlmServerConfig.getHttpPort());
}
@@ -452,7 +484,7 @@
*/
@Override
public void setZLMConfig(MediaServerItem mediaServerItem, boolean restart) {
- logger.info("[ ZLM锛歿} ]-[ {}:{} ]璁剧疆zlm",
+ logger.info("[ ZLM锛歿} ]-[ {}:{} ]姝ｅ湪璁剧疆zlm",
mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
String protocol = sslEnabled ? "https" : "http";
String hookPrex = String.format("%s://%s:%s/index/hook", protocol, mediaServerItem.getHookIp(), serverPort);
@@ -577,6 +609,11 @@
String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetup.getServerId() + "_" + id;
redisUtil.del(key);
}
+ @Override
+ public void deleteDb(String id){
+ //鍚屾鍒犻櫎鏁版嵁搴撲腑鐨勬暟鎹�
+ mediaServerMapper.delOne(id);
+ }
@Override
public void updateMediaServerKeepalive(String mediaServerId, JSONObject data) {
@@ -589,4 +626,21 @@
int hookAliveInterval = mediaServerItem.getHookAliveInterval() + 2;
redisUtil.set(key, data, hookAliveInterval);
}
+
+ @Override
+ public void syncCatchFromDatabase() {
+ List<MediaServerItem> allInCatch = getAll();
+ List<MediaServerItem> allInDatabase = mediaServerMapper.queryAll();
+ Map<String, MediaServerItem> mediaServerItemMap = new HashMap<>();
+
+ for (MediaServerItem mediaServerItem : allInDatabase) {
+ mediaServerItemMap.put(mediaServerItem.getId(), mediaServerItem);
+ }
+ for (MediaServerItem mediaServerItem : allInCatch) {
+ if (mediaServerItemMap.get(mediaServerItem) == null) {
+ delete(mediaServerItem.getId());
+ }
+ }
+ }
+
}
--
Gitblit v1.8.0