From 28df05e261c0d63050d0bd938b7a6a2c2938b8e9 Mon Sep 17 00:00:00 2001
From: mrjackwang <30337754+mrjackwang@users.noreply.github.com>
Date: 星期六, 06 八月 2022 09:42:28 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0

---
 src/main/java/com/genersoft/iot/vmp/service/IDeviceService.java |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/service/IDeviceService.java b/src/main/java/com/genersoft/iot/vmp/service/IDeviceService.java
index 72af803..5b43496 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/IDeviceService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IDeviceService.java
@@ -1,7 +1,9 @@
 package com.genersoft.iot.vmp.service;
 
 import com.genersoft.iot.vmp.gb28181.bean.Device;
+import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
 import com.genersoft.iot.vmp.gb28181.bean.SyncStatus;
+import com.genersoft.iot.vmp.vmanager.bean.BaseTree;
 
 import java.util.List;
 
@@ -110,4 +112,21 @@
      * @param device 璁惧淇℃伅
      */
     void updateDevice(Device device);
+
+    /**
+     * 鏍戝舰鏌ヨ鎺ュ彛
+     * @param deviceId 璁惧ID
+     * @param parentId 鐖禝D
+     * @param onlyCatalog 鍙幏鍙栫洰褰�
+     * @return
+     */
+    List<BaseTree<DeviceChannel>> queryVideoDeviceTree(String deviceId, String parentId, boolean onlyCatalog);
+
+    /**
+     * 鏌ヨ鏍戣妭鐐逛笅鐨勯�氶亾
+     * @param deviceId 璁惧ID
+     * @param parentId 鐖禝D
+     * @return
+     */
+    List<DeviceChannel> queryVideoDeviceInTreeNode(String deviceId, String parentId);
 }

--
Gitblit v1.8.0