From 324ae744d757ad329e79770d1a0fbc4d3dfc4602 Mon Sep 17 00:00:00 2001
From: lawrencehj <1934378145@qq.com>
Date: 星期五, 23 七月 2021 17:01:52 +0800
Subject: [PATCH] 增加历史媒体下载信令及API支持
---
src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java | 25 ++++---------------------
1 files changed, 4 insertions(+), 21 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 86909c7..eafb8a0 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
@@ -5,6 +5,8 @@
import com.genersoft.iot.vmp.common.VideoManagerConstants;
import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig;
import com.genersoft.iot.vmp.gb28181.bean.*;
+import com.genersoft.iot.vmp.media.zlm.dto.IMediaServerItem;
+import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.dao.DeviceChannelMapper;
import com.genersoft.iot.vmp.utils.redis.RedisUtil;
@@ -85,26 +87,6 @@
channelId));
if (playLeys == null || playLeys.size() == 0) return null;
return (StreamInfo)redis.get(playLeys.get(0).toString());
- }
-
- /**
- * 鏇存柊娴佸獟浣撲俊鎭�
- * @param ZLMServerConfig
- * @return
- */
- @Override
- public boolean updateMediaInfo(ZLMServerConfig ZLMServerConfig) {
- ZLMServerConfig.setUpdateTime(format.format(new Date(System.currentTimeMillis())));
- return redis.set(VideoManagerConstants.MEDIA_SERVER_PREFIX, ZLMServerConfig);
- }
-
- /**
- * 鑾峰彇娴佸獟浣撲俊鎭�
- * @return
- */
- @Override
- public ZLMServerConfig getMediaInfo() {
- return (ZLMServerConfig)redis.get(VideoManagerConstants.MEDIA_SERVER_PREFIX);
}
@Override
@@ -297,7 +279,7 @@
@Override
public void outlineForAll() {
- List<Object> onlineDevices = redis.scan(String.format("%S*", VideoManagerConstants.KEEPLIVEKEY_PREFIX));
+ 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);
@@ -308,4 +290,5 @@
public void updateWVPInfo(JSONObject jsonObject) {
}
+
}
--
Gitblit v1.8.0