From d48f89eee40c58b2f0b69aaf4d7fab469dc4657b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 24 七月 2023 09:04:47 +0800
Subject: [PATCH] 修复端口分配的并发问题

---
 src/main/java/com/genersoft/iot/vmp/media/zlm/SendRtpPortManager.java        |   93 ++++++++-----
 /dev/null                                                                    |   50 -------
 src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java        |    2 
 src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java |   28 ----
 src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java          |    4 
 src/main/java/com/genersoft/iot/vmp/common/CommonGbChannel.java              |  191 +++++++++++++++++++++++++++
 src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java          |    4 
 src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java    |   12 +
 8 files changed, 265 insertions(+), 119 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/common/CommonGbChannel.java b/src/main/java/com/genersoft/iot/vmp/common/CommonGbChannel.java
new file mode 100644
index 0000000..b289a14
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/common/CommonGbChannel.java
@@ -0,0 +1,191 @@
+package com.genersoft.iot.vmp.common;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+public class CommonGbChannel {
+
+    /**
+     * 鍥芥爣瀛楁锛氬綊灞�
+     */
+    @Schema(description = "褰掑睘")
+    private String owner;
+
+    /**
+     * 鍥芥爣瀛楁锛氳鏀垮尯鍒�
+     */
+    @Schema(description = "琛屾斂鍖哄垝")
+    private String civilCode;
+
+    /**
+     * 鍥芥爣瀛楁锛氬畨瑁呭湴鍧�
+     */
+    @Schema(description = "瀹夎鍦板潃")
+    private String address;
+
+    /**
+     * 鍥芥爣瀛楁锛氱粡搴�
+     */
+    @Schema(description = "缁忓害")
+    private Double longitude;
+
+    /**
+     * 鍥芥爣瀛楁锛氱含搴�
+     */
+    @Schema(description = "绾害")
+    private Double latitude;
+
+    /**
+     * 鍥芥爣瀛楁锛氭憚鍍忔満绫诲瀷:
+     * 1-鐞冩満;
+     * 2-鍗婄悆;
+     * 3-鍥哄畾鏋満;
+     * 4-閬ユ帶鏋満
+     */
+    @Schema(description = "鎽勫儚鏈虹被鍨�")
+    private Integer ptzType;
+
+    /**
+     * 鍥芥爣瀛楁锛氭憚鍍忔満浣嶇疆绫诲瀷鎵╁睍銆�
+     * 1-鐪侀檯妫�鏌ョ珯銆�
+     * 2-鍏氭斂鏈哄叧銆�
+     * 3-杞︾珯鐮佸ご銆�
+     * 4-涓績骞垮満銆�
+     * 5-浣撹偛鍦洪銆�
+     * 6-鍟嗕笟涓績銆�
+     * 7-瀹楁暀鍦烘墍銆�
+     * 8-鏍″洯鍛ㄨ竟銆�
+     * 9-娌诲畨澶嶆潅鍖哄煙銆�
+     * 10-浜ら�氬共绾�
+     */
+    @Schema(description = "鎽勫儚鏈轰綅缃被鍨嬫墿灞�")
+    private Integer positionType;
+
+    /**
+     * 鍥芥爣瀛楁锛氬畨瑁呬綅缃澶栥�佸鍐呭睘鎬�
+     * 1-瀹ゅ銆�
+     * 2-瀹ゅ唴
+     */
+    @Schema(description = "瀹夎浣嶇疆瀹ゅ銆佸鍐呭睘鎬�")
+    private Integer roomType;
+
+    /**
+     * 鍥芥爣瀛楁锛氱敤閫�
+     * 1-娌诲畨銆�
+     * 2-浜ら�氥��
+     * 3-閲嶇偣銆�
+     */
+    @Schema(description = "鐢ㄩ��")
+    private Integer useType;
+
+    /**
+     * 鍥芥爣瀛楁锛氳ˉ鍏夊睘鎬�
+     * 1-鏃犺ˉ鍏夈��
+     * 2-绾㈠琛ュ厜銆�
+     * 3-鐧藉厜琛ュ厜
+     */
+    @Schema(description = "琛ュ厜灞炴��")
+    private Integer supplyLightType;
+
+    /**
+     * 鎽勫儚鏈虹洃瑙嗘柟浣嶅睘鎬с��
+     * 1-涓溿��
+     * 2-瑗裤��
+     * 3-鍗椼��
+     * 4-鍖椼��
+     * 5-涓滃崡銆�
+     * 6-涓滃寳銆�
+     * 7-瑗垮崡銆�
+     * 8-瑗垮寳
+     *
+     */
+    @Schema(description = "鏂逛綅")
+    private Integer directionType;
+
+    public String getOwner() {
+        return owner;
+    }
+
+    public void setOwner(String owner) {
+        this.owner = owner;
+    }
+
+    public String getCivilCode() {
+        return civilCode;
+    }
+
+    public void setCivilCode(String civilCode) {
+        this.civilCode = civilCode;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public Double getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(Double longitude) {
+        this.longitude = longitude;
+    }
+
+    public Double getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(Double latitude) {
+        this.latitude = latitude;
+    }
+
+    public Integer getPtzType() {
+        return ptzType;
+    }
+
+    public void setPtzType(Integer ptzType) {
+        this.ptzType = ptzType;
+    }
+
+    public Integer getPositionType() {
+        return positionType;
+    }
+
+    public void setPositionType(Integer positionType) {
+        this.positionType = positionType;
+    }
+
+    public Integer getRoomType() {
+        return roomType;
+    }
+
+    public void setRoomType(Integer roomType) {
+        this.roomType = roomType;
+    }
+
+    public Integer getUseType() {
+        return useType;
+    }
+
+    public void setUseType(Integer useType) {
+        this.useType = useType;
+    }
+
+    public Integer getSupplyLightType() {
+        return supplyLightType;
+    }
+
+    public void setSupplyLightType(Integer supplyLightType) {
+        this.supplyLightType = supplyLightType;
+    }
+
+    public Integer getDirectionType() {
+        return directionType;
+    }
+
+    public void setDirectionType(Integer directionType) {
+        this.directionType = directionType;
+    }
+}
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 893e52a..f960c7d 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
@@ -3,12 +3,14 @@
 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.media.zlm.dto.MediaServerItem;
 import com.genersoft.iot.vmp.utils.redis.RedisUtil;
+import org.apache.commons.lang3.math.NumberUtils;
 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.data.redis.support.atomic.RedisAtomicInteger;
 import org.springframework.stereotype.Component;
 
 import java.util.HashMap;
@@ -26,23 +28,14 @@
     @Autowired
     private RedisTemplate<Object, Object> redisTemplate;
 
-    private final String KEY = "VM_MEDIA_SEND_RTP_PORT_RANGE_";
+    private final String KEY = "VM_MEDIA_SEND_RTP_PORT_";
 
-
-    public void initServerPort(String mediaServerId, int startPort, int endPort){
-        String key = KEY + userSetting.getServerId() + "_" +  mediaServerId;
-        MediaSendRtpPortInfo mediaSendRtpPortInfo = new MediaSendRtpPortInfo(startPort, endPort, mediaServerId);
-        redisTemplate.opsForValue().set(key, mediaSendRtpPortInfo);
-    }
-
-    public int getNextPort(String mediaServerId) {
-        String sendIndexKey = KEY + userSetting.getServerId() + "_" +  mediaServerId;
-        MediaSendRtpPortInfo mediaSendRtpPortInfo = (MediaSendRtpPortInfo)redisTemplate.opsForValue().get(sendIndexKey);
-        if (mediaSendRtpPortInfo == null) {
-            logger.warn("[鍙戦�佺鍙g鐞哴 鑾峰彇{}鐨勫彂閫佺鍙f椂鏈壘鍒扮鍙d俊鎭�", mediaServerId);
-            return 0;
+    public int getNextPort(MediaServerItem mediaServer) {
+        if (mediaServer == null) {
+            logger.warn("[鍙戦�佺鍙g鐞哴 鍙傛暟閿欒锛宮ediaServer涓篘ULL");
+            return -1;
         }
-
+        String sendIndexKey = KEY + userSetting.getServerId() + "_" +  mediaServer.getId();
         String key = VideoManagerConstants.PLATFORM_SEND_RTP_INFO_PREFIX
                 + userSetting.getServerId() + "_*";
         List<Object> queryResult = RedisUtil.scan(redisTemplate, key);
@@ -54,14 +47,39 @@
                 sendRtpItemMap.put(sendRtpItem.getLocalPort(), sendRtpItem);
             }
         }
+        String sendRtpPortRange = mediaServer.getSendRtpPortRange();
+        int startPort;
+        int endPort;
+        if (sendRtpPortRange == null) {
+            logger.warn("{}鏈缃彂閫佺鍙i粯璁ゅ�硷紝鑷姩浣跨敤40000-50000浣滀负绔彛鑼冨洿", mediaServer.getId());
+            String[] portArray = sendRtpPortRange.split(",");
+            if (portArray.length != 2 || !NumberUtils.isParsable(portArray[0]) || !NumberUtils.isParsable(portArray[1])) {
+                logger.warn("{}鍙戦�佺鍙i厤缃牸寮忛敊璇紝鑷姩浣跨敤40000-50000浣滀负绔彛鑼冨洿", mediaServer.getId());
+                startPort = 50000;
+                endPort = 60000;
+            }else {
 
-        int port = getPort(mediaSendRtpPortInfo.getCurrent(),
-                mediaSendRtpPortInfo.getStart(),
-                mediaSendRtpPortInfo.getEnd(), checkPort -> sendRtpItemMap.get(checkPort) == null);
-
-        mediaSendRtpPortInfo.setCurrent(port);
-        redisTemplate.opsForValue().set(sendIndexKey, mediaSendRtpPortInfo);
-        return port;
+                if ( Integer.parseInt(portArray[1]) - Integer.parseInt(portArray[0]) < 1) {
+                    logger.warn("{}鍙戦�佺鍙i厤缃敊璇�,缁撴潫绔彛鑷冲皯姣斿紑濮嬬鍙eぇ涓�锛岃嚜鍔ㄤ娇鐢�40000-50000浣滀负绔彛鑼冨洿", mediaServer.getId());
+                    startPort = 50000;
+                    endPort = 60000;
+                }else {
+                    startPort = Integer.parseInt(portArray[0]);
+                    endPort = Integer.parseInt(portArray[1]);
+                }
+            }
+        }else {
+            startPort = 50000;
+            endPort = 60000;
+        }
+        if (redisTemplate == null || redisTemplate.getConnectionFactory() == null) {
+            logger.warn("{}鑾峰彇redis杩炴帴淇℃伅澶辫触", mediaServer.getId());
+            return -1;
+        }
+        RedisAtomicInteger redisAtomicInteger = new RedisAtomicInteger(sendIndexKey , redisTemplate.getConnectionFactory());
+        return redisAtomicInteger.getAndUpdate((current)->{
+            return getPort(current, startPort, endPort, checkPort-> !sendRtpItemMap.containsKey(checkPort));
+        });
     }
 
     interface CheckPortCallback{
@@ -69,22 +87,25 @@
     }
 
     private int getPort(int current, int start, int end, CheckPortCallback checkPortCallback) {
-        int port;
-        if (current %2 != 0) {
-            port = current + 1;
-        }else {
-            port = current + 2;
-        }
-        if (port > end) {
-            if (start %2 != 0) {
-                port = start + 1;
+        if (current <= 0) {
+            if (start%2 == 0) {
+                current = start;
             }else {
-                port = start;
+                current = start + 1;
+            }
+        }else {
+            current += 2;
+            if (current > end) {
+                if (start%2 == 0) {
+                    current = start;
+                }else {
+                    current = start + 1;
+                }
             }
         }
-        if (!checkPortCallback.check(port)) {
-            return getPort(port, start, end, checkPortCallback);
+        if (!checkPortCallback.check(current)) {
+            return getPort(current + 2, start, end, checkPortCallback);
         }
-        return port;
+        return current;
     }
 }
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java
index 7fe92ae..34acf15 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java
@@ -167,7 +167,7 @@
         // 榛樿涓洪殢鏈虹鍙�
         int localPort = 0;
         if (userSetting.getGbSendStreamStrict()) {
-            localPort = sendRtpPortManager.getNextPort(serverItem.getId());
+            localPort = sendRtpPortManager.getNextPort(serverItem);
             if (localPort == 0) {
                 return null;
             }
@@ -203,7 +203,7 @@
         // 榛樿涓洪殢鏈虹鍙�
         int localPort = 0;
         if (userSetting.getGbSendStreamStrict()) {
-            localPort = sendRtpPortManager.getNextPort(serverItem.getId());
+            localPort = sendRtpPortManager.getNextPort(serverItem);
             if (localPort == 0) {
                 return null;
             }
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaSendRtpPortInfo.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaSendRtpPortInfo.java
deleted file mode 100644
index 2e9f631..0000000
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaSendRtpPortInfo.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.genersoft.iot.vmp.media.zlm.dto;
-
-public class MediaSendRtpPortInfo {
-
-    private int start;
-    private int end;
-    private String mediaServerId;
-
-    private int current;
-
-
-    public MediaSendRtpPortInfo(int start, int end, String mediaServerId) {
-        this.start = start;
-        this.current = start;
-        this.end = end;
-        this.mediaServerId = mediaServerId;
-    }
-
-    public int getStart() {
-        return start;
-    }
-
-    public void setStart(int start) {
-        this.start = start;
-    }
-
-    public int getEnd() {
-        return end;
-    }
-
-    public void setEnd(int end) {
-        this.end = end;
-    }
-
-    public String getMediaServerId() {
-        return mediaServerId;
-    }
-
-    public void setMediaServerId(String mediaServerId) {
-        this.mediaServerId = mediaServerId;
-    }
-
-    public int getCurrent() {
-        return current;
-    }
-
-    public void setCurrent(int current) {
-        this.current = current;
-    }
-}
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 a79b410..142b810 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
@@ -119,34 +119,6 @@
             if (ssrcFactory.hasMediaServerSSRC(mediaServerItem.getId())) {
                 ssrcFactory.initMediaServerSSRC(mediaServerItem.getId(), null);
             }
-            if (userSetting.getGbSendStreamStrict()) {
-                int startPort = 50000;
-                int endPort = 60000;
-                String sendRtpPortRange = mediaServerItem.getSendRtpPortRange();
-                if (sendRtpPortRange == null) {
-                    logger.warn("[zlm] ] 鏈厤缃彂娴佺鍙h寖鍥达紝榛樿浣跨敤50000鍒�60000");
-                }else {
-                    String[] sendRtpPortRangeArray = sendRtpPortRange.trim().split(",");
-                    if (sendRtpPortRangeArray.length != 2) {
-                        logger.warn("[zlm] ] 鍙戞祦绔彛鑼冨洿閿欒锛岄粯璁や娇鐢�50000鍒�60000");
-                    }else {
-                        try {
-                            startPort = Integer.parseInt(sendRtpPortRangeArray[0]);
-                            endPort = Integer.parseInt(sendRtpPortRangeArray[1]);
-                            if (endPort <= startPort) {
-                                logger.warn("[zlm] ] 鍙戞祦绔彛鑼冨洿閿欒锛岀粨鏉熺鍙e簲澶т簬寮�濮嬬鍙�,浣跨敤榛樿绔彛");
-                                startPort = 50000;
-                                endPort = 60000;
-                            }
-
-                        }catch (NumberFormatException e) {
-                            logger.warn("[zlm] ] 鍙戞祦绔彛鑼冨洿閿欒锛岄粯璁や娇鐢�50000鍒�60000");
-                        }
-                    }
-                }
-                logger.info("[[zlm] ] 閰嶇疆鍙戞祦绔彛鑼冨洿锛寋}-{}", startPort, endPort);
-                sendRtpPortManager.initServerPort(mediaServerItem.getId(), startPort, endPort);
-            }
             // 鏌ヨredis鏄惁瀛樺湪姝ediaServer
             String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + userSetting.getServerId() + "_" + mediaServerItem.getId();
             Boolean hasKey = redisTemplate.hasKey(key);
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
index e0494bc..4f487ad 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
@@ -269,7 +269,7 @@
                         InviteErrorCode.SUCCESS.getCode(),
                         InviteErrorCode.SUCCESS.getMsg(),
                         streamInfo);
-                logger.info("[鐐规挱鎴愬姛] deviceId: {}, channelId:{}, 鐮佹祦绫诲瀷锛歿}", device.getDeviceId(),
+                logger.info("[鐐规挱鎴愬姛] deviceId: {}, channelId:{}, 鐮佹祦绫诲瀷锛歿}", device.getDeviceId(), channelId,
                         device.isSwitchPrimarySubStream() ? "杈呯爜娴�" : "涓荤爜娴�");
                 snapOnPlay(mediaServerItemInuse, device.getDeviceId(), channelId, ssrcInfo.getStream());
             }, (event) -> {
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 513e940..638ed3f 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
@@ -139,8 +139,8 @@
         redisTemplate.opsForValue().set(receiveKey, otherRtpSendInfo);
         if (isSend != null && isSend) {
             // 棰勫垱寤哄彂娴佷俊鎭�
-            int portForVideo = sendRtpPortManager.getNextPort(mediaServerItem.getId());
-            int portForAudio = sendRtpPortManager.getNextPort(mediaServerItem.getId());
+            int portForVideo = sendRtpPortManager.getNextPort(mediaServerItem);
+            int portForAudio = sendRtpPortManager.getNextPort(mediaServerItem);
 
             otherRtpSendInfo.setSendLocalIp(mediaServerItem.getSdpIp());
             otherRtpSendInfo.setSendLocalPortForVideo(portForVideo);
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java
index bef7ffb..f4bcb1a 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java
@@ -8,6 +8,7 @@
 import com.genersoft.iot.vmp.conf.UserSetting;
 import com.genersoft.iot.vmp.conf.VersionInfo;
 import com.genersoft.iot.vmp.conf.exception.ControllerException;
+import com.genersoft.iot.vmp.media.zlm.SendRtpPortManager;
 import com.genersoft.iot.vmp.media.zlm.ZlmHttpHookSubscribe;
 import com.genersoft.iot.vmp.media.zlm.dto.IHookSubscribe;
 import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
@@ -71,6 +72,9 @@
 
     @Autowired
     private IRedisCatchStorage redisCatchStorage;
+
+    @Autowired
+    private SendRtpPortManager sendRtpPortManager;
 
 
     @GetMapping(value = "/media_server/list")
@@ -262,4 +266,12 @@
 
         return result;
     }
+
+    @PostMapping(value = "/test/getPort")
+    @ResponseBody
+    public int getPort() {
+        int result = sendRtpPortManager.getNextPort(mediaServerService.getDefaultMediaServer());
+        System.out.println(result);
+        return result;
+    }
 }

--
Gitblit v1.8.0