From ccc0a99d6894844d83d751b924cfebe74da7826c Mon Sep 17 00:00:00 2001
From: ‘sxh’ <1632740646@qq.com>
Date: 星期四, 15 六月 2023 11:20:43 +0800
Subject: [PATCH] 同步主线的代码，保持一致性
---
src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java | 167 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 100 insertions(+), 67 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java b/src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java
index d7cb5d2..a5da018 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java
@@ -1,104 +1,137 @@
package com.genersoft.iot.vmp.gb28181.session;
+import com.genersoft.iot.vmp.common.InviteSessionType;
+import com.genersoft.iot.vmp.common.VideoManagerConstants;
+import com.genersoft.iot.vmp.conf.UserSetting;
+import com.genersoft.iot.vmp.gb28181.bean.SipTransactionInfo;
+import com.genersoft.iot.vmp.gb28181.bean.SsrcTransaction;
+import com.genersoft.iot.vmp.utils.JsonUtil;
+import com.genersoft.iot.vmp.utils.redis.RedisUtil;
+import gov.nist.javax.sip.message.SIPResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
+
import java.util.ArrayList;
import java.util.List;
-import javax.sip.ClientTransaction;
-import javax.sip.Dialog;
-
-import com.genersoft.iot.vmp.common.VideoManagerConstants;
-import com.genersoft.iot.vmp.gb28181.bean.SsrcTransaction;
-import com.genersoft.iot.vmp.utils.SerializeUtils;
-import com.genersoft.iot.vmp.utils.redis.RedisUtil;
-import gov.nist.javax.sip.stack.SIPDialog;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description:瑙嗛娴乻ession绠＄悊鍣紝绠＄悊瑙嗛棰勮銆侀瑙堝洖鏀剧殑閫氫俊鍙ユ焺
- * @author: swwheihei
- * @date: 2020骞�5鏈�13鏃� 涓嬪崍4:03:02
+/**
+ * 瑙嗛娴乻ession绠＄悊鍣紝绠＄悊瑙嗛棰勮銆侀瑙堝洖鏀剧殑閫氫俊鍙ユ焺
*/
@Component
public class VideoStreamSessionManager {
@Autowired
- private RedisUtil redisUtil;
+ private UserSetting userSetting;
- public void put(String deviceId, String channelId ,String ssrc, String streamId, String mediaServerId, ClientTransaction transaction){
+ @Autowired
+ private RedisTemplate<Object, Object> redisTemplate;
+
+ /**
+ * 娣诲姞涓�涓偣鎾�/鍥炴斁鐨勪簨鍔′俊鎭�
+ * 鍚庣画鍙互閫氳繃娴両d/callID
+ * @param deviceId 璁惧ID
+ * @param channelId 閫氶亾ID
+ * @param callId 涓�娆¤姹傜殑CallID
+ * @param stream 娴佸悕绉�
+ * @param mediaServerId 鎵�浣跨敤鐨勬祦濯掍綋ID
+ * @param response 鍥炲
+ */
+ public void put(String deviceId, String channelId, String callId, String stream, String ssrc, String mediaServerId, SIPResponse response, InviteSessionType type){
SsrcTransaction ssrcTransaction = new SsrcTransaction();
ssrcTransaction.setDeviceId(deviceId);
ssrcTransaction.setChannelId(channelId);
- ssrcTransaction.setStreamId(streamId);
- byte[] transactionByteArray = SerializeUtils.serialize(transaction);
- ssrcTransaction.setTransaction(transactionByteArray);
+ ssrcTransaction.setStream(stream);
+ ssrcTransaction.setSipTransactionInfo(new SipTransactionInfo(response));
+ ssrcTransaction.setCallId(callId);
ssrcTransaction.setSsrc(ssrc);
ssrcTransaction.setMediaServerId(mediaServerId);
+ ssrcTransaction.setType(type);
- redisUtil.set(VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX + deviceId + "_" + channelId, ssrcTransaction);
+ redisTemplate.opsForValue().set(VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX + userSetting.getServerId()
+ + "_" + deviceId + "_" + channelId + "_" + callId + "_" + stream, ssrcTransaction);
}
- public void put(String deviceId, String channelId , Dialog dialog){
- SsrcTransaction ssrcTransaction = getSsrcTransaction(deviceId, channelId);
- if (ssrcTransaction != null) {
- byte[] dialogByteArray = SerializeUtils.serialize(dialog);
- ssrcTransaction.setDialog(dialogByteArray);
+ public SsrcTransaction getSsrcTransaction(String deviceId, String channelId, String callId, String stream){
+
+ if (ObjectUtils.isEmpty(deviceId)) {
+ deviceId ="*";
}
- redisUtil.set(VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX + deviceId + "_" + channelId, ssrcTransaction);
+ if (ObjectUtils.isEmpty(channelId)) {
+ channelId ="*";
+ }
+ if (ObjectUtils.isEmpty(callId)) {
+ callId ="*";
+ }
+ if (ObjectUtils.isEmpty(stream)) {
+ stream ="*";
+ }
+ String key = VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX + userSetting.getServerId() + "_" + deviceId + "_" + channelId + "_" + callId+ "_" + stream;
+ List<Object> scanResult = RedisUtil.scan(redisTemplate, key);
+ if (scanResult.size() == 0) {
+ return null;
+ }
+ return (SsrcTransaction)redisTemplate.opsForValue().get(scanResult.get(0));
}
-
- public ClientTransaction getTransaction(String deviceId, String channelId){
- SsrcTransaction ssrcTransaction = getSsrcTransaction(deviceId, channelId);
- if (ssrcTransaction == null) return null;
- byte[] transactionByteArray = ssrcTransaction.getTransaction();
- ClientTransaction clientTransaction = (ClientTransaction)SerializeUtils.deSerialize(transactionByteArray);
- return clientTransaction;
+ public List<SsrcTransaction> getSsrcTransactionForAll(String deviceId, String channelId, String callId, String stream){
+ if (ObjectUtils.isEmpty(deviceId)) {
+ deviceId ="*";
+ }
+ if (ObjectUtils.isEmpty(channelId)) {
+ channelId ="*";
+ }
+ if (ObjectUtils.isEmpty(callId)) {
+ callId ="*";
+ }
+ if (ObjectUtils.isEmpty(stream)) {
+ stream ="*";
+ }
+ String key = VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX + userSetting.getServerId() + "_" + deviceId + "_" + channelId + "_" + callId+ "_" + stream;
+ List<Object> scanResult = RedisUtil.scan(redisTemplate, key);
+ if (scanResult.size() == 0) {
+ return null;
+ }
+ List<SsrcTransaction> result = new ArrayList<>();
+ for (Object keyObj : scanResult) {
+ result.add((SsrcTransaction)redisTemplate.opsForValue().get(keyObj));
+ }
+ return result;
}
- public SIPDialog getDialog(String deviceId, String channelId){
- SsrcTransaction ssrcTransaction = getSsrcTransaction(deviceId, channelId);
- if (ssrcTransaction == null) return null;
- byte[] dialogByteArray = ssrcTransaction.getDialog();
- if (dialogByteArray == null) return null;
- SIPDialog dialog = (SIPDialog)SerializeUtils.deSerialize(dialogByteArray);
- return dialog;
- }
-
- public SsrcTransaction getSsrcTransaction(String deviceId, String channelId){
- SsrcTransaction ssrcTransaction = (SsrcTransaction)redisUtil.get(VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX + deviceId + "_" + channelId);
- return ssrcTransaction;
- }
-
- public String getStreamId(String deviceId, String channelId){
- SsrcTransaction ssrcTransaction = getSsrcTransaction(deviceId, channelId);
- if (ssrcTransaction == null) return null;
- return ssrcTransaction.getStreamId();
- }
- public String getMediaServerId(String deviceId, String channelId){
- SsrcTransaction ssrcTransaction = getSsrcTransaction(deviceId, channelId);
- if (ssrcTransaction == null) return null;
+ public String getMediaServerId(String deviceId, String channelId, String stream){
+ SsrcTransaction ssrcTransaction = getSsrcTransaction(deviceId, channelId, null, stream);
+ if (ssrcTransaction == null) {
+ return null;
+ }
return ssrcTransaction.getMediaServerId();
}
- public String getSSRC(String deviceId, String channelId){
- SsrcTransaction ssrcTransaction = getSsrcTransaction(deviceId, channelId);
- if (ssrcTransaction == null) return null;
+ public String getSSRC(String deviceId, String channelId, String stream){
+ SsrcTransaction ssrcTransaction = getSsrcTransaction(deviceId, channelId, null, stream);
+ if (ssrcTransaction == null) {
+ return null;
+ }
return ssrcTransaction.getSsrc();
}
- public void remove(String deviceId, String channelId) {
- SsrcTransaction ssrcTransaction = getSsrcTransaction(deviceId, channelId);
- if (ssrcTransaction == null) return;
- redisUtil.del(VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX + deviceId + "_" + channelId);
+ public void remove(String deviceId, String channelId, String stream) {
+ SsrcTransaction ssrcTransaction = getSsrcTransaction(deviceId, channelId, null, stream);
+ if (ssrcTransaction == null) {
+ return;
+ }
+ redisTemplate.delete(VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX + userSetting.getServerId() + "_"
+ + deviceId + "_" + channelId + "_" + ssrcTransaction.getCallId() + "_" + ssrcTransaction.getStream());
}
+
public List<SsrcTransaction> getAllSsrc() {
- List<Object> ssrcTransactionKeys = redisUtil.scan(String.format("%s_*_*", VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX));
+ List<Object> ssrcTransactionKeys = RedisUtil.scan(redisTemplate, String.format("%s_*_*_*_*", VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX+ userSetting.getServerId()));
List<SsrcTransaction> result= new ArrayList<>();
- for (int i = 0; i < ssrcTransactionKeys.size(); i++) {
- String key = (String)ssrcTransactionKeys.get(i);
- SsrcTransaction ssrcTransaction = (SsrcTransaction)redisUtil.get(key);
+ for (Object ssrcTransactionKey : ssrcTransactionKeys) {
+ String key = (String) ssrcTransactionKey;
+ SsrcTransaction ssrcTransaction = JsonUtil.redisJsonToObject(redisTemplate, key, SsrcTransaction.class);
result.add(ssrcTransaction);
}
return result;
--
Gitblit v1.8.0