From f6157cc42c048a15f9962653cc957e4a32849bb2 Mon Sep 17 00:00:00 2001
From: Iwan Lebron <105045937+iwanlebron@users.noreply.github.com>
Date: 星期一, 10 六月 2024 09:18:37 +0800
Subject: [PATCH] 修复参数名称
---
src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java | 78 +++++++++++++++++---------------------
1 files changed, 35 insertions(+), 43 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 b6cfab4..2347f50
--- 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,15 @@
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.hook.OnStreamChangedHookParam;
+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.StreamPushItem;
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,14 +23,6 @@
* @return
*/
Long getCSEQ();
-
- 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);
@@ -47,9 +40,9 @@
void delPlatformRegisterInfo(String callId);
- void cleanPlatformRegisterInfos();
-
void updateSendRTPSever(SendRtpItem sendRtpItem);
+
+ List<SendRtpItem> querySendRTPServer(String platformGbId, String channelId, String streamId);
/**
* 鏌ヨRTP鎺ㄩ�佷俊鎭紦瀛�
@@ -75,12 +68,6 @@
boolean isChannelSendingRTP(String channelId);
/**
- * 娓呯┖鏌愪釜璁惧鐨勬墍鏈夌紦瀛�
- * @param deviceId 璁惧ID
- */
- void clearCatchByDeviceId(String deviceId);
-
- /**
* 鍦╮edis娣诲姞wvp鐨勪俊鎭�
*/
void updateWVPInfo(JSONObject jsonObject, int time);
@@ -103,7 +90,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, MediaInfo item);
/**
* 绉婚櫎娴佷俊鎭粠redis
@@ -120,24 +107,7 @@
*/
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);
+ List<MediaInfo> getStreams(String mediaServerId, String pull);
/**
* 灏哾evice淇℃伅鍐欏叆redis
@@ -163,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);
@@ -212,7 +182,7 @@
*/
void sendStreamPushRequestedMsgForStatus();
- List<SendRtpItem> querySendRTPServerByChnnelId(String channelId);
+ List<SendRtpItem> querySendRTPServerByChannelId(String channelId);
List<SendRtpItem> querySendRTPServerByStream(String stream);
@@ -222,11 +192,11 @@
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();
@@ -235,4 +205,26 @@
void removeAllDevice();
void sendDeviceOrChannelStatus(String deviceId, String channelId, boolean online);
+
+ void sendChannelAddOrDelete(String deviceId, String channelId, boolean add);
+
+ void sendPlatformStartPlayMsg(SendRtpItem sendRtpItem, ParentPlatform platform);
+
+ void sendPlatformStopPlayMsg(SendRtpItem sendRtpItem, ParentPlatform platform);
+
+ 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);
+
+ void addWaiteSendRtpItem(SendRtpItem sendRtpItem, int platformPlayTimeout);
+
+ SendRtpItem getWaiteSendRtpItem(String app, String stream);
+
+ void sendStartSendRtp(SendRtpItem sendRtpItem);
+
+ void sendPushStreamOnline(SendRtpItem sendRtpItem);
}
--
Gitblit v1.8.0