From 3d88881f670c4404bf8c7c984a8f484a8f69f60f Mon Sep 17 00:00:00 2001
From: lawrencehj <1934378145@qq.com>
Date: 星期二, 22 六月 2021 11:33:37 +0800
Subject: [PATCH] SSE推送请求应为GET
---
src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java | 39 ++++++++++++++++++++++++++++++++-------
1 files changed, 32 insertions(+), 7 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 98795ef..2120415 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;
@@ -10,6 +10,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import java.text.SimpleDateFormat;
import java.util.*;
@SuppressWarnings("rawtypes")
@@ -22,6 +23,7 @@
@Autowired
private DeviceChannelMapper deviceChannelMapper;
+ private SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
/**
* 寮�濮嬫挱鏀炬椂灏嗘祦瀛樺叆redis
@@ -86,13 +88,13 @@
/**
* 鏇存柊娴佸獟浣撲俊鎭�
- * @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(format.format(new Date(System.currentTimeMillis())));
+ return redis.set(VideoManagerConstants.MEDIA_SERVER_PREFIX, ZLMServerConfig);
}
/**
@@ -100,8 +102,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 +235,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
@@ -277,4 +293,13 @@
}
}
}
+
+ @Override
+ public void outlineForAll() {
+ List<Object> onlineDevices = redis.scan(String.format("%S*", VideoManagerConstants.KEEPLIVEKEY_PREFIX));
+ for (int i = 0; i < onlineDevices.size(); i++) {
+ String key = (String) onlineDevices.get(i);
+ redis.del(key);
+ }
+ }
}
--
Gitblit v1.8.0