From 16b7e4a7ef473a6af29ec78aeb2f471fa398efdd Mon Sep 17 00:00:00 2001
From: leesam <leesam@leesam.cn>
Date: 星期三, 10 四月 2024 20:49:44 +0800
Subject: [PATCH] Merge branch 'refs/heads/master' into develop-add-api-key

---
 src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java b/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java
old mode 100644
new mode 100755
index 5965678..b0ff011
--- a/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java
@@ -342,9 +342,9 @@
 
 	int addCatalog(PlatformCatalog platformCatalog);
 
-	PlatformCatalog getCatalog(String id);
+	PlatformCatalog getCatalog(String platformId, String id);
 
-	int delCatalog(String id);
+	int delCatalog(String platformId, String id);
 
 	int updateCatalog(PlatformCatalog platformCatalog);
 
@@ -378,4 +378,7 @@
 
 	List<DeviceChannelExtend> queryChannelsByDeviceId(String serial, List<String> channelIds, Boolean online);
 
+	List<ParentPlatform> queryEnablePlatformListWithAsMessageChannel();
+
+	List<Device> queryDeviceWithAsMessageChannel();
 }

--
Gitblit v1.8.0