From 141b2282675269e7cd18b78bb3b95e33bb46ccc7 Mon Sep 17 00:00:00 2001
From: gaofw189 <gaofw189@chinatelecom.cn>
Date: 星期二, 17 一月 2023 17:22:38 +0800
Subject: [PATCH] 修复WVP作为下级平台接收DeviceInfo指令固定响应的问题
---
src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java | 46 +++++++++++-----------------------------------
1 files changed, 11 insertions(+), 35 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
index b65cc68..b88794d 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java
@@ -59,7 +59,7 @@
*/
public PageInfo queryChannelsByDeviceId(String deviceId, String query, Boolean hasSubChannel, Boolean online, Boolean catalogUnderDevice, int page, int count);
- public List<DeviceChannel> queryChannelsByDeviceIdWithStartAndLimit(String deviceId, String query, Boolean hasSubChannel, Boolean online, int start, int limit);
+ public List<DeviceChannel> queryChannelsByDeviceIdWithStartAndLimit(String deviceId, String query, Boolean hasSubChannel, Boolean online, int start, int limit,List<String> channelIds);
/**
@@ -68,7 +68,7 @@
* @param deviceId 璁惧ID
* @return
*/
- public List<DeviceChannel> queryChannelsByDeviceId(String deviceId);
+ public List<DeviceChannel> queryChannelsByDeviceId(String deviceId,Boolean online,List<String> channelIds);
public List<DeviceChannel> queryOnlineChannelsByDeviceId(String deviceId);
/**
@@ -91,45 +91,15 @@
* @param count 姣忛〉鏁伴噺
* @return List<Device> 璁惧瀵硅薄鏁扮粍
*/
- public PageInfo<Device> queryVideoDeviceList(int page, int count);
+ public PageInfo<Device> queryVideoDeviceList(int page, int count,Boolean online);
/**
* 鑾峰彇澶氫釜璁惧
*
* @return List<Device> 璁惧瀵硅薄鏁扮粍
*/
- public List<Device> queryVideoDeviceList();
+ public List<Device> queryVideoDeviceList(Boolean online);
- /**
- * 鍒犻櫎璁惧
- *
- * @param deviceId 璁惧ID
- * @return true锛氬垹闄ゆ垚鍔� false锛氬垹闄ゅけ璐�
- */
- public boolean delete(String deviceId);
-
- /**
- * 鏇存柊璁惧鍦ㄧ嚎
- *
- * @param deviceId 璁惧ID
- * @return true锛氭洿鏂版垚鍔� false锛氭洿鏂板け璐�
- */
- public boolean online(String deviceId);
-
- /**
- * 鏇存柊璁惧绂荤嚎
- *
- * @param deviceId 璁惧ID
- * @return true锛氭洿鏂版垚鍔� false锛氭洿鏂板け璐�
- */
- public boolean outline(String deviceId);
-
- /**
- * 鏇存柊鎵�鏈夎澶囩绾�
- *
- * @return true锛氭洿鏂版垚鍔� false锛氭洿鏂板け璐�
- */
- public boolean outlineForAll();
/**
@@ -216,7 +186,13 @@
Device queryVideoDeviceByPlatformIdAndChannelId(String platformId, String channelId);
-
+ /**
+ * 閽堝deviceinfo鎸囦护鐨勬煡璇㈡帴鍙�
+ * @param platformId 骞冲彴id
+ * @param channelId 閫氶亾id
+ * @return 璁惧淇℃伅
+ */
+ Device queryDeviceInfoByPlatformIdAndChannelId(String platformId, String channelId);
/**
* 娣诲姞Mobile Position璁惧绉诲姩浣嶇疆
* @param mobilePosition
--
Gitblit v1.8.0