From 652489b47ef582b3f492039ab7fd58c558c1ba36 Mon Sep 17 00:00:00 2001
From: ‘sxh’ <1632740646@qq.com>
Date: 星期四, 15 六月 2023 11:10:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/gb28181/session/SSRCFactory.java | 24 ++++++++----------------
1 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/session/SSRCFactory.java b/src/main/java/com/genersoft/iot/vmp/gb28181/session/SSRCFactory.java
index ec8e0ba..657bb2f 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/session/SSRCFactory.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/session/SSRCFactory.java
@@ -1,6 +1,7 @@
package com.genersoft.iot.vmp.gb28181.session;
import com.genersoft.iot.vmp.conf.SipConfig;
+import com.genersoft.iot.vmp.conf.UserSetting;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Component;
@@ -31,10 +32,13 @@
@Autowired
private SipConfig sipConfig;
+ @Autowired
+ private UserSetting userSetting;
+
public void initMediaServerSSRC(String mediaServerId, Set<String> usedSet) {
String ssrcPrefix = sipConfig.getDomain().substring(3, 8);
- String redisKey = SSRC_INFO_KEY + mediaServerId;
+ String redisKey = SSRC_INFO_KEY + userSetting.getServerId() + "_" + mediaServerId;
List<String> ssrcList = new ArrayList<>();
for (int i = 1; i < MAX_STREAM_COUNT; i++) {
String ssrc = String.format("%s%04d", ssrcPrefix, i);
@@ -77,7 +81,7 @@
return;
}
String sn = ssrc.substring(1);
- String redisKey = SSRC_INFO_KEY + mediaServerId;
+ String redisKey = SSRC_INFO_KEY + userSetting.getServerId() + "_" + mediaServerId;
redisTemplate.opsForSet().add(redisKey, sn);
}
@@ -86,7 +90,7 @@
*/
private String getSN(String mediaServerId) {
String sn = null;
- String redisKey = SSRC_INFO_KEY + mediaServerId;
+ String redisKey = SSRC_INFO_KEY + userSetting.getServerId() + "_" + mediaServerId;
Long size = redisTemplate.opsForSet().size(redisKey);
if (size == null || size == 0) {
throw new RuntimeException("ssrc宸茬粡鐢ㄥ畬");
@@ -113,20 +117,8 @@
* @param mediaServerId 娴佸獟浣撴湇鍔D
*/
public boolean hasMediaServerSSRC(String mediaServerId) {
- String redisKey = SSRC_INFO_KEY + mediaServerId;
+ String redisKey = SSRC_INFO_KEY + userSetting.getServerId() + "_" + mediaServerId;
return redisTemplate.opsForSet().members(redisKey) != null;
}
- /**
- * 鏌ヨssrc鏄惁鍙敤
- *
- * @param mediaServerId
- * @param ssrc
- * @return
- */
- public boolean checkSsrc(String mediaServerId, String ssrc) {
- String sn = ssrc.substring(1);
- String redisKey = SSRC_INFO_KEY + mediaServerId;
- return redisTemplate.opsForSet().isMember(redisKey, sn) != null;
- }
}
--
Gitblit v1.8.0