From 9978d30aa1533c50bfaa48e44a1b0de4c157d10b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 11 四月 2024 09:36:48 +0800
Subject: [PATCH] Merge branch '2.7.0'
---
src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java | 94 ++++++++++++----------------------------------
1 files changed, 25 insertions(+), 69 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 42708f7..c483db6
--- 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,18 @@
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.gb28181.bean.AlarmChannelMessage;
+import com.genersoft.iot.vmp.gb28181.bean.Device;
+import com.genersoft.iot.vmp.gb28181.bean.ParentPlatformCatch;
+import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem;
+import com.genersoft.iot.vmp.media.event.media.MediaArrivalEvent;
+import com.genersoft.iot.vmp.media.bean.MediaServer;
+import com.genersoft.iot.vmp.media.zlm.dto.StreamAuthorityInfo;
+import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
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 +26,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);
@@ -74,8 +42,6 @@
PlatformRegisterInfo queryPlatformRegisterInfo(String callId);
void delPlatformRegisterInfo(String callId);
-
- void cleanPlatformRegisterInfos();
void updateSendRTPSever(SendRtpItem sendRtpItem);
@@ -103,12 +69,6 @@
boolean isChannelSendingRTP(String channelId);
/**
- * 娓呯┖鏌愪釜璁惧鐨勬墍鏈夌紦瀛�
- * @param deviceId 璁惧ID
- */
- void clearCatchByDeviceId(String deviceId);
-
- /**
* 鍦╮edis娣诲姞wvp鐨勪俊鎭�
*/
void updateWVPInfo(JSONObject jsonObject, int time);
@@ -131,7 +91,7 @@
* @param app
* @param streamId
*/
- void addStream(MediaServerItem mediaServerItem, String type, String app, String streamId, OnStreamChangedHookParam item);
+ void addStream(MediaServer mediaServerItem, String type, String app, String streamId, OnStreamChangedHookParam item);
/**
* 绉婚櫎娴佷俊鎭粠redis
@@ -147,23 +107,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 +183,7 @@
*/
void sendStreamPushRequestedMsgForStatus();
- List<SendRtpItem> querySendRTPServerByChnnelId(String channelId);
+ List<SendRtpItem> querySendRTPServerByChannelId(String channelId);
List<SendRtpItem> querySendRTPServerByStream(String stream);
@@ -249,8 +192,6 @@
int getPushStreamCount(String id);
int getProxyStreamCount(String id);
-
- int getGbReceiveCount(String id);
int getGbSendCount(String id);
@@ -263,4 +204,19 @@
void removeAllDevice();
void sendDeviceOrChannelStatus(String deviceId, String channelId, boolean online);
+
+ void sendChannelAddOrDelete(String deviceId, String channelId, boolean add);
+
+ void sendPlatformStartPlayMsg(MessageForPushChannel messageForPushChannel);
+
+ void sendPlatformStopPlayMsg(MessageForPushChannel messageForPushChannel);
+
+ void addPushListItem(String app, String stream, MediaArrivalEvent param);
+
+ StreamPushItem getPushListItem(String app, String stream);
+
+ void removePushListItem(String app, String stream, String mediaServerId);
+
+ void sendPushStreamClose(MessageForPushChannel messageForPushChannel);
+
}
--
Gitblit v1.8.0