From ce8e74381121b24c833ddaf40ad330056ae71de9 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Mon, 2 Dec 2024 15:06:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iot/vmp/media/zlm/SendRtpPortManager.java    | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 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 fec66383..932f675e 100755
--- 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,5 +1,6 @@
 package com.genersoft.iot.vmp.media.zlm;
 
+import com.alibaba.fastjson2.JSON;
 import com.genersoft.iot.vmp.common.VideoManagerConstants;
 import com.genersoft.iot.vmp.conf.UserSetting;
 import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem;
@@ -31,16 +32,19 @@ public class SendRtpPortManager {
     private final String KEY = "VM_MEDIA_SEND_RTP_PORT_";
 
     public synchronized int getNextPort(MediaServerItem mediaServer) {
+        logger.info("[获取下一个端口] ");
+        logger.info(JSON.toJSONString(mediaServer));
         if (mediaServer == null) {
             logger.warn("[发送端口管理] 参数错误，mediaServer为NULL");
-            return -1;
+            return 0;
         }
         String sendIndexKey = KEY + userSetting.getServerId() + "_" +  mediaServer.getId();
         String key = VideoManagerConstants.PLATFORM_SEND_RTP_INFO_PREFIX
                 + userSetting.getServerId() + "_*";
         List<Object> queryResult = RedisUtil.scan(redisTemplate, key);
         Map<Integer, SendRtpItem> sendRtpItemMap = new HashMap<>();
-
+        logger.info("[获取下一个端口] queryResult");
+        logger.info(JSON.toJSONString(queryResult));
         for (Object o : queryResult) {
             SendRtpItem sendRtpItem = (SendRtpItem) redisTemplate.opsForValue().get(o);
             if (sendRtpItem != null) {
@@ -73,13 +77,17 @@ public class SendRtpPortManager {
         }
         if (redisTemplate == null || redisTemplate.getConnectionFactory() == null) {
             logger.warn("{}获取redis连接信息失败", mediaServer.getId());
-            return -1;
+            return 0;
         }
+        logger.info("[获取下一个端口] startPort{ {}, endPort:{}", startPort, endPort);
+        logger.info(JSON.toJSONString(queryResult));
 //        RedisAtomicInteger redisAtomicInteger = new RedisAtomicInteger(sendIndexKey , redisTemplate.getConnectionFactory());
 //        return redisAtomicInteger.getAndUpdate((current)->{
 //            return getPort(current, startPort, endPort, checkPort-> !sendRtpItemMap.containsKey(checkPort));
 //        });
-        return getSendPort(startPort, endPort, sendIndexKey, sendRtpItemMap);
+        int sendPort = getSendPort(startPort, endPort, sendIndexKey, sendRtpItemMap);
+        logger.info("[获取下一个端口] 发流端口{}", sendPort);
+        return sendPort;
     }
 
     private synchronized int getSendPort(int startPort, int endPort, String sendIndexKey, Map<Integer, SendRtpItem> sendRtpItemMap){