From 57b562d622f3e9ac59372349efadbc56e66e80fa Mon Sep 17 00:00:00 2001
From: 64850858 <648540858@qq.com>
Date: 星期二, 08 六月 2021 10:37:29 +0800
Subject: [PATCH] 添加流IP单独配置
---
src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 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 3417acf..0318772 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,7 +2,7 @@
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.media.zlm.ZLMServerConfig;
import com.genersoft.iot.vmp.gb28181.bean.*;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.dao.DeviceChannelMapper;
@@ -75,24 +75,24 @@
}
@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
+ * @param ZLMServerConfig
* @return
*/
@Override
- public boolean updateMediaInfo(MediaServerConfig mediaServerConfig) {
- mediaServerConfig.setUpdateTime(System.currentTimeMillis());
- return redis.set(VideoManagerConstants.MEDIA_SERVER_PREFIX,mediaServerConfig);
+ public boolean updateMediaInfo(ZLMServerConfig ZLMServerConfig) {
+ ZLMServerConfig.setUpdateTime(System.currentTimeMillis());
+ return redis.set(VideoManagerConstants.MEDIA_SERVER_PREFIX, ZLMServerConfig);
}
/**
@@ -100,8 +100,8 @@
* @return
*/
@Override
- public MediaServerConfig getMediaInfo() {
- return (MediaServerConfig)redis.get(VideoManagerConstants.MEDIA_SERVER_PREFIX);
+ public ZLMServerConfig getMediaInfo() {
+ return (ZLMServerConfig)redis.get(VideoManagerConstants.MEDIA_SERVER_PREFIX);
}
@Override
@@ -233,6 +233,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
--
Gitblit v1.8.0