From 4bd4f50b4165953018a9f9174056d29d087fdaee Mon Sep 17 00:00:00 2001
From: szy833 <31844882+szy833@users.noreply.github.com>
Date: 星期日, 16 一月 2022 23:32:51 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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..a89fc56 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);
/**
* 鑾峰彇骞冲彴鍏宠仈鐨勭洿鎾祦
@@ -459,4 +460,10 @@
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);
}
--
Gitblit v1.8.0