From c42d391290adc50348807d623c4b689ab1f109fc Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 14 七月 2023 08:34:15 +0800
Subject: [PATCH] 修复数据存储
---
src/main/java/com/genersoft/iot/vmp/media/zlm/SendRtpPortManager.java | 56 ++++++++++++++++++++++-----
src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java | 5 +-
2 files changed, 48 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/SendRtpPortManager.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/SendRtpPortManager.java
index 8366a4a..1fb8256 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/SendRtpPortManager.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/SendRtpPortManager.java
@@ -1,12 +1,19 @@
package com.genersoft.iot.vmp.media.zlm;
+import com.genersoft.iot.vmp.common.VideoManagerConstants;
import com.genersoft.iot.vmp.conf.UserSetting;
+import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem;
import com.genersoft.iot.vmp.media.zlm.dto.MediaSendRtpPortInfo;
+import com.genersoft.iot.vmp.utils.redis.RedisUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@Component
public class SendRtpPortManager {
@@ -29,27 +36,54 @@
}
public int getNextPort(String mediaServerId) {
- String key = KEY + userSetting.getServerId() + "_" + mediaServerId;
- MediaSendRtpPortInfo mediaSendRtpPortInfo = (MediaSendRtpPortInfo)redisTemplate.opsForValue().get(key);
+ String key = VideoManagerConstants.PLATFORM_SEND_RTP_INFO_PREFIX
+ + userSetting.getServerId() + "_*";
+ List<Object> queryResult = RedisUtil.scan(redisTemplate, key);
+ Map<Integer, SendRtpItem> sendRtpItemMap = new HashMap<>();
+
+ for (Object o : queryResult) {
+ SendRtpItem sendRtpItem = (SendRtpItem) redisTemplate.opsForValue().get(o);
+ if (sendRtpItem != null) {
+ sendRtpItemMap.put(sendRtpItem.getLocalPort(), sendRtpItem);
+ }
+ }
+
+ String sendIndexKey = KEY + userSetting.getServerId() + "_" + mediaServerId;
+ MediaSendRtpPortInfo mediaSendRtpPortInfo = (MediaSendRtpPortInfo)redisTemplate.opsForValue().get(sendIndexKey);
if (mediaSendRtpPortInfo == null) {
logger.warn("[鍙戦�佺鍙ｇ鐞哴 鑾峰彇{}鐨勫彂閫佺鍙ｆ椂鏈壘鍒扮鍙ｄ俊鎭�", mediaSendRtpPortInfo);
return 0;
}
+ int port = getPort(mediaSendRtpPortInfo.getCurrent(),
+ mediaSendRtpPortInfo.getStart(),
+ mediaSendRtpPortInfo.getEnd(), checkPort -> sendRtpItemMap.get(checkPort) == null);
+
+ mediaSendRtpPortInfo.setCurrent(port);
+ redisTemplate.opsForValue().set(sendIndexKey, mediaSendRtpPortInfo);
+ return port;
+ }
+
+ interface CheckPortCallback{
+ boolean check(int port);
+ }
+
+ private int getPort(int current, int start, int end, CheckPortCallback checkPortCallback) {
int port;
- if (mediaSendRtpPortInfo.getCurrent() %2 != 0) {
- port = mediaSendRtpPortInfo.getCurrent() + 1;
+ if (current %2 != 0) {
+ port = current + 1;
}else {
- port = mediaSendRtpPortInfo.getCurrent() + 2;
+ port = current + 2;
}
- if (port > mediaSendRtpPortInfo.getEnd()) {
- if (mediaSendRtpPortInfo.getStart() %2 != 0) {
- port = mediaSendRtpPortInfo.getStart() + 1;
+ if (port > end) {
+ if (start %2 != 0) {
+ port = start + 1;
}else {
- port = mediaSendRtpPortInfo.getStart();
+ port = start;
}
}
- mediaSendRtpPortInfo.setCurrent(port);
- redisTemplate.opsForValue().set(key, mediaSendRtpPortInfo);
+ if (!checkPortCallback.check(port)) {
+ return getPort(port, start, end, checkPortCallback);
+ }
return port;
}
}
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java
index a9a66f5..1821522 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java
@@ -142,11 +142,12 @@
// 棰勫垱寤哄彂娴佷俊鎭�
int portForVideo = sendRtpPortManager.getNextPort(mediaServerItem.getId());
int portForAudio = sendRtpPortManager.getNextPort(mediaServerItem.getId());
- // 灏嗕俊鎭啓鍏edis涓紝浠ュ鍚庣敤
- redisTemplate.opsForValue().set(key, otherRtpSendInfo, 300, TimeUnit.SECONDS);
+
otherRtpSendInfo.setSendLocalIp(mediaServerItem.getSdpIp());
otherRtpSendInfo.setSendLocalPortForVideo(portForVideo);
otherRtpSendInfo.setSendLocalPortForAudio(portForAudio);
+ // 灏嗕俊鎭啓鍏edis涓紝浠ュ鍚庣敤
+ redisTemplate.opsForValue().set(key, otherRtpSendInfo, 300, TimeUnit.SECONDS);
logger.info("[绗笁鏂规湇鍔″鎺�->寮�鍚敹娴佸拰鑾峰彇鍙戞祦淇℃伅] 缁撴灉锛宑allId->{}锛� {}", callId, otherRtpSendInfo);
}
return otherRtpSendInfo;
--
Gitblit v1.8.0