From 7a41f66e8bde008d373c079ac22f811ba14b6297 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 01 十一月 2022 20:43:58 +0800
Subject: [PATCH] Merge pull request #655 from L120820/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 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 b3bb89c..e2f8fca 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
@@ -2,12 +2,14 @@
import com.alibaba.fastjson.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.service.bean.GPSMsgInfo;
import com.genersoft.iot.vmp.service.bean.MessageForPushChannel;
import com.genersoft.iot.vmp.service.bean.SSRCInfo;
import com.genersoft.iot.vmp.service.bean.ThirdPartyGB;
+import com.genersoft.iot.vmp.storager.dao.dto.PlatformRegisterInfo;
import java.util.List;
import java.util.Map;
@@ -55,23 +57,21 @@
StreamInfo queryPlayback(String deviceId, String channelID, String stream, String callId);
+ String queryPlaybackForKey(String deviceId, String channelId, String stream, String callId);
+
void updatePlatformCatchInfo(ParentPlatformCatch parentPlatformCatch);
ParentPlatformCatch queryPlatformCatchInfo(String platformGbId);
void delPlatformCatchInfo(String platformGbId);
- void updatePlatformKeepalive(ParentPlatform parentPlatform);
-
void delPlatformKeepalive(String platformGbId);
-
- void updatePlatformRegister(ParentPlatform parentPlatform);
void delPlatformRegister(String platformGbId);
- void updatePlatformRegisterInfo(String callId, String platformGbId);
+ void updatePlatformRegisterInfo(String callId, PlatformRegisterInfo platformRegisterInfo);
- String queryPlatformRegisterInfo(String callId);
+ PlatformRegisterInfo queryPlatformRegisterInfo(String callId);
void delPlatformRegisterInfo(String callId);
@@ -197,7 +197,7 @@
void addMemInfo(double memInfo);
- void addNetInfo(Map<String, String> networkInterfaces);
+ void addNetInfo(Map<String, Double> networkInterfaces);
void sendMobilePositionMsg(JSONObject jsonObject);
@@ -239,4 +239,21 @@
void sendStreamPushRequestedMsgForStatus();
List<SendRtpItem> querySendRTPServerByChnnelId(String channelId);
+
+ List<SendRtpItem> querySendRTPServerByStream(String stream);
+
+ SystemAllInfo getSystemInfo();
+
+ int getPushStreamCount(String id);
+
+ int getProxyStreamCount(String id);
+
+ int getGbReceiveCount(String id);
+
+ int getGbSendCount(String id);
+
+ void addDiskInfo(List<Map<String, Object>> diskInfo);
+
+ List<SendRtpItem> queryAllSendRTPServer();
+
}
--
Gitblit v1.8.0