From bf8fb0c51f4e7894a62636dede6c69a2a85d8458 Mon Sep 17 00:00:00 2001 From: panlinlin <648540858@qq.com> Date: 星期二, 27 四月 2021 15:35:22 +0800 Subject: [PATCH] 添加级联平台自动注册时失败自动重新注册 --- src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java | 50 +++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 45 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..74d6779 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); @@ -223,6 +231,20 @@ public SendRtpItem querySendRTPServer(String platformGbId, String channelId) { String key = VideoManagerConstants.PLATFORM_SEND_RTP_INFO_PREFIX + platformGbId + "_" + channelId; return (SendRtpItem)redis.get(key); + } + + @Override + public List<SendRtpItem> querySendRTPServer(String platformGbId) { + String key = VideoManagerConstants.PLATFORM_SEND_RTP_INFO_PREFIX + platformGbId + "_*"; + List<Object> queryResult = redis.scan(key); + List<SendRtpItem> result= new ArrayList<>(); + + for (int i = 0; i < queryResult.size(); i++) { + String keyItem = (String) queryResult.get(i); + result.add((SendRtpItem)redis.get(keyItem)); + } + + return result; } /** @@ -251,4 +273,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