From 7d9cc96ef54399795deb5b7fc7682e6323dc1202 Mon Sep 17 00:00:00 2001
From: 648540858 <456panlinlin>
Date: 星期五, 25 三月 2022 16:05:14 +0800
Subject: [PATCH] 优化国标录像下载，添加进度条以及自动合并文件下载，需要结合新版assist服务使用。

---
 src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java |   71 ++++++++++++++++++++++++++++-------
 1 files changed, 57 insertions(+), 14 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 4f240d8..e669ab4 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
@@ -2,16 +2,26 @@
 
 import com.alibaba.fastjson.JSONObject;
 import com.genersoft.iot.vmp.common.StreamInfo;
-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.gb28181.bean.*;
+import com.genersoft.iot.vmp.media.zlm.dto.MediaItem;
 import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
+import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
+import com.genersoft.iot.vmp.service.bean.GPSMsgInfo;
+import com.genersoft.iot.vmp.service.bean.SSRCInfo;
 import com.genersoft.iot.vmp.service.bean.ThirdPartyGB;
 
 import java.util.List;
 import java.util.Map;
 
 public interface IRedisCatchStorage {
+
+    /**
+     * 璁℃暟鍣ㄣ�備负cseq杩涜璁℃暟
+     *
+     * @param method sip 鏂规硶
+     * @return
+     */
+    Long getCSEQ(String method);
 
     /**
      * 寮�濮嬫挱鏀炬椂灏嗘祦瀛樺叆
@@ -37,17 +47,15 @@
 
     StreamInfo queryPlayByStreamId(String steamId);
 
-    StreamInfo queryPlaybackByStreamId(String steamId);
-
     StreamInfo queryPlayByDevice(String deviceId, String channelId);
 
     Map<String, StreamInfo> queryPlayByDeviceId(String deviceId);
 
-    boolean startPlayback(StreamInfo stream);
+    boolean startPlayback(StreamInfo stream, String callId);
 
-    boolean stopPlayback(StreamInfo streamInfo);
+    boolean stopPlayback(String deviceId, String channelId, String stream, String callId);
 
-    StreamInfo queryPlaybackByDevice(String deviceId, String code);
+    StreamInfo queryPlayback(String deviceId, String channelID, String stream, String callId);
 
     void updatePlatformCatchInfo(ParentPlatformCatch parentPlatformCatch);
 
@@ -79,7 +87,7 @@
      * @param channelId
      * @return sendRtpItem
      */
-    SendRtpItem querySendRTPServer(String platformGbId, String channelId);
+    SendRtpItem querySendRTPServer(String platformGbId, String channelId, String streamId, String callId);
 
     List<SendRtpItem> querySendRTPServer(String platformGbId);
 
@@ -88,7 +96,7 @@
      * @param platformGbId
      * @param channelId
      */
-    void deleteSendRTPServer(String platformGbId, String channelId);
+    void deleteSendRTPServer(String platformGbId, String channelId, String callId, String streamId);
 
     /**
      * 鏌ヨ鏌愪釜閫氶亾鏄惁瀛樺湪涓婄骇鐐规挱锛圧TP鎺ㄩ�侊級
@@ -136,7 +144,7 @@
      * @param app
      * @param streamId
      */
-    void addStream(MediaServerItem mediaServerItem, String type, String app, String streamId, StreamInfo streamInfo);
+    void addStream(MediaServerItem mediaServerItem, String type, String app, String streamId, MediaItem item);
 
     /**
      * 绉婚櫎娴佷俊鎭粠redis
@@ -157,9 +165,11 @@
      * 寮�濮嬩笅杞藉綍鍍忔椂瀛樺叆
      * @param streamInfo
      */
-    boolean startDownload(StreamInfo streamInfo);
+    boolean startDownload(StreamInfo streamInfo, String callId);
 
-    StreamInfo queryDownloadByStreamId(String streamId);
+    StreamInfo queryDownload(String deviceId, String channelId, String stream, String callId);
+
+    boolean stopDownload(String deviceId, String channelId, String stream, String callId);
 
     /**
      * 鏌ユ壘绗笁鏂圭郴缁熺暀涓嬬殑鍥芥爣棰勮鍊�
@@ -168,5 +178,38 @@
      */
     ThirdPartyGB queryMemberNoGBId(String queryKey);
 
-    List<StreamInfo> getStreams(String mediaServerId, String pull);
+    List<MediaItem> getStreams(String mediaServerId, String pull);
+
+    /**
+     * 灏哾evice淇℃伅鍐欏叆redis
+     * @param device
+     */
+    void updateDevice(Device device);
+
+    void removeDevice(String deviceId);
+
+    /**
+     * 鑾峰彇Device
+     */
+    Device getDevice(String deviceId);
+
+    void resetAllCSEQ();
+
+    void updateGpsMsgInfo(GPSMsgInfo gpsMsgInfo);
+
+    GPSMsgInfo getGpsMsgInfo(String gbId);
+    List<GPSMsgInfo> getAllGpsMsgInfo();
+
+    Long getSN(String method);
+
+    void resetAllSN();
+
+    MediaItem getStreamInfo(String app, String streamId, String mediaServerId);
+
+    void addCpuInfo(double cpuInfo);
+
+    void addMemInfo(double memInfo);
+
+    void addNetInfo(Map<String, String> networkInterfaces);
+
 }

--
Gitblit v1.8.0