From ffb0fcb9072a043c333837fa83bd976b03fea091 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 02 十二月 2021 09:30:57 +0800
Subject: [PATCH] Merge pull request #259 from hotcoffie/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java | 59 ++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 44 insertions(+), 15 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 56c31c1..5878339 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
@@ -2,10 +2,10 @@
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;
+import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import java.util.List;
import java.util.Map;
@@ -39,19 +39,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);
@@ -115,12 +102,54 @@
void clearCatchByDeviceId(String deviceId);
/**
+ * 鑾峰彇mediaServer鑺傜偣
+ * @param mediaServerId
+ * @return
+ */
+// MediaServerItem getMediaInfo(String mediaServerId);
+
+ /**
* 璁剧疆鎵�鏈夎澶囩绾�
*/
void outlineForAll();
/**
+ * 鑾峰彇鎵�鏈夊湪绾跨殑
+ */
+ List<String> getOnlineForAll();
+
+ /**
* 鍦╮edis娣诲姞wvp鐨勪俊鎭�
*/
- void updateWVPInfo(JSONObject jsonObject);
+ void updateWVPInfo(String id, JSONObject jsonObject, int time);
+
+ /**
+ * 鍙戦�佹帹娴佺敓鎴愪笌鎺ㄦ祦娑堝け娑堟伅
+ * @param jsonObject 娑堟伅鍐呭
+ */
+ void sendStreamChangeMsg(JSONObject jsonObject);
+
+ /**
+ * 娣诲姞娴佷俊鎭埌redis
+ * @param mediaServerItem
+ * @param app
+ * @param streamId
+ */
+ void addPushStream(MediaServerItem mediaServerItem, String app, String streamId, StreamInfo streamInfo);
+
+ /**
+ * 绉婚櫎娴佷俊鎭粠redis
+ * @param mediaServerItem
+ * @param app
+ * @param streamId
+ */
+ void removePushStream(MediaServerItem mediaServerItem, String app, String streamId);
+
+ /**
+ * 寮�濮嬩笅杞藉綍鍍忔椂瀛樺叆
+ * @param streamInfo
+ */
+ boolean startDownload(StreamInfo streamInfo);
+
+ StreamInfo queryDownloadByStreamId(String streamId);
}
--
Gitblit v1.8.0