From 7e48d847402d2ea4da85af582529de676f30dc38 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 08 五月 2023 17:56:56 +0800
Subject: [PATCH] Merge pull request #844 from xiaoQQya/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java | 127 ++++++++++++------------------------------
1 files changed, 37 insertions(+), 90 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 9925ae1..dabfdff 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,34 +1,31 @@
package com.genersoft.iot.vmp.gb28181.session;
+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.conf.UserSetting;
-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;
-import org.springframework.util.StringUtils;
-
-/**
- * @description:瑙嗛娴乻ession绠＄悊鍣紝绠＄悊瑙嗛棰勮銆侀瑙堝洖鏀剧殑閫氫俊鍙ユ焺
- * @author: swwheihei
- * @date: 2020骞�5鏈�13鏃� 涓嬪崍4:03:02
+/**
+ * 瑙嗛娴乻ession绠＄悊鍣紝绠＄悊瑙嗛棰勮銆侀瑙堝洖鏀剧殑閫氫俊鍙ユ焺
*/
@Component
public class VideoStreamSessionManager {
@Autowired
- private RedisUtil redisUtil;
+ private UserSetting userSetting;
@Autowired
- private UserSetting userSetting;
+ private RedisTemplate<Object, Object> redisTemplate;
public enum SessionType {
play,
@@ -44,116 +41,66 @@
* @param callId 涓�娆¤姹傜殑CallID
* @param stream 娴佸悕绉�
* @param mediaServerId 鎵�浣跨敤鐨勬祦濯掍綋ID
- * @param transaction 浜嬪姟
+ * @param response 鍥炲
*/
- public void put(String deviceId, String channelId, String callId, String stream, String ssrc, String mediaServerId, ClientTransaction transaction, SessionType type){
+ public void put(String deviceId, String channelId, String callId, String stream, String ssrc, String mediaServerId, SIPResponse response, SessionType type){
SsrcTransaction ssrcTransaction = new SsrcTransaction();
ssrcTransaction.setDeviceId(deviceId);
ssrcTransaction.setChannelId(channelId);
ssrcTransaction.setStream(stream);
- byte[] transactionByteArray = SerializeUtils.serialize(transaction);
- ssrcTransaction.setTransaction(transactionByteArray);
+ ssrcTransaction.setSipTransactionInfo(new SipTransactionInfo(response));
ssrcTransaction.setCallId(callId);
ssrcTransaction.setSsrc(ssrc);
ssrcTransaction.setMediaServerId(mediaServerId);
ssrcTransaction.setType(type);
- redisUtil.set(VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX + userSetting.getServerId()
+ redisTemplate.opsForValue().set(VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX + userSetting.getServerId()
+ "_" + deviceId + "_" + channelId + "_" + callId + "_" + stream, ssrcTransaction);
- redisUtil.set(VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX + userSetting.getServerId()
- + "_" + deviceId + "_" + channelId + "_" + callId + "_" + stream, ssrcTransaction);
- }
-
- public void put(String deviceId, String channelId, String callId, Dialog dialog){
- SsrcTransaction ssrcTransaction = getSsrcTransaction(deviceId, channelId, callId, null);
- if (ssrcTransaction != null) {
- byte[] dialogByteArray = SerializeUtils.serialize(dialog);
- ssrcTransaction.setDialog(dialogByteArray);
- }
- redisUtil.set(VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX + userSetting.getServerId()
- + "_" + deviceId + "_" + channelId + "_" + ssrcTransaction.getCallId() + "_"
- + ssrcTransaction.getStream(), ssrcTransaction);
- }
-
-
- public ClientTransaction getTransaction(String deviceId, String channelId, String stream, String callId){
- SsrcTransaction ssrcTransaction = getSsrcTransaction(deviceId, channelId, callId, stream);
- if (ssrcTransaction == null) {
- return null;
- }
- byte[] transactionByteArray = ssrcTransaction.getTransaction();
- ClientTransaction clientTransaction = (ClientTransaction)SerializeUtils.deSerialize(transactionByteArray);
- return clientTransaction;
- }
-
- public SIPDialog getDialogByStream(String deviceId, String channelId, String stream){
- SsrcTransaction ssrcTransaction = getSsrcTransaction(deviceId, channelId, null, stream);
- if (ssrcTransaction == null) {
- return null;
- }
- byte[] dialogByteArray = ssrcTransaction.getDialog();
- if (dialogByteArray == null) {
- return null;
- }
- SIPDialog dialog = (SIPDialog)SerializeUtils.deSerialize(dialogByteArray);
- return dialog;
- }
-
- public SIPDialog getDialogByCallId(String deviceId, String channelId, String callId){
- SsrcTransaction ssrcTransaction = getSsrcTransaction(deviceId, channelId, callId, null);
- if (ssrcTransaction == null) {
- return null;
- }
- byte[] dialogByteArray = ssrcTransaction.getDialog();
- if (dialogByteArray == null) {
- return null;
- }
- return (SIPDialog)SerializeUtils.deSerialize(dialogByteArray);
}
public SsrcTransaction getSsrcTransaction(String deviceId, String channelId, String callId, String stream){
- if (StringUtils.isEmpty(deviceId)) {
+ if (ObjectUtils.isEmpty(deviceId)) {
deviceId ="*";
}
- if (StringUtils.isEmpty(channelId)) {
+ if (ObjectUtils.isEmpty(channelId)) {
channelId ="*";
}
- if (StringUtils.isEmpty(callId)) {
+ if (ObjectUtils.isEmpty(callId)) {
callId ="*";
}
- if (StringUtils.isEmpty(stream)) {
+ if (ObjectUtils.isEmpty(stream)) {
stream ="*";
}
String key = VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX + userSetting.getServerId() + "_" + deviceId + "_" + channelId + "_" + callId+ "_" + stream;
- List<Object> scanResult = redisUtil.scan(key);
+ List<Object> scanResult = RedisUtil.scan(redisTemplate, key);
if (scanResult.size() == 0) {
return null;
}
- return (SsrcTransaction)redisUtil.get((String) scanResult.get(0));
+ return (SsrcTransaction)redisTemplate.opsForValue().get(scanResult.get(0));
}
public List<SsrcTransaction> getSsrcTransactionForAll(String deviceId, String channelId, String callId, String stream){
- if (StringUtils.isEmpty(deviceId)) {
+ if (ObjectUtils.isEmpty(deviceId)) {
deviceId ="*";
}
- if (StringUtils.isEmpty(channelId)) {
+ if (ObjectUtils.isEmpty(channelId)) {
channelId ="*";
}
- if (StringUtils.isEmpty(callId)) {
+ if (ObjectUtils.isEmpty(callId)) {
callId ="*";
}
- if (StringUtils.isEmpty(stream)) {
+ if (ObjectUtils.isEmpty(stream)) {
stream ="*";
}
String key = VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX + userSetting.getServerId() + "_" + deviceId + "_" + channelId + "_" + callId+ "_" + stream;
- List<Object> scanResult = redisUtil.scan(key);
+ 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)redisUtil.get((String) keyObj));
+ result.add((SsrcTransaction)redisTemplate.opsForValue().get(keyObj));
}
return result;
}
@@ -179,17 +126,17 @@
if (ssrcTransaction == null) {
return;
}
- redisUtil.del(VideoManagerConstants.MEDIA_TRANSACTION_USED_PREFIX + userSetting.getServerId() + "_"
+ 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+ userSetting.getServerId() + "_" ));
+ 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