From 407a5b77c3586fef44dc771e48f05c2354740795 Mon Sep 17 00:00:00 2001
From: 648540858 <18010473990@163.com>
Date: 星期二, 07 九月 2021 09:20:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java b/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
index 649fb71..e4313d9 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
@@ -1,7 +1,7 @@
package com.genersoft.iot.vmp.storager;
+import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.common.StreamInfo;
-import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatformCatch;
import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem;
@@ -38,19 +38,6 @@
StreamInfo queryPlaybackByStreamId(String steamId);
StreamInfo queryPlayByDevice(String deviceId, String channelId);
-
- /**
- * 鏇存柊娴佸獟浣撲俊鎭�
- * @param ZLMServerConfig
- * @return
- */
- boolean updateMediaInfo(ZLMServerConfig ZLMServerConfig);
-
- /**
- * 鑾峰彇娴佸獟浣撲俊鎭�
- * @return
- */
- ZLMServerConfig getMediaInfo();
Map<String, StreamInfo> queryPlayByDeviceId(String deviceId);
@@ -114,7 +101,24 @@
void clearCatchByDeviceId(String deviceId);
/**
+ * 鑾峰彇mediaServer鑺傜偣
+ * @param mediaServerId
+ * @return
+ */
+// MediaServerItem getMediaInfo(String mediaServerId);
+
+ /**
* 璁剧疆鎵�鏈夎澶囩绾�
*/
void outlineForAll();
+
+ /**
+ * 鑾峰彇鎵�鏈夊湪绾跨殑
+ */
+ List<String> getOnlineForAll();
+
+ /**
+ * 鍦╮edis娣诲姞wvp鐨勪俊鎭�
+ */
+ void updateWVPInfo(JSONObject jsonObject);
}
--
Gitblit v1.8.0