From b86f0aaae2f0212bc01ddfd3e5d646c22eb1d8c0 Mon Sep 17 00:00:00 2001
From: panll <m18010473990@163.com>
Date: 星期五, 08 三月 2024 09:33:38 +0800
Subject: [PATCH] !28 语音对讲合并 语音对讲合并
---
src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 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 ab43746..b0ff011
--- a/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java
@@ -2,10 +2,10 @@
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;
+import com.genersoft.iot.vmp.web.gb28181.dto.DeviceChannelExtend;
import com.github.pagehelper.PageInfo;
import java.util.List;
@@ -57,9 +57,9 @@
* @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);
+ public List<DeviceChannelExtend> queryChannelsByDeviceIdWithStartAndLimit(String deviceId, List<String> channelIds, String query, Boolean hasSubChannel, Boolean online, int start, int limit);
/**
@@ -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,14 +91,14 @@
* @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);
@@ -186,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
@@ -324,6 +330,8 @@
*/
boolean resetChannels(String deviceId, List<DeviceChannel> deviceChannelList);
+ boolean updateChannels(String deviceId, List<DeviceChannel> deviceChannelList);
+
/**
* 鑾峰彇鐩綍淇℃伅
* @param platformId
@@ -334,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);
@@ -367,4 +375,10 @@
void cleanContentForPlatform(String serverGBId);
List<DeviceChannel> queryChannelWithCatalog(String serverGBId);
+
+ List<DeviceChannelExtend> queryChannelsByDeviceId(String serial, List<String> channelIds, Boolean online);
+
+ List<ParentPlatform> queryEnablePlatformListWithAsMessageChannel();
+
+ List<Device> queryDeviceWithAsMessageChannel();
}
--
Gitblit v1.8.0