From a42dda2bd3cc1cf8c20cc61e7ad9211eadecbaf3 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 24 二月 2022 16:55:06 +0800
Subject: [PATCH] 规范数据库，添加必要约束，优化通道批量导入功能
---
src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java | 117 +++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 82 insertions(+), 35 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 9e402e1..d41b04d 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,63 +1,110 @@
package com.genersoft.iot.vmp.gb28181.session;
-import java.util.concurrent.ConcurrentHashMap;
+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.conf.UserSetup;
+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绠＄悊鍣紝绠＄悊瑙嗛棰勮銆侀瑙堝洖鏀剧殑閫氫俊鍙ユ焺
+ * @description:瑙嗛娴乻ession绠＄悊鍣紝绠＄悊瑙嗛棰勮銆侀瑙堝洖鏀剧殑閫氫俊鍙ユ焺
* @author: swwheihei
* @date: 2020骞�5鏈�13鏃� 涓嬪崍4:03:02
*/
@Component
public class VideoStreamSessionManager {
- private ConcurrentHashMap<String, ClientTransaction> sessionMap = new ConcurrentHashMap<>();
- private ConcurrentHashMap<String, String> ssrcMap = new ConcurrentHashMap<>();
- private ConcurrentHashMap<String, String> streamIdMap = new ConcurrentHashMap<>();
+ @Autowired
+ private RedisUtil redisUtil;
- public String createPlaySsrc(){
- return SsrcUtil.getPlaySsrc();
+ @Autowired
+ private UserSetup userSetup;
+
+ public void put(String deviceId, String channelId ,String ssrc, String streamId, String mediaServerId, ClientTransaction transaction){
+ SsrcTransaction ssrcTransaction = new SsrcTransaction();
+ ssrcTransaction.setDeviceId(deviceId);
+ ssrcTransaction.setChannelId(channelId);
+ ssrcTransaction.setStreamId(streamId);
+ byte[] transactionByteArray = SerializeUtils.serialize(transaction);
+ ssrcTransaction.setTransaction(transactionByteArray);
+ ssrcTransaction.setSsrc(ssrc);
+ ssrcTransaction.setMediaServerId(mediaServerId);
+
+ redisUtil.set(VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX + userSetup.getServerId() + "_" + deviceId + "_" + channelId, ssrcTransaction);
}
-
- public String createPlayBackSsrc(){
- return SsrcUtil.getPlayBackSsrc();
+
+ 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);
+ }
+ redisUtil.set(VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX + userSetup.getServerId() + "_" + deviceId + "_" + channelId, ssrcTransaction);
}
-
- public void put(String deviceId, String channelId ,String ssrc, String streamId, ClientTransaction transaction){
- sessionMap.put(deviceId + "_" + channelId, transaction);
- ssrcMap.put(deviceId + "_" + channelId, ssrc);
- streamIdMap.put(deviceId + "_" + channelId, streamId);
- }
+
public ClientTransaction getTransaction(String deviceId, String channelId){
- return sessionMap.get(deviceId + "_" + channelId);
+ SsrcTransaction ssrcTransaction = getSsrcTransaction(deviceId, channelId);
+ if (ssrcTransaction == null) return null;
+ byte[] transactionByteArray = ssrcTransaction.getTransaction();
+ ClientTransaction clientTransaction = (ClientTransaction)SerializeUtils.deSerialize(transactionByteArray);
+ return clientTransaction;
+ }
+
+ 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 + userSetup.getServerId() + "_" + deviceId + "_" + channelId);
+ return ssrcTransaction;
}
public String getStreamId(String deviceId, String channelId){
- return streamIdMap.get(deviceId + "_" + 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;
+ return ssrcTransaction.getMediaServerId();
+ }
+
+ public String getSSRC(String deviceId, String channelId){
+ SsrcTransaction ssrcTransaction = getSsrcTransaction(deviceId, channelId);
+ if (ssrcTransaction == null) return null;
+ return ssrcTransaction.getSsrc();
}
public void remove(String deviceId, String channelId) {
- sessionMap.remove(deviceId + "_" + channelId);
- if (ssrcMap.get(deviceId + "_" + channelId) != null) {
- SsrcUtil.releaseSsrc(ssrcMap.get(deviceId + "_" + channelId));
+ SsrcTransaction ssrcTransaction = getSsrcTransaction(deviceId, channelId);
+ if (ssrcTransaction == null) return;
+ redisUtil.del(VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX + userSetup.getServerId() + "_" + deviceId + "_" + channelId);
+ }
+
+ public List<SsrcTransaction> getAllSsrc() {
+ List<Object> ssrcTransactionKeys = redisUtil.scan(String.format("%s_*_*", VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX+ userSetup.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);
+ result.add(ssrcTransaction);
}
- ssrcMap.remove(deviceId + "_" + channelId);
- streamIdMap.remove(deviceId + "_" + channelId);
- }
-
- public ConcurrentHashMap<String, ClientTransaction> getSessionMap() {
- return sessionMap;
- }
-
- public ConcurrentHashMap<String, String> getSsrcMap() {
- return ssrcMap;
- }
-
- public ConcurrentHashMap<String, String> getStreamIdMap() {
- return streamIdMap;
+ return result;
}
}
--
Gitblit v1.8.0