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 | 24 ++++++++++++++++++++----
1 files changed, 20 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 69bcd84..0458941 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
@@ -6,6 +6,7 @@
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;
@@ -121,13 +122,13 @@
/**
* 鍦╮edis娣诲姞wvp鐨勪俊鎭�
*/
- void updateWVPInfo(String id, JSONObject jsonObject, int time);
+ void updateWVPInfo(JSONObject jsonObject, int time);
/**
* 鍙戦�佹帹娴佺敓鎴愪笌鎺ㄦ祦娑堝け娑堟伅
* @param jsonObject 娑堟伅鍐呭
*/
- void sendStreamChangeMsg(JSONObject jsonObject);
+ void sendStreamChangeMsg(String type, JSONObject jsonObject);
/**
* 娣诲姞娴佷俊鎭埌redis
@@ -135,7 +136,7 @@
* @param app
* @param streamId
*/
- void addStream(MediaServerItem mediaServerItem, String app, String streamId, StreamInfo streamInfo);
+ void addStream(MediaServerItem mediaServerItem, String type, String app, String streamId, StreamInfo streamInfo);
/**
* 绉婚櫎娴佷俊鎭粠redis
@@ -143,5 +144,20 @@
* @param app
* @param streamId
*/
- void removeStream(MediaServerItem mediaServerItem, String app, String 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