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 | 11 +++++++---- 1 files changed, 7 insertions(+), 4 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 8b2c2bf..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 { @@ -40,16 +41,16 @@ /** * 鏇存柊娴佸獟浣撲俊鎭� - * @param mediaServerConfig + * @param ZLMServerConfig * @return */ - boolean updateMediaInfo(MediaServerConfig mediaServerConfig); + boolean updateMediaInfo(ZLMServerConfig ZLMServerConfig); /** * 鑾峰彇娴佸獟浣撲俊鎭� * @return */ - MediaServerConfig getMediaInfo(); + ZLMServerConfig getMediaInfo(); Map<String, StreamInfo> queryPlayByDeviceId(String deviceId); @@ -91,6 +92,8 @@ */ SendRtpItem querySendRTPServer(String platformGbId, String channelId); + List<SendRtpItem> querySendRTPServer(String platformGbId); + /** * 鍒犻櫎RTP鎺ㄩ�佷俊鎭紦瀛� * @param platformGbId -- Gitblit v1.8.0