From 8bd2f47c9a92ffcf5ae43fae965eaefd4748e263 Mon Sep 17 00:00:00 2001 From: lishuyuan <lishuyuan@inspur.com> Date: 星期四, 02 十一月 2023 10:17:47 +0800 Subject: [PATCH] bugfix：目录订阅收到更新事件时，sql字段update_time为空导致的报错 --- src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 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 0b0a7d9..b0ff011 --- 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); /** @@ -341,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); @@ -374,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