From c25a99d60bef3d3bbd59fee895bd658928fd00db Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期三, 10 一月 2024 16:17:29 +0800 Subject: [PATCH] 修复空指针异常 --- src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 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 b88794d..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,List<String> channelIds); + public List<DeviceChannelExtend> queryChannelsByDeviceIdWithStartAndLimit(String deviceId, List<String> channelIds, String query, Boolean hasSubChannel, Boolean online, int start, int limit); /** @@ -330,6 +330,8 @@ */ boolean resetChannels(String deviceId, List<DeviceChannel> deviceChannelList); + boolean updateChannels(String deviceId, List<DeviceChannel> deviceChannelList); + /** * 鑾峰彇鐩綍淇℃伅 * @param platformId @@ -340,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); @@ -373,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