From 9d37b411ec6f0eea32b7d659d62f31bee4d93dbb Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期日, 06 三月 2022 00:09:34 +0800
Subject: [PATCH] Merge pull request #375 from MeBetterMan/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java | 93 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 83 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 1d68943..b5a3aba 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
@@ -2,6 +2,7 @@
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.conf.UserSetup;
import com.genersoft.iot.vmp.gb28181.bean.*;
@@ -9,6 +10,7 @@
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
import com.genersoft.iot.vmp.service.bean.GPSMsgInfo;
+import com.genersoft.iot.vmp.service.bean.SSRCInfo;
import com.genersoft.iot.vmp.service.bean.ThirdPartyGB;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.dao.DeviceChannelMapper;
@@ -90,7 +92,8 @@
*/
@Override
public boolean startPlay(StreamInfo stream) {
- return redis.set(String.format("%S_%S_%s_%s_%s", VideoManagerConstants.PLAYER_PREFIX, userSetup.getServerId(), stream.getStreamId(),stream.getDeviceID(), stream.getChannelId()),
+ return redis.set(String.format("%S_%S_%s_%s_%s", VideoManagerConstants.PLAYER_PREFIX, userSetup.getServerId(),
+ stream.getStream(), stream.getDeviceID(), stream.getChannelId()),
stream);
}
@@ -104,7 +107,7 @@
if (streamInfo == null) return false;
return redis.del(String.format("%S_%s_%s_%s_%s", VideoManagerConstants.PLAYER_PREFIX,
userSetup.getServerId(),
- streamInfo.getStreamId(),
+ streamInfo.getStream(),
streamInfo.getDeviceID(),
streamInfo.getChannelId()));
}
@@ -118,7 +121,7 @@
return (StreamInfo)redis.get(String.format("%S_%s_%s_%s_%s",
VideoManagerConstants.PLAYER_PREFIX,
userSetup.getServerId(),
- streamInfo.getStreamId(),
+ streamInfo.getStream(),
streamInfo.getDeviceID(),
streamInfo.getChannelId()));
}
@@ -138,7 +141,6 @@
@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_%s", VideoManagerConstants.PLAYER_PREFIX,
userSetup.getServerId(),
deviceId,
@@ -164,14 +166,14 @@
@Override
public boolean startPlayback(StreamInfo stream) {
- return redis.set(String.format("%S_%s_%s_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX, userSetup.getServerId(),stream.getStreamId(),
- stream.getDeviceID(), stream.getChannelId()), stream);
+ return redis.set(String.format("%S_%s_%s_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX,
+ userSetup.getServerId(), stream.getStream(), stream.getDeviceID(), stream.getChannelId()), stream);
}
@Override
public boolean startDownload(StreamInfo streamInfo) {
- return redis.set(String.format("%S_%s_%s_%s_%s", VideoManagerConstants.DOWNLOAD_PREFIX, userSetup.getServerId(),streamInfo.getStreamId(),
- streamInfo.getDeviceID(), streamInfo.getChannelId()), streamInfo);
+ return redis.set(String.format("%S_%s_%s_%s_%s", VideoManagerConstants.DOWNLOAD_PREFIX, userSetup.getServerId(),
+ streamInfo.getStream(), streamInfo.getDeviceID(), streamInfo.getChannelId()), streamInfo);
}
@Override
@@ -185,7 +187,7 @@
}
return redis.del(String.format("%S_%s_%s_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX,
userSetup.getServerId(),
- streamInfo.getStreamId(),
+ streamInfo.getStream(),
streamInfo.getDeviceID(),
streamInfo.getChannelId()));
}
@@ -250,7 +252,7 @@
@Override
public void updatePlatformRegisterInfo(String callId, String platformGbId) {
String key = VideoManagerConstants.PLATFORM_REGISTER_INFO_PREFIX + userSetup.getServerId() + "_" + callId;
- redis.set(key, platformGbId);
+ redis.set(key, platformGbId, 30);
}
@@ -508,4 +510,75 @@
return result;
}
+
+ @Override
+ public List<SubscribeInfo> getAllSubscribe() {
+ String scanKey = VideoManagerConstants.SIP_SUBSCRIBE_PREFIX + userSetup.getServerId() + "_Catalog_*";
+ List<SubscribeInfo> result = new ArrayList<>();
+ List<Object> keys = redis.scan(scanKey);
+ for (int i = 0; i < keys.size(); i++) {
+ String key = (String) keys.get(i);
+ SubscribeInfo subscribeInfo = (SubscribeInfo) redis.get(key);
+ result.add(subscribeInfo);
+ }
+ return result;
+ }
+
+ @Override
+ public List<String> getAllSubscribePlatform() {
+ String scanKey = VideoManagerConstants.SIP_SUBSCRIBE_PREFIX + userSetup.getServerId() + "_Catalog_*";
+ List<String> result = new ArrayList<>();
+ List<Object> keys = redis.scan(scanKey);
+ for (int i = 0; i < keys.size(); i++) {
+ String key = (String) keys.get(i);
+ String platformId = key.substring(scanKey.length() - 1);
+ result.add(platformId);
+ }
+ return result;
+ }
+
+ @Override
+ public void addCpuInfo(double cpuInfo) {
+ String key = VideoManagerConstants.SYSTEM_INFO_CPU_PREFIX + userSetup.getServerId();
+ SystemInfoDto<Double> systemInfoDto = new SystemInfoDto<>();
+ systemInfoDto.setTime(format.format(System.currentTimeMillis()));
+ systemInfoDto.setData(cpuInfo);
+ redis.lSet(key, systemInfoDto);
+ // 姣忕涓�涓紝鏈�澶氬彧瀛�30涓�
+ if (redis.lGetListSize(key) > 30) {
+ for (int i = 0; i < redis.lGetListSize(key) - 30; i++) {
+ redis.lLeftPop(key);
+ }
+ }
+ }
+
+ @Override
+ public void addMemInfo(double memInfo) {
+ String key = VideoManagerConstants.SYSTEM_INFO_MEM_PREFIX + userSetup.getServerId();
+ SystemInfoDto<Double> systemInfoDto = new SystemInfoDto<>();
+ systemInfoDto.setTime(format.format(System.currentTimeMillis()));
+ systemInfoDto.setData(memInfo);
+ redis.lSet(key, systemInfoDto);
+ // 姣忕涓�涓紝鏈�澶氬彧瀛�30涓�
+ if (redis.lGetListSize(key) > 30) {
+ for (int i = 0; i < redis.lGetListSize(key) - 30; i++) {
+ redis.lLeftPop(key);
+ }
+ }
+ }
+
+ @Override
+ public void addNetInfo(Map<String, String> networkInterfaces) {
+ String key = VideoManagerConstants.SYSTEM_INFO_NET_PREFIX + userSetup.getServerId();
+ SystemInfoDto<Map<String, String>> systemInfoDto = new SystemInfoDto<>();
+ systemInfoDto.setTime(format.format(System.currentTimeMillis()));
+ systemInfoDto.setData(networkInterfaces);
+ redis.lSet(key, systemInfoDto);
+ // 姣忕涓�涓紝鏈�澶氬彧瀛�30涓�
+ if (redis.lGetListSize(key) > 30) {
+ for (int i = 0; i < redis.lGetListSize(key) - 30; i++) {
+ redis.lLeftPop(key);
+ }
+ }
+ }
}
--
Gitblit v1.8.0