From fd296d1a6acccbe9f3a72623719bf7101725f4e9 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 06 五月 2021 09:28:22 +0800
Subject: [PATCH] Merge pull request #93 from yu1183688986/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 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 9061184..be9fdff 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
@@ -1,11 +1,12 @@
package com.genersoft.iot.vmp.storager;
import com.genersoft.iot.vmp.common.StreamInfo;
-import com.genersoft.iot.vmp.conf.MediaServerConfig;
+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 java.util.List;
import java.util.Map;
public interface IRedisCatchStorage {
@@ -36,20 +37,20 @@
StreamInfo queryPlaybackByStreamId(String steamId);
- StreamInfo queryPlayByDevice(String deviceId, String code);
+ StreamInfo queryPlayByDevice(String deviceId, String channelId);
/**
* 鏇存柊娴佸獟浣撲俊鎭�
- * @param mediaServerConfig
+ * @param ZLMServerConfig
* @return
*/
- boolean updateMediaInfo(MediaServerConfig mediaServerConfig);
+ boolean updateMediaInfo(ZLMServerConfig ZLMServerConfig);
/**
* 鑾峰彇娴佸獟浣撲俊鎭�
* @return
*/
- MediaServerConfig getMediaInfo();
+ ZLMServerConfig getMediaInfo();
Map<String, StreamInfo> queryPlayByDeviceId(String deviceId);
@@ -79,6 +80,8 @@
void delPlatformRegisterInfo(String callId);
+ void cleanPlatformRegisterInfos();
+
void updateSendRTPSever(SendRtpItem sendRtpItem);
/**
@@ -88,6 +91,8 @@
* @return sendRtpItem
*/
SendRtpItem querySendRTPServer(String platformGbId, String channelId);
+
+ List<SendRtpItem> querySendRTPServer(String platformGbId);
/**
* 鍒犻櫎RTP鎺ㄩ�佷俊鎭紦瀛�
@@ -102,4 +107,9 @@
*/
boolean isChannelSendingRTP(String channelId);
+ /**
+ * 娓呯┖鏌愪釜璁惧鐨勬墍鏈夌紦瀛�
+ * @param deviceId 璁惧ID
+ */
+ void clearCatchByDeviceId(String deviceId);
}
--
Gitblit v1.8.0