From 764d04b497356ba6bcbb75fd42b51eca750f7223 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 29 五月 2024 15:02:51 +0800
Subject: [PATCH] 调整上级观看消息的发送
---
src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 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 3f6a526..2347f50 100755
--- a/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
@@ -2,14 +2,12 @@
import com.alibaba.fastjson2.JSONObject;
import com.genersoft.iot.vmp.common.SystemAllInfo;
-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.gb28181.bean.*;
+import com.genersoft.iot.vmp.media.bean.MediaInfo;
import com.genersoft.iot.vmp.media.bean.MediaServer;
+import com.genersoft.iot.vmp.media.event.media.MediaArrivalEvent;
import com.genersoft.iot.vmp.media.zlm.dto.StreamAuthorityInfo;
-import com.genersoft.iot.vmp.media.zlm.dto.hook.OnStreamChangedHookParam;
+import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
import com.genersoft.iot.vmp.service.bean.GPSMsgInfo;
import com.genersoft.iot.vmp.service.bean.MessageForPushChannel;
import com.genersoft.iot.vmp.storager.dao.dto.PlatformRegisterInfo;
@@ -43,6 +41,8 @@
void delPlatformRegisterInfo(String callId);
void updateSendRTPSever(SendRtpItem sendRtpItem);
+
+ List<SendRtpItem> querySendRTPServer(String platformGbId, String channelId, String streamId);
/**
* 鏌ヨRTP鎺ㄩ�佷俊鎭紦瀛�
@@ -90,7 +90,7 @@
* @param app
* @param streamId
*/
- void addStream(MediaServer mediaServerItem, String type, String app, String streamId, OnStreamChangedHookParam item);
+ void addStream(MediaServer mediaServerItem, String type, String app, String streamId, MediaInfo item);
/**
* 绉婚櫎娴佷俊鎭粠redis
@@ -107,7 +107,7 @@
*/
void removeStream(String mediaServerId, String type);
- List<OnStreamChangedHookParam> getStreams(String mediaServerId, String pull);
+ List<MediaInfo> getStreams(String mediaServerId, String pull);
/**
* 灏哾evice淇℃伅鍐欏叆redis
@@ -133,7 +133,7 @@
void resetAllSN();
- OnStreamChangedHookParam getStreamInfo(String app, String streamId, String mediaServerId);
+ MediaInfo getStreamInfo(String app, String streamId, String mediaServerId);
void addCpuInfo(double cpuInfo);
@@ -196,6 +196,8 @@
void addDiskInfo(List<Map<String, Object>> diskInfo);
+ void deleteSendRTPServer(SendRtpItem sendRtpItem);
+
List<SendRtpItem> queryAllSendRTPServer();
List<Device> getAllDevices();
@@ -206,16 +208,23 @@
void sendChannelAddOrDelete(String deviceId, String channelId, boolean add);
- void sendPlatformStartPlayMsg(MessageForPushChannel messageForPushChannel);
+ void sendPlatformStartPlayMsg(SendRtpItem sendRtpItem, ParentPlatform platform);
- void sendPlatformStopPlayMsg(MessageForPushChannel messageForPushChannel);
+ void sendPlatformStopPlayMsg(SendRtpItem sendRtpItem, ParentPlatform platform);
void addPushListItem(String app, String stream, MediaArrivalEvent param);
- OnStreamChangedHookParam getPushListItem(String app, String stream);
+ StreamPushItem 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