From 92022f8a8b7bccc865c47bd8cfafaffb91c2799c Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 13 十月 2022 22:18:06 +0800
Subject: [PATCH] Merge pull request #640 from duzeng/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java | 76 ++++++++++++++++++++++++++++----------
1 files changed, 56 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
index 14a369c..f411881 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
@@ -9,19 +9,18 @@
import com.genersoft.iot.vmp.gb28181.bean.*;
import com.genersoft.iot.vmp.media.zlm.dto.MediaItem;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
-import com.genersoft.iot.vmp.media.zlm.dto.OnPublishHookParam;
import com.genersoft.iot.vmp.media.zlm.dto.StreamAuthorityInfo;
import com.genersoft.iot.vmp.service.bean.GPSMsgInfo;
import com.genersoft.iot.vmp.service.bean.MessageForPushChannel;
import com.genersoft.iot.vmp.service.bean.ThirdPartyGB;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.dao.DeviceChannelMapper;
+import com.genersoft.iot.vmp.storager.dao.dto.PlatformRegisterInfo;
import com.genersoft.iot.vmp.utils.DateUtil;
import com.genersoft.iot.vmp.utils.redis.RedisUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.DependsOn;
import org.springframework.stereotype.Component;
import java.util.*;
@@ -126,6 +125,7 @@
}
@Override
public StreamInfo queryPlayByStreamId(String streamId) {
+ System.out.println(String.format("%S_%s_%s_*", VideoManagerConstants.PLAYER_PREFIX, userSetting.getServerId(), streamId));
List<Object> playLeys = RedisUtil.scan(String.format("%S_%s_%s_*", VideoManagerConstants.PLAYER_PREFIX, userSetting.getServerId(), streamId));
if (playLeys == null || playLeys.size() == 0) {
return null;
@@ -164,6 +164,8 @@
@Override
public boolean startPlayback(StreamInfo stream, String callId) {
+ System.out.println(String.format("%S_%s_%s_%s_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX,
+ userSetting.getServerId(), stream.getDeviceID(), stream.getChannelId(), stream.getStream(), callId));
return RedisUtil.set(String.format("%S_%s_%s_%s_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX,
userSetting.getServerId(), stream.getDeviceID(), stream.getChannelId(), stream.getStream(), callId), stream);
}
@@ -285,21 +287,37 @@
}
@Override
+ public String queryPlaybackForKey(String deviceId, String channelId, String stream, String callId) {
+ if (stream == null && callId == null) {
+ return null;
+ }
+ if (deviceId == null) {
+ deviceId = "*";
+ }
+ if (channelId == null) {
+ channelId = "*";
+ }
+ if (stream == null) {
+ stream = "*";
+ }
+ if (callId == null) {
+ callId = "*";
+ }
+ String key = String.format("%S_%s_%s_%s_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX,
+ userSetting.getServerId(),
+ deviceId,
+ channelId,
+ stream,
+ callId
+ );
+ List<Object> streamInfoScan = RedisUtil.scan(key);
+ return (String) streamInfoScan.get(0);
+ }
+
+ @Override
public void updatePlatformCatchInfo(ParentPlatformCatch parentPlatformCatch) {
String key = VideoManagerConstants.PLATFORM_CATCH_PREFIX + userSetting.getServerId() + "_" + parentPlatformCatch.getId();
RedisUtil.set(key, parentPlatformCatch);
- }
-
- @Override
- public void updatePlatformKeepalive(ParentPlatform parentPlatform) {
- String key = VideoManagerConstants.PLATFORM_KEEPALIVE_PREFIX + userSetting.getServerId() + "_" + parentPlatform.getServerGBId();
- RedisUtil.set(key, "", Integer.parseInt(parentPlatform.getKeepTimeout()));
- }
-
- @Override
- public void updatePlatformRegister(ParentPlatform parentPlatform) {
- String key = VideoManagerConstants.PLATFORM_REGISTER_PREFIX + userSetting.getServerId() + "_" + parentPlatform.getServerGBId();
- RedisUtil.set(key, "", Integer.parseInt(parentPlatform.getExpires()));
}
@Override
@@ -324,15 +342,15 @@
@Override
- public void updatePlatformRegisterInfo(String callId, String platformGbId) {
+ public void updatePlatformRegisterInfo(String callId, PlatformRegisterInfo platformRegisterInfo) {
String key = VideoManagerConstants.PLATFORM_REGISTER_INFO_PREFIX + userSetting.getServerId() + "_" + callId;
- RedisUtil.set(key, platformGbId, 30);
+ RedisUtil.set(key, platformRegisterInfo, 30);
}
@Override
- public String queryPlatformRegisterInfo(String callId) {
- return (String)RedisUtil.get(VideoManagerConstants.PLATFORM_REGISTER_INFO_PREFIX + userSetting.getServerId() + "_" + callId);
+ public PlatformRegisterInfo queryPlatformRegisterInfo(String callId) {
+ return (PlatformRegisterInfo)RedisUtil.get(VideoManagerConstants.PLATFORM_REGISTER_INFO_PREFIX + userSetting.getServerId() + "_" + callId);
}
@Override
@@ -390,6 +408,24 @@
String streamId = "*";
String key = VideoManagerConstants.PLATFORM_SEND_RTP_INFO_PREFIX + userSetting.getServerId() + "_" + platformGbId
+ "_" + channelId + "_" + streamId + "_" + callId;
+ List<Object> scan = RedisUtil.scan(key);
+ List<SendRtpItem> result = new ArrayList<>();
+ for (Object o : scan) {
+ result.add((SendRtpItem) RedisUtil.get((String) o));
+ }
+ return result;
+ }
+
+ @Override
+ public List<SendRtpItem> querySendRTPServerByStream(String stream) {
+ if (stream == null) {
+ return null;
+ }
+ String platformGbId = "*";
+ String callId = "*";
+ String channelId = "*";
+ String key = VideoManagerConstants.PLATFORM_SEND_RTP_INFO_PREFIX + userSetting.getServerId() + "_" + platformGbId
+ + "_" + channelId + "_" + stream + "_" + callId;
List<Object> scan = RedisUtil.scan(key);
List<SendRtpItem> result = new ArrayList<>();
for (Object o : scan) {
@@ -703,14 +739,14 @@
@Override
public void sendMobilePositionMsg(JSONObject jsonObject) {
String key = VideoManagerConstants.VM_MSG_SUBSCRIBE_MOBILE_POSITION;
- logger.info("[redis鍙戦�侀�氱煡]绉诲姩浣嶇疆 {}: {}", key, jsonObject.toString());
+ logger.info("[redis鍙戦�侀�氱煡] 绉诲姩浣嶇疆 {}: {}", key, jsonObject.toString());
RedisUtil.convertAndSend(key, jsonObject);
}
@Override
public void sendStreamPushRequestedMsg(MessageForPushChannel msg) {
String key = VideoManagerConstants.VM_MSG_STREAM_PUSH_REQUESTED;
- logger.info("[redis鍙戦�侀�氱煡]鎺ㄦ祦琚姹� {}: {}/{}", key, msg.getApp(), msg.getStream());
+ logger.info("[redis鍙戦�侀�氱煡] 鎺ㄦ祦琚姹� {}: {}/{}", key, msg.getApp(), msg.getStream());
RedisUtil.convertAndSend(key, (JSONObject)JSON.toJSON(msg));
}
--
Gitblit v1.8.0