From f8ef14bfea43abd8716aab15f5e302e7c1f23f79 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期二, 11 六月 2024 10:08:13 +0800 Subject: [PATCH] 修复移动位置位置订阅上报间隔为0的bug --- src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java index 3826350..f5ce3f0 100755 --- a/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java @@ -58,7 +58,10 @@ @Select("SELECT dc.* from wvp_platform_gb_channel pgc left join wvp_device_channel dc on dc.id = pgc.device_channel_id WHERE dc.channel_id=#{channelId} and pgc.platform_id=#{platformId}") List<DeviceChannel> queryChannelInParentPlatform(@Param("platformId") String platformId, @Param("channelId") String channelId); - @Select("SELECT dc.* from wvp_platform_gb_channel pgc left join wvp_device_channel dc on dc.id = pgc.device_channel_id WHERE pgc.platform_id=#{platformId} and pgc.catalog_id=#{catalogId}") + @Select("<script> "+ + "SELECT dc.* from wvp_platform_gb_channel pgc left join wvp_device_channel dc on dc.id = pgc.device_channel_id WHERE pgc.platform_id=#{platformId} " + + " <if test='catalogId != null' > and pgc.catalog_id=#{catalogId}</if>" + + "</script>") List<DeviceChannel> queryAllChannelInCatalog(@Param("platformId") String platformId, @Param("catalogId") String catalogId); @Select(" select dc.channel_id as id, dc.name as name, pgc.platform_id as platform_id, pgc.catalog_id as parent_id, 0 as children_count, 1 as type " + @@ -105,7 +108,8 @@ void delByPlatformId(String serverGBId); @Delete("<script> " + - "DELETE from wvp_platform_gb_channel WHERE platform_id=#{platformId} and catalog_id=#{catalogId}" + + "DELETE from wvp_platform_gb_channel WHERE platform_id=#{platformId} " + + " <if test=\"catalogId != null\" > and catalog_id=#{catalogId}</if>" + "</script>") int delChannelForGBByCatalogId(@Param("platformId") String platformId, @Param("catalogId") String catalogId); @@ -116,6 +120,6 @@ "where dc.channel_id = #{channelId} and pgc.platform_id=#{platformId}") List<Device> queryDeviceInfoByPlatformIdAndChannelId(@Param("platformId") String platformId, @Param("channelId") String channelId); - @Select("SELECT pgc.platform_id from wvp_platform_gb_channel pgc left join wvp_device_channel dc on dc.id = pgc.device_channel_id WHERE dc.channel_id='${channelId}'") - List<String> queryParentPlatformByChannelId(String channelId); + @Select("SELECT pgc.platform_id from wvp_platform_gb_channel pgc left join wvp_device_channel dc on dc.id = pgc.device_channel_id WHERE dc.channel_id=#{channelId}") + List<String> queryParentPlatformByChannelId(@Param("channelId") String channelId); } -- Gitblit v1.8.0