From ccc0a99d6894844d83d751b924cfebe74da7826c Mon Sep 17 00:00:00 2001
From: ‘sxh’ <1632740646@qq.com>
Date: 星期四, 15 六月 2023 11:20:43 +0800
Subject: [PATCH] 同步主线的代码，保持一致性
---
src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java | 46 +++++++---------------------------------------
1 files changed, 7 insertions(+), 39 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 b6cfab4..469f6c8 100644
--- 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,16 @@
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.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,14 +24,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);
@@ -46,8 +40,6 @@
PlatformRegisterInfo queryPlatformRegisterInfo(String callId);
void delPlatformRegisterInfo(String callId);
-
- void cleanPlatformRegisterInfos();
void updateSendRTPSever(SendRtpItem sendRtpItem);
@@ -73,12 +65,6 @@
* @param channelId
*/
boolean isChannelSendingRTP(String channelId);
-
- /**
- * 娓呯┖鏌愪釜璁惧鐨勬墍鏈夌紦瀛�
- * @param deviceId 璁惧ID
- */
- void clearCatchByDeviceId(String deviceId);
/**
* 鍦╮edis娣诲姞wvp鐨勪俊鎭�
@@ -119,23 +105,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);
@@ -222,8 +191,6 @@
int getProxyStreamCount(String id);
- int getGbReceiveCount(String id);
-
int getGbSendCount(String id);
void addDiskInfo(List<Map<String, Object>> diskInfo);
@@ -235,4 +202,5 @@
void removeAllDevice();
void sendDeviceOrChannelStatus(String deviceId, String channelId, boolean online);
+ void sendChannelAddOrDelete(String deviceId, String channelId, boolean add);
}
--
Gitblit v1.8.0