From 59f0210d04f302cb13a3dd7ec849ae541aa3a81d Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 11 二月 2022 09:47:26 +0800
Subject: [PATCH] Merge pull request #324 from SaltFish001/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java b/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java
index 229ab8c..5e2745a 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java
@@ -100,6 +100,7 @@
* @return
*/
public List<DeviceChannel> queryChannelsByDeviceId(String deviceId);
+ public List<DeviceChannel> queryOnlineChannelsByDeviceId(String deviceId);
/**
* 鑾峰彇鏌愪釜璁惧鐨勯�氶亾
@@ -341,7 +342,7 @@
* @param channelId
* @return
*/
- List<GbStream> queryStreamInParentPlatform(String platformId, String channelId);
+ GbStream queryStreamInParentPlatform(String platformId, String channelId);
/**
* 鑾峰彇骞冲彴鍏宠仈鐨勭洿鎾祦
@@ -397,10 +398,11 @@
/**
* 鏍规嵁濯掍綋ID鑾峰彇鍚敤/涓嶅惎鐢ㄧ殑浠ｇ悊鍒楄〃
* @param id 濯掍綋ID
- * @param b 鍚敤/涓嶅惎鐢�
+ * @param enable 鍚敤/涓嶅惎鐢�
+ * @param status 鐘舵��
* @return
*/
- List<StreamProxyItem> getStreamProxyListForEnableInMediaServer(String id, boolean b);
+ List<StreamProxyItem> getStreamProxyListForEnableInMediaServer(String id, boolean enable, boolean status);
/**
* 鏍规嵁閫氶亾ID鑾峰彇鍏舵墍鍦ㄨ澶�
@@ -459,4 +461,16 @@
int delRelation(PlatformCatalog platformCatalog);
int updateStreamGPS(List<GPSMsgInfo> gpsMsgInfo);
+
+ List<ParentPlatform> queryPlatFormListForGBWithGBId(String channelId, List<String> platforms);
+
+ List<ParentPlatform> queryPlatFormListForStreamWithGBId(String app, String stream, List<String> platforms);
+
+ GbStream getGbStream(String app, String streamId);
+
+ void delCatalogByPlatformId(String serverGBId);
+
+ void delRelationByPlatformId(String serverGBId);
+
+ PlatformCatalog queryDefaultCatalogInPlatform(String platformId);
}
--
Gitblit v1.8.0