From e5b1876012fc76f7ea273fa35e1262b067891bac Mon Sep 17 00:00:00 2001
From: gaofw189 <gaofw189@chinatelecom.cn>
Date: 星期四, 02 二月 2023 18:24:32 +0800
Subject: [PATCH] 修复WVP作为下级平台接收上级平台DeviceControl信令不做处理的问题。-修改日志备注
---
src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java | 58 +++++++++++++---------------------------------------------
1 files changed, 13 insertions(+), 45 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 b2c1e1b..0b0a7d9 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java
@@ -2,7 +2,6 @@
import com.genersoft.iot.vmp.gb28181.bean.*;
import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
-import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
import com.genersoft.iot.vmp.service.bean.GPSMsgInfo;
import com.genersoft.iot.vmp.storager.dao.dto.ChannelSourceInfo;
import com.genersoft.iot.vmp.vmanager.gb28181.platform.bean.ChannelReduce;
@@ -59,7 +58,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 +67,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 +90,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();
/**
@@ -169,15 +138,6 @@
* @param parentPlatform
*/
boolean deleteParentPlatform(ParentPlatform parentPlatform);
-
-
- /**
- * 鍒嗛〉鑾峰彇涓婄骇骞冲彴
- * @param page
- * @param count
- * @return
- */
- PageInfo<ParentPlatform> queryParentPlatformList(int page, int count);
/**
* 鑾峰彇鎵�鏈夊凡鍚敤鐨勫钩鍙�
@@ -225,7 +185,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
@@ -363,6 +329,8 @@
*/
boolean resetChannels(String deviceId, List<DeviceChannel> deviceChannelList);
+ boolean updateChannels(String deviceId, List<DeviceChannel> deviceChannelList);
+
/**
* 鑾峰彇鐩綍淇℃伅
* @param platformId
--
Gitblit v1.8.0