From d70bfb53dd5d92d0405f7ce3d2c9bbabce26184b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 20 五月 2024 11:37:07 +0800
Subject: [PATCH] 修复兼容zlm-pro转码时无人管看自动移除失败的BUG
---
src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java | 98 +++++++++++++++---------------------------------
1 files changed, 31 insertions(+), 67 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
old mode 100644
new mode 100755
index 1e10469..6ee859a
--- a/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
@@ -1,14 +1,13 @@
package com.genersoft.iot.vmp.storager;
import com.alibaba.fastjson2.JSONObject;
-import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.common.SystemAllInfo;
import com.genersoft.iot.vmp.gb28181.bean.*;
-import com.genersoft.iot.vmp.media.zlm.dto.*;
+import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
+import com.genersoft.iot.vmp.media.zlm.dto.StreamAuthorityInfo;
import com.genersoft.iot.vmp.media.zlm.dto.hook.OnStreamChangedHookParam;
import com.genersoft.iot.vmp.service.bean.GPSMsgInfo;
import com.genersoft.iot.vmp.service.bean.MessageForPushChannel;
-import com.genersoft.iot.vmp.service.bean.ThirdPartyGB;
import com.genersoft.iot.vmp.storager.dao.dto.PlatformRegisterInfo;
import java.util.List;
@@ -22,42 +21,6 @@
* @return
*/
Long getCSEQ();
-
- /**
- * 寮�濮嬫挱鏀炬椂灏嗘祦瀛樺叆
- *
- * @param stream 娴佷俊鎭�
- * @return
- */
- boolean startPlay(StreamInfo stream);
-
-
- /**
- * 鍋滄鎾斁鏃跺垹闄�
- *
- * @return
- */
- boolean stopPlay(StreamInfo streamInfo);
-
- /**
- * 鏌ヨ鎾斁鍒楄〃
- * @return
- */
- StreamInfo queryPlay(StreamInfo streamInfo);
-
- StreamInfo queryPlayByStreamId(String steamId);
-
- StreamInfo queryPlayByDevice(String deviceId, String channelId);
-
- Map<String, StreamInfo> queryPlayByDeviceId(String deviceId);
-
- boolean startPlayback(StreamInfo stream, String callId);
-
- boolean stopPlayback(String deviceId, String channelId, String stream, String callId);
-
- StreamInfo queryPlayback(String deviceId, String channelID, String stream, String callId);
-
- String queryPlaybackForKey(String deviceId, String channelId, String stream, String callId);
void updatePlatformCatchInfo(ParentPlatformCatch parentPlatformCatch);
@@ -75,9 +38,9 @@
void delPlatformRegisterInfo(String callId);
- void cleanPlatformRegisterInfos();
-
void updateSendRTPSever(SendRtpItem sendRtpItem);
+
+ List<SendRtpItem> querySendRTPServer(String platformGbId, String channelId, String streamId);
/**
* 鏌ヨRTP鎺ㄩ�佷俊鎭紦瀛�
@@ -101,12 +64,6 @@
* @param channelId
*/
boolean isChannelSendingRTP(String channelId);
-
- /**
- * 娓呯┖鏌愪釜璁惧鐨勬墍鏈夌紦瀛�
- * @param deviceId 璁惧ID
- */
- void clearCatchByDeviceId(String deviceId);
/**
* 鍦╮edis娣诲姞wvp鐨勪俊鎭�
@@ -147,23 +104,6 @@
* @param mediaServerId
*/
void removeStream(String mediaServerId, String type);
-
- /**
- * 寮�濮嬩笅杞藉綍鍍忔椂瀛樺叆
- * @param streamInfo
- */
- boolean startDownload(StreamInfo streamInfo, String callId);
-
- StreamInfo queryDownload(String deviceId, String channelId, String stream, String callId);
-
- boolean stopDownload(String deviceId, String channelId, String stream, String callId);
-
- /**
- * 鏌ユ壘绗笁鏂圭郴缁熺暀涓嬬殑鍥芥爣棰勮鍊�
- * @param queryKey
- * @return
- */
- ThirdPartyGB queryMemberNoGBId(String queryKey);
List<OnStreamChangedHookParam> getStreams(String mediaServerId, String pull);
@@ -240,7 +180,7 @@
*/
void sendStreamPushRequestedMsgForStatus();
- List<SendRtpItem> querySendRTPServerByChnnelId(String channelId);
+ List<SendRtpItem> querySendRTPServerByChannelId(String channelId);
List<SendRtpItem> querySendRTPServerByStream(String stream);
@@ -250,15 +190,39 @@
int getProxyStreamCount(String id);
- int getGbReceiveCount(String id);
-
int getGbSendCount(String id);
void addDiskInfo(List<Map<String, Object>> diskInfo);
+
+ void deleteSendRTPServer(SendRtpItem sendRtpItem);
List<SendRtpItem> queryAllSendRTPServer();
List<Device> getAllDevices();
void removeAllDevice();
+
+ void sendDeviceOrChannelStatus(String deviceId, String channelId, boolean online);
+
+ void sendChannelAddOrDelete(String deviceId, String channelId, boolean add);
+
+ void sendPlatformStartPlayMsg(MessageForPushChannel messageForPushChannel);
+
+ void sendPlatformStopPlayMsg(SendRtpItem sendRtpItem, ParentPlatform platform);
+
+ void addPushListItem(String app, String stream, OnStreamChangedHookParam param);
+
+ OnStreamChangedHookParam getPushListItem(String app, String stream);
+
+ void removePushListItem(String app, String stream, String mediaServerId);
+
+ void sendPushStreamClose(MessageForPushChannel messageForPushChannel);
+
+ void addWaiteSendRtpItem(SendRtpItem sendRtpItem, int platformPlayTimeout);
+
+ SendRtpItem getWaiteSendRtpItem(String app, String stream);
+
+ void sendStartSendRtp(SendRtpItem sendRtpItem);
+
+ void sendPushStreamOnline(SendRtpItem sendRtpItem);
}
--
Gitblit v1.8.0