From 16e8aa323f7faf7e62035d2d01ac618bba096d81 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 04 三月 2022 11:26:53 +0800
Subject: [PATCH] 修复回放失败出现脏数据的问题以及添加拉流代理判断错误的问题
---
src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 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 f7b16a8..1a93902 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
@@ -3,8 +3,11 @@
import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.gb28181.bean.*;
+import com.genersoft.iot.vmp.media.zlm.dto.MediaItem;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
+import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
import com.genersoft.iot.vmp.service.bean.GPSMsgInfo;
+import com.genersoft.iot.vmp.service.bean.SSRCInfo;
import com.genersoft.iot.vmp.service.bean.ThirdPartyGB;
import java.util.List;
@@ -143,7 +146,7 @@
* @param app
* @param streamId
*/
- void addStream(MediaServerItem mediaServerItem, String type, String app, String streamId, StreamInfo streamInfo);
+ void addStream(MediaServerItem mediaServerItem, String type, String app, String streamId, MediaItem item);
/**
* 绉婚櫎娴佷俊鎭粠redis
@@ -175,7 +178,7 @@
*/
ThirdPartyGB queryMemberNoGBId(String queryKey);
- List<StreamInfo> getStreams(String mediaServerId, String pull);
+ List<MediaItem> getStreams(String mediaServerId, String pull);
/**
* 灏哾evice淇℃伅鍐欏叆redis
@@ -206,4 +209,17 @@
SubscribeInfo getSubscribe(String key);
void delSubscribe(String key);
+
+ MediaItem getStreamInfo(String app, String streamId, String mediaServerId);
+
+ List<SubscribeInfo> getAllSubscribe();
+
+ List<String> getAllSubscribePlatform();
+
+ void addCpuInfo(double cpuInfo);
+
+ void addMemInfo(double memInfo);
+
+ void addNetInfo(Map<String, String> networkInterfaces);
+
}
--
Gitblit v1.8.0