From 42a2772d1aa7493bcc4fac3e24ee8eda4eebc23d Mon Sep 17 00:00:00 2001
From: xubinbin <1323875150@qq.com>
Date: 星期二, 12 十二月 2023 17:09:04 +0800
Subject: [PATCH] bugfix：请求头带token， SecurityUtils 获取用户id 一直为0 #1195
---
src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java | 202 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 139 insertions(+), 63 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
old mode 100644
new mode 100755
index 9e402e1..c46e38a
--- 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,139 @@
-package com.genersoft.iot.vmp.gb28181.session;
-
-import java.util.concurrent.ConcurrentHashMap;
-
-import javax.sip.ClientTransaction;
-
-import org.springframework.stereotype.Component;
-
-/**
- * @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<>();
-
- public String createPlaySsrc(){
- return SsrcUtil.getPlaySsrc();
- }
-
- public String createPlayBackSsrc(){
- return SsrcUtil.getPlayBackSsrc();
- }
-
- 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);
- }
-
- public String getStreamId(String deviceId, String channelId){
- return streamIdMap.get(deviceId + "_" + channelId);
- }
-
- public void remove(String deviceId, String channelId) {
- sessionMap.remove(deviceId + "_" + channelId);
- if (ssrcMap.get(deviceId + "_" + channelId) != null) {
- SsrcUtil.releaseSsrc(ssrcMap.get(deviceId + "_" + channelId));
- }
- 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;
- }
-}
+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;
+
+/**
+ * 瑙嗛娴乻ession绠＄悊鍣紝绠＄悊瑙嗛棰勮銆侀瑙堝洖鏀剧殑閫氫俊鍙ユ焺
+ */
+@Component
+public class VideoStreamSessionManager {
+
+ @Autowired
+ private UserSetting userSetting;
+
+ @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.setStream(stream);
+ ssrcTransaction.setSipTransactionInfo(new SipTransactionInfo(response));
+ ssrcTransaction.setCallId(callId);
+ ssrcTransaction.setSsrc(ssrc);
+ ssrcTransaction.setMediaServerId(mediaServerId);
+ ssrcTransaction.setType(type);
+
+ redisTemplate.opsForValue().set(VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX + userSetting.getServerId()
+ + "_" + deviceId + "_" + channelId + "_" + callId + "_" + stream, ssrcTransaction);
+ }
+
+ public SsrcTransaction getSsrcTransaction(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;
+ }
+ return (SsrcTransaction)redisTemplate.opsForValue().get(scanResult.get(0));
+ }
+
+ 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 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, String stream){
+ SsrcTransaction ssrcTransaction = getSsrcTransaction(deviceId, channelId, null, stream);
+ if (ssrcTransaction == null) {
+ return null;
+ }
+ return ssrcTransaction.getSsrc();
+ }
+
+ 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(redisTemplate, String.format("%s_*_*_*_*", VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX+ userSetting.getServerId()));
+ List<SsrcTransaction> result= new ArrayList<>();
+ 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