From 31e340e8e2eb5d7761a1ae8baa4a0a5e774dba59 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 03 十一月 2021 14:58:48 +0800
Subject: [PATCH] 修改云台控制接口使其更加直观
---
src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java | 47 +++++++++++++++++++++++++----------------------
1 files changed, 25 insertions(+), 22 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 ca4ebae..e4313d9 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
@@ -1,9 +1,7 @@
package com.genersoft.iot.vmp.storager;
import com.alibaba.fastjson.JSONObject;
-import com.genersoft.iot.vmp.common.RealVideo;
import com.genersoft.iot.vmp.common.StreamInfo;
-import com.genersoft.iot.vmp.conf.MediaServerConfig;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatformCatch;
import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem;
@@ -39,20 +37,7 @@
StreamInfo queryPlaybackByStreamId(String steamId);
- StreamInfo queryPlayByDevice(String deviceId, String code);
-
- /**
- * 鏇存柊娴佸獟浣撲俊鎭�
- * @param mediaServerConfig
- * @return
- */
- boolean updateMediaInfo(MediaServerConfig mediaServerConfig);
-
- /**
- * 鑾峰彇娴佸獟浣撲俊鎭�
- * @return
- */
- MediaServerConfig getMediaInfo();
+ StreamInfo queryPlayByDevice(String deviceId, String channelId);
Map<String, StreamInfo> queryPlayByDeviceId(String deviceId);
@@ -94,6 +79,8 @@
*/
SendRtpItem querySendRTPServer(String platformGbId, String channelId);
+ List<SendRtpItem> querySendRTPServer(String platformGbId);
+
/**
* 鍒犻櫎RTP鎺ㄩ�佷俊鎭紦瀛�
* @param platformGbId
@@ -108,14 +95,30 @@
boolean isChannelSendingRTP(String channelId);
/**
- * 鏇存柊濯掍綋娴佸垪琛�
- * @param mediaList
+ * 娓呯┖鏌愪釜璁惧鐨勬墍鏈夌紦瀛�
+ * @param deviceId 璁惧ID
*/
- void updateMediaList(List<RealVideo> mediaList);
+ void clearCatchByDeviceId(String deviceId);
/**
- * 鑾峰彇褰撳墠濯掍綋娴佸垪琛�
- * @return List<RealVideo>
+ * 鑾峰彇mediaServer鑺傜偣
+ * @param mediaServerId
+ * @return
*/
- JSONObject getMediaList(int start, int end);
+// MediaServerItem getMediaInfo(String mediaServerId);
+
+ /**
+ * 璁剧疆鎵�鏈夎澶囩绾�
+ */
+ void outlineForAll();
+
+ /**
+ * 鑾峰彇鎵�鏈夊湪绾跨殑
+ */
+ List<String> getOnlineForAll();
+
+ /**
+ * 鍦╮edis娣诲姞wvp鐨勪俊鎭�
+ */
+ void updateWVPInfo(JSONObject jsonObject);
}
--
Gitblit v1.8.0