From 1af77ab5f7c11a4b3d59c1989b51b9fca29679ce Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 18 十月 2022 22:18:49 +0800
Subject: [PATCH] Merge pull request #645 from IKangXu/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java | 696 +++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 588 insertions(+), 108 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 eafb8a0..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
@@ -1,32 +1,85 @@
package com.genersoft.iot.vmp.storager.impl;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.common.StreamInfo;
+import com.genersoft.iot.vmp.common.SystemInfoDto;
import com.genersoft.iot.vmp.common.VideoManagerConstants;
-import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig;
+import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.gb28181.bean.*;
-import com.genersoft.iot.vmp.media.zlm.dto.IMediaServerItem;
+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.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.stereotype.Component;
-import java.text.SimpleDateFormat;
import java.util.*;
@SuppressWarnings("rawtypes")
@Component
public class RedisCatchStorageImpl implements IRedisCatchStorage {
- @Autowired
- private RedisUtil redis;
+ private final Logger logger = LoggerFactory.getLogger(RedisCatchStorageImpl.class);
@Autowired
private DeviceChannelMapper deviceChannelMapper;
- private SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ @Autowired
+ private UserSetting userSetting;
+
+ @Override
+ public Long getCSEQ() {
+ String key = VideoManagerConstants.SIP_CSEQ_PREFIX + userSetting.getServerId();
+
+ long result = RedisUtil.incr(key, 1L);
+ if (result > Integer.MAX_VALUE) {
+ RedisUtil.set(key, 1);
+ result = 1;
+ }
+ return result;
+ }
+
+ @Override
+ public Long getSN(String method) {
+ String key = VideoManagerConstants.SIP_SN_PREFIX + userSetting.getServerId() + "_" + method;
+
+ long result = RedisUtil.incr(key, 1L);
+ if (result > Integer.MAX_VALUE) {
+ RedisUtil.set(key, 1);
+ result = 1;
+ }
+ return result;
+ }
+
+ @Override
+ public void resetAllCSEQ() {
+ String scanKey = VideoManagerConstants.SIP_CSEQ_PREFIX + userSetting.getServerId() + "_*";
+ List<Object> keys = RedisUtil.scan(scanKey);
+ for (Object o : keys) {
+ String key = (String) o;
+ RedisUtil.set(key, 1);
+ }
+ }
+
+ @Override
+ public void resetAllSN() {
+ String scanKey = VideoManagerConstants.SIP_SN_PREFIX + userSetting.getServerId() + "_*";
+ List<Object> keys = RedisUtil.scan(scanKey);
+ for (Object o : keys) {
+ String key = (String) o;
+ RedisUtil.set(key, 1);
+ }
+ }
/**
* 寮�濮嬫挱鏀炬椂灏嗘祦瀛樺叆redis
@@ -35,7 +88,8 @@
*/
@Override
public boolean startPlay(StreamInfo stream) {
- return redis.set(String.format("%S_%s_%s_%s", VideoManagerConstants.PLAYER_PREFIX, stream.getStreamId(),stream.getDeviceID(), stream.getChannelId()),
+ return RedisUtil.set(String.format("%S_%S_%s_%s_%s", VideoManagerConstants.PLAYER_PREFIX, userSetting.getServerId(),
+ stream.getStream(), stream.getDeviceID(), stream.getChannelId()),
stream);
}
@@ -46,9 +100,12 @@
*/
@Override
public boolean stopPlay(StreamInfo streamInfo) {
- if (streamInfo == null) return false;
- return redis.del(String.format("%S_%s_%s_%s", VideoManagerConstants.PLAYER_PREFIX,
- streamInfo.getStreamId(),
+ if (streamInfo == null) {
+ return false;
+ }
+ return RedisUtil.del(String.format("%S_%s_%s_%s_%s", VideoManagerConstants.PLAYER_PREFIX,
+ userSetting.getServerId(),
+ streamInfo.getStream(),
streamInfo.getDeviceID(),
streamInfo.getChannelId()));
}
@@ -59,45 +116,46 @@
*/
@Override
public StreamInfo queryPlay(StreamInfo streamInfo) {
- return (StreamInfo)redis.get(String.format("%S_%s_%s_%s",
+ return (StreamInfo)RedisUtil.get(String.format("%S_%s_%s_%s_%s",
VideoManagerConstants.PLAYER_PREFIX,
- streamInfo.getStreamId(),
+ userSetting.getServerId(),
+ streamInfo.getStream(),
streamInfo.getDeviceID(),
streamInfo.getChannelId()));
}
@Override
- public StreamInfo queryPlayByStreamId(String steamId) {
- List<Object> playLeys = redis.scan(String.format("%S_%s_*", VideoManagerConstants.PLAYER_PREFIX, steamId));
- if (playLeys == null || playLeys.size() == 0) return null;
- return (StreamInfo)redis.get(playLeys.get(0).toString());
- }
-
- @Override
- public StreamInfo queryPlaybackByStreamId(String steamId) {
- List<Object> playLeys = redis.scan(String.format("%S_%s_*", VideoManagerConstants.PLAY_BLACK_PREFIX, steamId));
- if (playLeys == null || playLeys.size() == 0) return null;
- return (StreamInfo)redis.get(playLeys.get(0).toString());
+ 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;
+ }
+ return (StreamInfo)RedisUtil.get(playLeys.get(0).toString());
}
@Override
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,
+ List<Object> playLeys = RedisUtil.scan(String.format("%S_%s_*_%s_%s", VideoManagerConstants.PLAYER_PREFIX,
+ userSetting.getServerId(),
deviceId,
channelId));
- if (playLeys == null || playLeys.size() == 0) return null;
- return (StreamInfo)redis.get(playLeys.get(0).toString());
+ if (playLeys == null || playLeys.size() == 0) {
+ return null;
+ }
+ return (StreamInfo)RedisUtil.get(playLeys.get(0).toString());
}
@Override
public Map<String, StreamInfo> queryPlayByDeviceId(String deviceId) {
Map<String, StreamInfo> streamInfos = new HashMap<>();
-// List<Object> playLeys = redis.keys(String.format("%S_*_%S_*", VideoManagerConstants.PLAYER_PREFIX, deviceId));
- List<Object> players = redis.scan(String.format("%S_*_%S_*", VideoManagerConstants.PLAYER_PREFIX, deviceId));
- if (players.size() == 0) return streamInfos;
- for (int i = 0; i < players.size(); i++) {
- String key = (String) players.get(i);
- StreamInfo streamInfo = (StreamInfo)redis.get(key);
+// List<Object> playLeys = RedisUtil.keys(String.format("%S_*_%S_*", VideoManagerConstants.PLAYER_PREFIX, deviceId));
+ List<Object> players = RedisUtil.scan(String.format("%S_%s_*_%S_*", VideoManagerConstants.PLAYER_PREFIX, userSetting.getServerId(),deviceId));
+ if (players.size() == 0) {
+ return streamInfos;
+ }
+ for (Object player : players) {
+ String key = (String) player;
+ StreamInfo streamInfo = (StreamInfo) RedisUtil.get(key);
streamInfos.put(streamInfo.getDeviceID() + "_" + streamInfo.getChannelId(), streamInfo);
}
return streamInfos;
@@ -105,128 +163,289 @@
@Override
- public boolean startPlayback(StreamInfo stream) {
- return redis.set(String.format("%S_%s_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX, stream.getStreamId(),stream.getDeviceID(), stream.getChannelId()),
- stream);
+ 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);
}
-
@Override
- public boolean stopPlayback(StreamInfo streamInfo) {
- if (streamInfo == null) return false;
- DeviceChannel deviceChannel = deviceChannelMapper.queryChannel(streamInfo.getDeviceID(), streamInfo.getChannelId());
+ public boolean startDownload(StreamInfo stream, String callId) {
+ boolean result;
+ if (stream.getProgress() == 1) {
+ result = RedisUtil.set(String.format("%S_%s_%s_%s_%s_%s", VideoManagerConstants.DOWNLOAD_PREFIX,
+ userSetting.getServerId(), stream.getDeviceID(), stream.getChannelId(), stream.getStream(), callId), stream);
+ }else {
+ result = RedisUtil.set(String.format("%S_%s_%s_%s_%s_%s", VideoManagerConstants.DOWNLOAD_PREFIX,
+ userSetting.getServerId(), stream.getDeviceID(), stream.getChannelId(), stream.getStream(), callId), stream, 60*60);
+ }
+ return result;
+ }
+ @Override
+ public boolean stopDownload(String deviceId, String channelId, String stream, String callId) {
+ DeviceChannel deviceChannel = deviceChannelMapper.queryChannel(deviceId, channelId);
if (deviceChannel != null) {
deviceChannel.setStreamId(null);
- deviceChannel.setDeviceId(streamInfo.getDeviceID());
+ deviceChannel.setDeviceId(deviceId);
deviceChannelMapper.update(deviceChannel);
}
- return redis.del(String.format("%S_%s_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX,
- streamInfo.getStreamId(),
- streamInfo.getDeviceID(),
- streamInfo.getChannelId()));
+ 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.DOWNLOAD_PREFIX,
+ userSetting.getServerId(),
+ deviceId,
+ channelId,
+ stream,
+ callId
+ );
+ List<Object> scan = RedisUtil.scan(key);
+ if (scan.size() > 0) {
+ for (Object keyObj : scan) {
+ RedisUtil.del((String) keyObj);
+ }
+ }
+ return true;
}
@Override
- public StreamInfo queryPlaybackByDevice(String deviceId, String code) {
- // String format = String.format("%S_*_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX,
- // deviceId,
- // code);
- List<Object> playLeys = redis.scan(String.format("%S_*_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX,
- deviceId,
- code));
- if (playLeys == null || playLeys.size() == 0) {
- playLeys = redis.scan(String.format("%S_*_*_%s", VideoManagerConstants.PLAY_BLACK_PREFIX,
- deviceId));
+ public boolean stopPlayback(String deviceId, String channelId, String stream, String callId) {
+ DeviceChannel deviceChannel = deviceChannelMapper.queryChannel(deviceId, channelId);
+ if (deviceChannel != null) {
+ deviceChannel.setStreamId(null);
+ deviceChannel.setDeviceId(deviceId);
+ deviceChannelMapper.update(deviceChannel);
}
- if (playLeys == null || playLeys.size() == 0) return null;
- return (StreamInfo)redis.get(playLeys.get(0).toString());
+ 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> scan = RedisUtil.scan(key);
+ if (scan.size() > 0) {
+ for (Object keyObj : scan) {
+ RedisUtil.del((String) keyObj);
+ }
+ }
+ return true;
+ }
+
+ @Override
+ public StreamInfo queryPlayback(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);
+ if (streamInfoScan.size() > 0) {
+ return (StreamInfo) RedisUtil.get((String) streamInfoScan.get(0));
+ }else {
+ return null;
+ }
+ }
+
+ @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 + parentPlatformCatch.getId();
- redis.set(key, parentPlatformCatch);
- }
-
- @Override
- public void updatePlatformKeepalive(ParentPlatform parentPlatform) {
- String key = VideoManagerConstants.PLATFORM_KEEPLIVEKEY_PREFIX + parentPlatform.getServerGBId();
- redis.set(key, "", Integer.parseInt(parentPlatform.getKeepTimeout()));
- }
-
- @Override
- public void updatePlatformRegister(ParentPlatform parentPlatform) {
- String key = VideoManagerConstants.PLATFORM_REGISTER_PREFIX + parentPlatform.getServerGBId();
- redis.set(key, "", Integer.parseInt(parentPlatform.getExpires()));
+ String key = VideoManagerConstants.PLATFORM_CATCH_PREFIX + userSetting.getServerId() + "_" + parentPlatformCatch.getId();
+ RedisUtil.set(key, parentPlatformCatch);
}
@Override
public ParentPlatformCatch queryPlatformCatchInfo(String platformGbId) {
- return (ParentPlatformCatch)redis.get(VideoManagerConstants.PLATFORM_CATCH_PREFIX + platformGbId);
+ return (ParentPlatformCatch)RedisUtil.get(VideoManagerConstants.PLATFORM_CATCH_PREFIX + userSetting.getServerId() + "_" + platformGbId);
}
@Override
public void delPlatformCatchInfo(String platformGbId) {
- redis.del(VideoManagerConstants.PLATFORM_CATCH_PREFIX + platformGbId);
+ RedisUtil.del(VideoManagerConstants.PLATFORM_CATCH_PREFIX + userSetting.getServerId() + "_" + platformGbId);
}
@Override
public void delPlatformKeepalive(String platformGbId) {
- redis.del(VideoManagerConstants.PLATFORM_KEEPLIVEKEY_PREFIX + platformGbId);
+ RedisUtil.del(VideoManagerConstants.PLATFORM_KEEPALIVE_PREFIX + userSetting.getServerId() + "_" + platformGbId);
}
@Override
public void delPlatformRegister(String platformGbId) {
- redis.del(VideoManagerConstants.PLATFORM_REGISTER_PREFIX + platformGbId);
+ RedisUtil.del(VideoManagerConstants.PLATFORM_REGISTER_PREFIX + userSetting.getServerId() + "_" + platformGbId);
}
@Override
- public void updatePlatformRegisterInfo(String callId, String platformGbId) {
- String key = VideoManagerConstants.PLATFORM_REGISTER_INFO_PREFIX + callId;
- redis.set(key, platformGbId);
+ public void updatePlatformRegisterInfo(String callId, PlatformRegisterInfo platformRegisterInfo) {
+ String key = VideoManagerConstants.PLATFORM_REGISTER_INFO_PREFIX + userSetting.getServerId() + "_" + callId;
+ RedisUtil.set(key, platformRegisterInfo, 30);
}
@Override
- public String queryPlatformRegisterInfo(String callId) {
- return (String)redis.get(VideoManagerConstants.PLATFORM_REGISTER_INFO_PREFIX + callId);
+ public PlatformRegisterInfo queryPlatformRegisterInfo(String callId) {
+ return (PlatformRegisterInfo)RedisUtil.get(VideoManagerConstants.PLATFORM_REGISTER_INFO_PREFIX + userSetting.getServerId() + "_" + callId);
}
@Override
public void delPlatformRegisterInfo(String callId) {
- redis.del(VideoManagerConstants.PLATFORM_REGISTER_INFO_PREFIX + callId);
+ RedisUtil.del(VideoManagerConstants.PLATFORM_REGISTER_INFO_PREFIX + userSetting.getServerId() + "_" + callId);
}
@Override
public void cleanPlatformRegisterInfos() {
- List regInfos = redis.scan(VideoManagerConstants.PLATFORM_REGISTER_INFO_PREFIX + "*");
+ List regInfos = RedisUtil.scan(VideoManagerConstants.PLATFORM_REGISTER_INFO_PREFIX + userSetting.getServerId() + "_" + "*");
for (Object key : regInfos) {
- redis.del(key.toString());
+ RedisUtil.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);
+ String key = VideoManagerConstants.PLATFORM_SEND_RTP_INFO_PREFIX + userSetting.getServerId() + "_"
+ + sendRtpItem.getPlatformId() + "_" + sendRtpItem.getChannelId() + "_"
+ + sendRtpItem.getStreamId() + "_" + sendRtpItem.getCallId();
+ RedisUtil.set(key, sendRtpItem);
}
@Override
- public SendRtpItem querySendRTPServer(String platformGbId, String channelId) {
- String key = VideoManagerConstants.PLATFORM_SEND_RTP_INFO_PREFIX + platformGbId + "_" + channelId;
- return (SendRtpItem)redis.get(key);
+ public SendRtpItem querySendRTPServer(String platformGbId, String channelId, String streamId, String callId) {
+ if (platformGbId == null) {
+ platformGbId = "*";
+ }
+ if (channelId == null) {
+ channelId = "*";
+ }
+ if (streamId == null) {
+ streamId = "*";
+ }
+ if (callId == null) {
+ callId = "*";
+ }
+ String key = VideoManagerConstants.PLATFORM_SEND_RTP_INFO_PREFIX + userSetting.getServerId() + "_" + platformGbId
+ + "_" + channelId + "_" + streamId + "_" + callId;
+ List<Object> scan = RedisUtil.scan(key);
+ if (scan.size() > 0) {
+ return (SendRtpItem)RedisUtil.get((String)scan.get(0));
+ }else {
+ return null;
+ }
+ }
+
+ @Override
+ public List<SendRtpItem> querySendRTPServerByChnnelId(String channelId) {
+ if (channelId == null) {
+ return null;
+ }
+ String platformGbId = "*";
+ String callId = "*";
+ 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) {
+ result.add((SendRtpItem) RedisUtil.get((String) o));
+ }
+ return result;
}
@Override
public List<SendRtpItem> querySendRTPServer(String platformGbId) {
- String key = VideoManagerConstants.PLATFORM_SEND_RTP_INFO_PREFIX + platformGbId + "_*";
- List<Object> queryResult = redis.scan(key);
+ if (platformGbId == null) {
+ platformGbId = "*";
+ }
+ String key = VideoManagerConstants.PLATFORM_SEND_RTP_INFO_PREFIX + userSetting.getServerId() + "_" + platformGbId + "_*" + "_*" + "_*";
+ List<Object> queryResult = RedisUtil.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));
+ for (Object o : queryResult) {
+ String keyItem = (String) o;
+ result.add((SendRtpItem) RedisUtil.get(keyItem));
}
return result;
@@ -238,10 +457,24 @@
* @param channelId
*/
@Override
- public void deleteSendRTPServer(String platformGbId, String channelId) {
- String key = VideoManagerConstants.PLATFORM_SEND_RTP_INFO_PREFIX + platformGbId + "_" + channelId;
- redis.del(key);
+ public void deleteSendRTPServer(String platformGbId, String channelId, String callId, String streamId) {
+ if (streamId == null) {
+ streamId = "*";
+ }
+ if (callId == null) {
+ callId = "*";
+ }
+ String key = VideoManagerConstants.PLATFORM_SEND_RTP_INFO_PREFIX + userSetting.getServerId() + "_" + platformGbId
+ + "_" + channelId + "_" + streamId + "_" + callId;
+ List<Object> scan = RedisUtil.scan(key);
+ if (scan.size() > 0) {
+ for (Object keyStr : scan) {
+ RedisUtil.del((String)keyStr);
+ }
+ }
}
+
+
/**
* 鏌ヨ鏌愪釜閫氶亾鏄惁瀛樺湪涓婄骇鐐规挱锛圧TP鎺ㄩ�侊級
@@ -249,8 +482,8 @@
*/
@Override
public boolean isChannelSendingRTP(String channelId) {
- String key = VideoManagerConstants.PLATFORM_SEND_RTP_INFO_PREFIX + "*_" + channelId;
- List<Object> RtpStreams = redis.scan(key);
+ String key = VideoManagerConstants.PLATFORM_SEND_RTP_INFO_PREFIX + userSetting.getServerId() + "_" + "*_" + channelId + "*_" + "*_";
+ List<Object> RtpStreams = RedisUtil.scan(key);
if (RtpStreams.size() > 0) {
return true;
} else {
@@ -260,35 +493,282 @@
@Override
public void clearCatchByDeviceId(String deviceId) {
- List<Object> playLeys = redis.scan(String.format("%S_*_%s_*", VideoManagerConstants.PLAYER_PREFIX,
+ List<Object> playLeys = RedisUtil.scan(String.format("%S_%s_*_%s_*", VideoManagerConstants.PLAYER_PREFIX,
+ userSetting.getServerId(),
deviceId));
if (playLeys.size() > 0) {
for (Object key : playLeys) {
- redis.del(key.toString());
+ RedisUtil.del(key.toString());
}
}
- List<Object> playBackers = redis.scan(String.format("%S_*_%s_*", VideoManagerConstants.PLAY_BLACK_PREFIX,
+ List<Object> playBackers = RedisUtil.scan(String.format("%S_%s_%s_*_*_*", VideoManagerConstants.PLAY_BLACK_PREFIX,
+ userSetting.getServerId(),
deviceId));
if (playBackers.size() > 0) {
for (Object key : playBackers) {
- redis.del(key.toString());
+ RedisUtil.del(key.toString());
+ }
+ }
+
+ List<Object> deviceCache = RedisUtil.scan(String.format("%S%s_%s", VideoManagerConstants.DEVICE_PREFIX,
+ userSetting.getServerId(),
+ deviceId));
+ if (deviceCache.size() > 0) {
+ for (Object key : deviceCache) {
+ RedisUtil.del(key.toString());
}
}
}
@Override
- 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);
+ public void updateWVPInfo(JSONObject jsonObject, int time) {
+ String key = VideoManagerConstants.WVP_SERVER_PREFIX + userSetting.getServerId();
+ RedisUtil.set(key, jsonObject, time);
+ }
+
+ @Override
+ public void sendStreamChangeMsg(String type, JSONObject jsonObject) {
+ String key = VideoManagerConstants.WVP_MSG_STREAM_CHANGE_PREFIX + type;
+ logger.info("[redis 娴佸彉鍖栦簨浠禲 {}: {}", key, jsonObject.toString());
+ RedisUtil.convertAndSend(key, jsonObject);
+ }
+
+ @Override
+ public void addStream(MediaServerItem mediaServerItem, String type, String app, String streamId, MediaItem mediaItem) {
+ // 鏌ユ壘鏄惁浣跨敤浜哻allID
+ StreamAuthorityInfo streamAuthorityInfo = getStreamAuthorityInfo(app, streamId);
+ String key = VideoManagerConstants.WVP_SERVER_STREAM_PREFIX + userSetting.getServerId() + "_" + type + "_" + app + "_" + streamId + "_" + mediaServerItem.getId();
+ if (streamAuthorityInfo != null) {
+ mediaItem.setCallId(streamAuthorityInfo.getCallId());
+ }
+ RedisUtil.set(key, mediaItem);
+ }
+
+ @Override
+ public void removeStream(String mediaServerId, String type, String app, String streamId) {
+ String key = VideoManagerConstants.WVP_SERVER_STREAM_PREFIX + userSetting.getServerId() + "_" + type + "_" + app + "_" + streamId + "_" + mediaServerId;
+ RedisUtil.del(key);
+ }
+
+ @Override
+ public StreamInfo queryDownload(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.DOWNLOAD_PREFIX,
+ userSetting.getServerId(),
+ deviceId,
+ channelId,
+ stream,
+ callId
+ );
+ List<Object> streamInfoScan = RedisUtil.scan(key);
+ if (streamInfoScan.size() > 0) {
+ return (StreamInfo) RedisUtil.get((String) streamInfoScan.get(0));
+ }else {
+ return null;
}
}
@Override
- public void updateWVPInfo(JSONObject jsonObject) {
+ public ThirdPartyGB queryMemberNoGBId(String queryKey) {
+ String key = VideoManagerConstants.WVP_STREAM_GB_ID_PREFIX + queryKey;
+ JSONObject jsonObject = (JSONObject)RedisUtil.get(key);
+ return JSONObject.toJavaObject(jsonObject, ThirdPartyGB.class);
+ }
+
+ @Override
+ public void removeStream(String mediaServerId, String type) {
+ String key = VideoManagerConstants.WVP_SERVER_STREAM_PREFIX + userSetting.getServerId() + "_" + type + "_*_*_" + mediaServerId;
+ List<Object> streams = RedisUtil.scan(key);
+ for (Object stream : streams) {
+ RedisUtil.del((String) stream);
+ }
+ }
+
+ @Override
+ public List<MediaItem> getStreams(String mediaServerId, String type) {
+ List<MediaItem> result = new ArrayList<>();
+ String key = VideoManagerConstants.WVP_SERVER_STREAM_PREFIX + userSetting.getServerId() + "_" + type + "_*_*_" + mediaServerId;
+ List<Object> streams = RedisUtil.scan(key);
+ for (Object stream : streams) {
+ MediaItem mediaItem = (MediaItem)RedisUtil.get((String) stream);
+ result.add(mediaItem);
+ }
+ return result;
+ }
+
+ @Override
+ public void updateDevice(Device device) {
+ String key = VideoManagerConstants.DEVICE_PREFIX + userSetting.getServerId() + "_" + device.getDeviceId();
+ RedisUtil.set(key, device);
+ }
+
+ @Override
+ public void removeDevice(String deviceId) {
+ String key = VideoManagerConstants.DEVICE_PREFIX + userSetting.getServerId() + "_" + deviceId;
+ RedisUtil.del(key);
+ }
+
+ @Override
+ public Device getDevice(String deviceId) {
+ String key = VideoManagerConstants.DEVICE_PREFIX + userSetting.getServerId() + "_" + deviceId;
+ return (Device)RedisUtil.get(key);
+ }
+
+ @Override
+ public void updateGpsMsgInfo(GPSMsgInfo gpsMsgInfo) {
+ String key = VideoManagerConstants.WVP_STREAM_GPS_MSG_PREFIX + userSetting.getServerId() + "_" + gpsMsgInfo.getId();
+ RedisUtil.set(key, gpsMsgInfo, 60); // 榛樿GPS娑堟伅淇濆瓨1鍒嗛挓
+ }
+
+ @Override
+ public GPSMsgInfo getGpsMsgInfo(String gbId) {
+ String key = VideoManagerConstants.WVP_STREAM_GPS_MSG_PREFIX + userSetting.getServerId() + "_" + gbId;
+ return (GPSMsgInfo)RedisUtil.get(key);
+ }
+
+ @Override
+ public List<GPSMsgInfo> getAllGpsMsgInfo() {
+ String scanKey = VideoManagerConstants.WVP_STREAM_GPS_MSG_PREFIX + userSetting.getServerId() + "_*";
+ List<GPSMsgInfo> result = new ArrayList<>();
+ List<Object> keys = RedisUtil.scan(scanKey);
+ for (Object o : keys) {
+ String key = (String) o;
+ GPSMsgInfo gpsMsgInfo = (GPSMsgInfo) RedisUtil.get(key);
+ if (!gpsMsgInfo.isStored()) { // 鍙彇娌℃湁瀛樿繃寰�
+ result.add((GPSMsgInfo) RedisUtil.get(key));
+ }
+ }
+
+ return result;
+ }
+
+ @Override
+ public void updateStreamAuthorityInfo(String app, String stream, StreamAuthorityInfo streamAuthorityInfo) {
+ String key = VideoManagerConstants.MEDIA_STREAM_AUTHORITY + userSetting.getServerId() + "_" + app+ "_" + stream;
+ RedisUtil.set(key, streamAuthorityInfo);
+ }
+
+ @Override
+ public void removeStreamAuthorityInfo(String app, String stream) {
+ String key = VideoManagerConstants.MEDIA_STREAM_AUTHORITY + userSetting.getServerId() + "_" + app+ "_" + stream ;
+ RedisUtil.del(key);
+ }
+
+ @Override
+ public StreamAuthorityInfo getStreamAuthorityInfo(String app, String stream) {
+ String key = VideoManagerConstants.MEDIA_STREAM_AUTHORITY + userSetting.getServerId() + "_" + app+ "_" + stream ;
+ return (StreamAuthorityInfo) RedisUtil.get(key);
}
+
+ @Override
+ public MediaItem getStreamInfo(String app, String streamId, String mediaServerId) {
+ String scanKey = VideoManagerConstants.WVP_SERVER_STREAM_PREFIX + userSetting.getServerId() + "_*_" + app + "_" + streamId + "_" + mediaServerId;
+
+ MediaItem result = null;
+ List<Object> keys = RedisUtil.scan(scanKey);
+ if (keys.size() > 0) {
+ String key = (String) keys.get(0);
+ result = (MediaItem)RedisUtil.get(key);
+ }
+
+ return result;
+ }
+
+ @Override
+ public void addCpuInfo(double cpuInfo) {
+ String key = VideoManagerConstants.SYSTEM_INFO_CPU_PREFIX + userSetting.getServerId();
+ SystemInfoDto<Double> systemInfoDto = new SystemInfoDto<>();
+ systemInfoDto.setTime(DateUtil.getNow());
+ systemInfoDto.setData(cpuInfo);
+ RedisUtil.lSet(key, systemInfoDto);
+ // 姣忕涓�涓紝鏈�澶氬彧瀛�30涓�
+ if (RedisUtil.lGetListSize(key) > 30) {
+ for (int i = 0; i < RedisUtil.lGetListSize(key) - 30; i++) {
+ RedisUtil.lLeftPop(key);
+ }
+ }
+ }
+
+ @Override
+ public void addMemInfo(double memInfo) {
+ String key = VideoManagerConstants.SYSTEM_INFO_MEM_PREFIX + userSetting.getServerId();
+ SystemInfoDto<Double> systemInfoDto = new SystemInfoDto<>();
+ systemInfoDto.setTime(DateUtil.getNow());
+ systemInfoDto.setData(memInfo);
+ RedisUtil.lSet(key, systemInfoDto);
+ // 姣忕涓�涓紝鏈�澶氬彧瀛�30涓�
+ if (RedisUtil.lGetListSize(key) > 30) {
+ for (int i = 0; i < RedisUtil.lGetListSize(key) - 30; i++) {
+ RedisUtil.lLeftPop(key);
+ }
+ }
+ }
+
+ @Override
+ public void addNetInfo(Map<String, String> networkInterfaces) {
+ String key = VideoManagerConstants.SYSTEM_INFO_NET_PREFIX + userSetting.getServerId();
+ SystemInfoDto<Map<String, String>> systemInfoDto = new SystemInfoDto<>();
+ systemInfoDto.setTime(DateUtil.getNow());
+ systemInfoDto.setData(networkInterfaces);
+ RedisUtil.lSet(key, systemInfoDto);
+ // 姣忕涓�涓紝鏈�澶氬彧瀛�30涓�
+ if (RedisUtil.lGetListSize(key) > 30) {
+ for (int i = 0; i < RedisUtil.lGetListSize(key) - 30; i++) {
+ RedisUtil.lLeftPop(key);
+ }
+ }
+ }
+
+ @Override
+ public void sendMobilePositionMsg(JSONObject jsonObject) {
+ String key = VideoManagerConstants.VM_MSG_SUBSCRIBE_MOBILE_POSITION;
+ 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());
+ RedisUtil.convertAndSend(key, (JSONObject)JSON.toJSON(msg));
+ }
+
+ @Override
+ public void sendAlarmMsg(AlarmChannelMessage msg) {
+ String key = VideoManagerConstants.VM_MSG_SUBSCRIBE_ALARM;
+ logger.info("[redis鍙戦�侀�氱煡] 鎶ヨ{}: {}", key, JSON.toJSON(msg));
+ RedisUtil.convertAndSend(key, (JSONObject)JSON.toJSON(msg));
+ }
+
+ @Override
+ public boolean deviceIsOnline(String deviceId) {
+ return getDevice(deviceId).getOnline() == 1;
+ }
+
+
+ @Override
+ public void sendStreamPushRequestedMsgForStatus() {
+ String key = VideoManagerConstants.VM_MSG_GET_ALL_ONLINE_REQUESTED;
+ logger.info("[redis閫氱煡]鑾峰彇鎵�鏈夋帹娴佽澶囩殑鐘舵��");
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put(key, key);
+ RedisUtil.convertAndSend(key, jsonObject);
+ }
}
--
Gitblit v1.8.0