From 039fbf7e243d4bf0f46b44e7dae2a5d36e978056 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 20 三月 2023 14:32:53 +0800
Subject: [PATCH] Merge branch 'talk' into main-dev
---
src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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 b4644bf..938f669 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;
@@ -57,7 +56,7 @@
* @param count 姣忛〉鏁伴噺
* @return
*/
- public PageInfo queryChannelsByDeviceId(String deviceId, String query, Boolean hasSubChannel, Boolean online, Boolean catalogUnderDevice, int page, int count);
+ public PageInfo<DeviceChannel> 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,List<String> channelIds);
@@ -186,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
@@ -324,6 +329,8 @@
*/
boolean resetChannels(String deviceId, List<DeviceChannel> deviceChannelList);
+ boolean updateChannels(String deviceId, List<DeviceChannel> deviceChannelList);
+
/**
* 鑾峰彇鐩綍淇℃伅
* @param platformId
--
Gitblit v1.8.0