From c23932eb00edfa5f734b0d17eced838c5c7577c0 Mon Sep 17 00:00:00 2001 From: 648540858 <456PANlinlin> Date: 星期三, 17 十一月 2021 22:58:41 +0800 Subject: [PATCH] #221 --- src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java | 104 ++++++++++++++++++++++++++++------------------------ 1 files changed, 56 insertions(+), 48 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 7b7f599..e5b1269 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 @@ -1,10 +1,8 @@ package com.genersoft.iot.vmp.storager.impl; import com.alibaba.fastjson.JSONObject; -import com.genersoft.iot.vmp.common.RealVideo; import com.genersoft.iot.vmp.common.StreamInfo; import com.genersoft.iot.vmp.common.VideoManagerConstants; -import com.genersoft.iot.vmp.conf.MediaServerConfig; import com.genersoft.iot.vmp.gb28181.bean.*; import com.genersoft.iot.vmp.storager.IRedisCatchStorage; import com.genersoft.iot.vmp.storager.dao.DeviceChannelMapper; @@ -12,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.text.SimpleDateFormat; import java.util.*; @SuppressWarnings("rawtypes") @@ -24,6 +23,7 @@ @Autowired private DeviceChannelMapper deviceChannelMapper; + private SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); /** * 寮�濮嬫挱鏀炬椂灏嗘祦瀛樺叆redis @@ -77,33 +77,13 @@ } @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()); - } - - /** - * 鏇存柊娴佸獟浣撲俊鎭� - * @param mediaServerConfig - * @return - */ - @Override - public boolean updateMediaInfo(MediaServerConfig mediaServerConfig) { - mediaServerConfig.setUpdateTime(System.currentTimeMillis()); - return redis.set(VideoManagerConstants.MEDIA_SERVER_PREFIX,mediaServerConfig); - } - - /** - * 鑾峰彇娴佸獟浣撲俊鎭� - * @return - */ - @Override - public MediaServerConfig getMediaInfo() { - return (MediaServerConfig)redis.get(VideoManagerConstants.MEDIA_SERVER_PREFIX); } @Override @@ -235,6 +215,20 @@ 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; + } + /** * 鍒犻櫎RTP鎺ㄩ�佷俊鎭紦瀛� * @param platformGbId @@ -261,34 +255,48 @@ } } - - /** - * 鏇存柊濯掍綋娴佸垪琛� - * @param mediaList - */ @Override - public void updateMediaList(List<RealVideo> mediaList) { - String key = VideoManagerConstants.MEDIA_STREAM_PREFIX; - redis.del(key); - for (int i = 0; i < mediaList.size(); i++) { - RealVideo realVideo = mediaList.get(i); - redis.zAdd(key, realVideo, realVideo.getCreateStamp()); + 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()); + } } } - - /** - * 鑾峰彇褰撳墠濯掍綋娴佸垪琛� - * @return List<RealVideo> - */ @Override - public JSONObject getMediaList(int start, int end) { - String key = VideoManagerConstants.MEDIA_STREAM_PREFIX; - Set<Object> realVideos = redis.ZRange(key, start, end); - JSONObject jsonObject = new JSONObject(); - jsonObject.put("list", new ArrayList(realVideos)); - jsonObject.put("total", redis.zSize(key)); - - return jsonObject; + public void outlineForAll() { + List<Object> onlineDevices = redis.scan(VideoManagerConstants.KEEPLIVEKEY_PREFIX + "*" ); + for (int i = 0; i < onlineDevices.size(); i++) { + String key = (String) onlineDevices.get(i); + redis.del(key); + } } + + @Override + public List<String> getOnlineForAll() { + List<String> result = new ArrayList<>(); + List<Object> onlineDevices = redis.scan(VideoManagerConstants.KEEPLIVEKEY_PREFIX + "*" ); + for (int i = 0; i < onlineDevices.size(); i++) { + String key = (String) onlineDevices.get(i); + result.add((String) redis.get(key)); + } + return result; + } + + @Override + public void updateWVPInfo(JSONObject jsonObject) { + + } + } -- Gitblit v1.8.0