From 381b3d15caa30e99c75f58a366b3b75cbbf01450 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 07 十二月 2021 11:40:17 +0800
Subject: [PATCH] 修复未结束的推流无法下载

---
 src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java |  101 +++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 86 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 ca70620..0458941 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,14 @@
 package com.genersoft.iot.vmp.storager;
 
+import com.alibaba.fastjson.JSONObject;
 import com.genersoft.iot.vmp.common.StreamInfo;
-import com.genersoft.iot.vmp.conf.MediaServerConfig;
 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 com.genersoft.iot.vmp.service.bean.ThirdPartyGB;
 
+import java.util.List;
 import java.util.Map;
 
 public interface IRedisCatchStorage {
@@ -36,20 +39,7 @@
 
     StreamInfo queryPlaybackByStreamId(String steamId);
 
-    StreamInfo queryPlayByDevice(String deviceId, String code);
-
-    /**
-     * 鏇存柊娴佸獟浣撲俊鎭�
-     * @param mediaServerConfig
-     * @return
-     */
-    boolean updateMediaInfo(MediaServerConfig mediaServerConfig);
-
-    /**
-     * 鑾峰彇娴佸獟浣撲俊鎭�
-     * @return
-     */
-    MediaServerConfig getMediaInfo();
+    StreamInfo queryPlayByDevice(String deviceId, String channelId);
 
     Map<String, StreamInfo> queryPlayByDeviceId(String deviceId);
 
@@ -79,6 +69,8 @@
 
     void delPlatformRegisterInfo(String callId);
 
+    void cleanPlatformRegisterInfos();
+
     void updateSendRTPSever(SendRtpItem sendRtpItem);
 
     /**
@@ -89,4 +81,83 @@
      */
     SendRtpItem querySendRTPServer(String platformGbId, String channelId);
 
+    List<SendRtpItem> querySendRTPServer(String platformGbId);
+
+    /**
+     * 鍒犻櫎RTP鎺ㄩ�佷俊鎭紦瀛�
+     * @param platformGbId
+     * @param channelId
+     */
+    void deleteSendRTPServer(String platformGbId, String channelId);
+
+    /**
+     * 鏌ヨ鏌愪釜閫氶亾鏄惁瀛樺湪涓婄骇鐐规挱锛圧TP鎺ㄩ�侊級
+     * @param channelId
+     */
+    boolean isChannelSendingRTP(String channelId);
+
+    /**
+     * 娓呯┖鏌愪釜璁惧鐨勬墍鏈夌紦瀛�
+     * @param deviceId 璁惧ID
+     */
+    void clearCatchByDeviceId(String deviceId);
+
+    /**
+     * 鑾峰彇mediaServer鑺傜偣
+     * @param mediaServerId
+     * @return
+     */
+//    MediaServerItem getMediaInfo(String mediaServerId);
+
+    /**
+     * 璁剧疆鎵�鏈夎澶囩绾�
+     */
+    void outlineForAll();
+
+    /**
+     * 鑾峰彇鎵�鏈夊湪绾跨殑
+     */
+    List<String> getOnlineForAll();
+
+    /**
+     * 鍦╮edis娣诲姞wvp鐨勪俊鎭�
+     */
+    void updateWVPInfo(JSONObject jsonObject, int time);
+
+    /**
+     * 鍙戦�佹帹娴佺敓鎴愪笌鎺ㄦ祦娑堝け娑堟伅
+     * @param jsonObject 娑堟伅鍐呭
+     */
+    void sendStreamChangeMsg(String type, JSONObject jsonObject);
+
+    /**
+     * 娣诲姞娴佷俊鎭埌redis
+     * @param mediaServerItem
+     * @param app
+     * @param streamId
+     */
+    void addStream(MediaServerItem mediaServerItem, String type, String app, String streamId, StreamInfo streamInfo);
+
+    /**
+     * 绉婚櫎娴佷俊鎭粠redis
+     * @param mediaServerItem
+     * @param app
+     * @param streamId
+     */
+    void removeStream(MediaServerItem mediaServerItem, String type, String app, String streamId);
+
+    /**
+     * 寮�濮嬩笅杞藉綍鍍忔椂瀛樺叆
+     * @param streamInfo
+     */
+    boolean startDownload(StreamInfo streamInfo);
+
+    StreamInfo queryDownloadByStreamId(String streamId);
+
+    /**
+     * 鏌ユ壘绗笁鏂圭郴缁熺暀涓嬬殑鍥芥爣棰勮鍊�
+     * @param queryKey
+     * @return
+     */
+    ThirdPartyGB queryMemberNoGBId(String queryKey);
 }

--
Gitblit v1.8.0