From 269ad8cedbb07ca207a6f33af23085894dab4aa6 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期日, 23 四月 2023 14:36:13 +0800 Subject: [PATCH] 修身目录刷新,优化公网下远程IP端口的获取 --- src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java | 19 ++++++++++++++++--- 1 files changed, 16 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 ee78a31..b53c2d3 100644 --- a/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java @@ -5,6 +5,7 @@ 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; @@ -56,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,List<String> channelIds); + public List<DeviceChannelExtend> queryChannelsByDeviceIdWithStartAndLimit(String deviceId, List<String> channelIds, String query, Boolean hasSubChannel, Boolean online, int start, int limit); /** @@ -185,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 @@ -368,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