From f8ef14bfea43abd8716aab15f5e302e7c1f23f79 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 11 六月 2024 10:08:13 +0800
Subject: [PATCH] 修复移动位置位置订阅上报间隔为0的bug
---
src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java | 40 ++++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 10 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 d1e8052..9a18c9a 100755
--- a/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
@@ -141,15 +141,26 @@
@Override
public void updateSendRTPSever(SendRtpItem sendRtpItem) {
+ redisTemplate.opsForValue().set(sendRtpItem.getRedisKey(), sendRtpItem);
+ }
- String key = VideoManagerConstants.PLATFORM_SEND_RTP_INFO_PREFIX +
- userSetting.getServerId() + "_"
- + sendRtpItem.getMediaServerId() + "_"
- + sendRtpItem.getPlatformId() + "_"
- + sendRtpItem.getChannelId() + "_"
- + sendRtpItem.getStream() + "_"
- + sendRtpItem.getCallId();
- redisTemplate.opsForValue().set(key, sendRtpItem);
+ @Override
+ public List<SendRtpItem> querySendRTPServer(String platformGbId, String channelId, String streamId) {
+ String scanKey = VideoManagerConstants.PLATFORM_SEND_RTP_INFO_PREFIX
+ + userSetting.getServerId() + "_*_"
+ + platformGbId + "_"
+ + channelId + "_"
+ + streamId + "_"
+ + "*";
+ List<SendRtpItem> result = new ArrayList<>();
+ List<Object> scan = RedisUtil.scan(redisTemplate, scanKey);
+ if (!scan.isEmpty()) {
+ for (Object o : scan) {
+ String key = (String) o;
+ result.add(JsonUtil.redisJsonToObject(redisTemplate, key, SendRtpItem.class));
+ }
+ }
+ return result;
}
@Override
@@ -167,7 +178,7 @@
callId = "*";
}
String key = VideoManagerConstants.PLATFORM_SEND_RTP_INFO_PREFIX
- + userSetting.getServerId() + "_*_"
+ + "*_*_"
+ platformGbId + "_"
+ channelId + "_"
+ streamId + "_"
@@ -263,9 +274,18 @@
List<Object> scan = RedisUtil.scan(redisTemplate, key);
if (scan.size() > 0) {
for (Object keyStr : scan) {
+ logger.info("[鍒犻櫎 redis鐨凷endRTP]锛� {}", keyStr.toString());
redisTemplate.delete(keyStr);
}
}
+ }
+
+ /**
+ * 鍒犻櫎RTP鎺ㄩ�佷俊鎭紦瀛�
+ */
+ @Override
+ public void deleteSendRTPServer(SendRtpItem sendRtpItem) {
+ deleteSendRTPServer(sendRtpItem.getPlatformId(), sendRtpItem.getChannelId(),sendRtpItem.getCallId(), sendRtpItem.getStream());
}
@Override
@@ -550,7 +570,7 @@
@Override
public void sendMobilePositionMsg(JSONObject jsonObject) {
String key = VideoManagerConstants.VM_MSG_SUBSCRIBE_MOBILE_POSITION;
- logger.info("[redis鍙戦�侀�氱煡] 鍙戦�� 绉诲姩浣嶇疆 {}: {}", key, jsonObject.toString());
+ logger.debug("[redis鍙戦�侀�氱煡] 鍙戦�� 绉诲姩浣嶇疆 {}: {}", key, jsonObject.toString());
redisTemplate.convertAndSend(key, jsonObject);
}
--
Gitblit v1.8.0