From b92027f31ef24583e8b9d4c2dc44c7e9262a2023 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期一, 26 四月 2021 10:48:51 +0800
Subject: [PATCH] 修复注册是数据传输模式被回复默认
---
src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 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 3feb347..98795ef 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
@@ -10,10 +10,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+@SuppressWarnings("rawtypes")
@Component
public class RedisCatchStorageImpl implements IRedisCatchStorage {
@@ -76,11 +75,11 @@
}
@Override
- public StreamInfo queryPlayByDevice(String deviceId, String code) {
+ public StreamInfo queryPlayByDevice(String deviceId, String channelId) {
// List<Object> playLeys = redis.keys(String.format("%S_*_%s_%s", VideoManagerConstants.PLAYER_PREFIX,
List<Object> playLeys = redis.scan(String.format("%S_*_%s_%s", VideoManagerConstants.PLAYER_PREFIX,
deviceId,
- code));
+ channelId));
if (playLeys == null || playLeys.size() == 0) return null;
return (StreamInfo)redis.get(playLeys.get(0).toString());
}
@@ -92,6 +91,7 @@
*/
@Override
public boolean updateMediaInfo(MediaServerConfig mediaServerConfig) {
+ mediaServerConfig.setUpdateTime(System.currentTimeMillis());
return redis.set(VideoManagerConstants.MEDIA_SERVER_PREFIX,mediaServerConfig);
}
@@ -214,6 +214,14 @@
}
@Override
+ public void cleanPlatformRegisterInfos() {
+ List regInfos = redis.scan(VideoManagerConstants.PLATFORM_REGISTER_INFO_PREFIX + "*");
+ for (Object key : regInfos) {
+ redis.del(key.toString());
+ }
+ }
+
+ @Override
public void updateSendRTPSever(SendRtpItem sendRtpItem) {
String key = VideoManagerConstants.PLATFORM_SEND_RTP_INFO_PREFIX + sendRtpItem.getPlatformId() + "_" + sendRtpItem.getChannelId();
redis.set(key, sendRtpItem);
@@ -251,4 +259,22 @@
}
}
+ @Override
+ public void clearCatchByDeviceId(String deviceId) {
+ List<Object> playLeys = redis.scan(String.format("%S_*_%s_*", VideoManagerConstants.PLAYER_PREFIX,
+ deviceId));
+ if (playLeys.size() > 0) {
+ for (Object key : playLeys) {
+ redis.del(key.toString());
+ }
+ }
+
+ List<Object> playBackers = redis.scan(String.format("%S_*_%s_*", VideoManagerConstants.PLAY_BLACK_PREFIX,
+ deviceId));
+ if (playBackers.size() > 0) {
+ for (Object key : playBackers) {
+ redis.del(key.toString());
+ }
+ }
+ }
}
--
Gitblit v1.8.0