From f34eb9c9e6b61b596d0085e9a2baec48628b23e1 Mon Sep 17 00:00:00 2001 From: Lawrence <1934378145@qq.com> Date: 星期四, 14 一月 2021 23:53:57 +0800 Subject: [PATCH] 通道查询排序输出,避免列表杂乱无章 --- src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java index 5c871bd..6d3b031 100644 --- a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java @@ -63,6 +63,7 @@ " WHERE 1=1 " + " <if test=\"hasSubChannel == true\" > AND subCount >0</if>" + " <if test=\"hasSubChannel == false\" > AND subCount=0</if>" + + " ORDER BY channelId ASC" + " </script>"}) List<DeviceChannel> queryChannelsByDeviceId(String deviceId, String parentChannelId, String query, Boolean hasSubChannel, Boolean online); @@ -96,6 +97,7 @@ " <if test=\"hasSubChannel!= null and hasSubChannel == false\" > AND subCount=0</if> " + " <if test=\"platformId != null and inPlatform == true \" > AND platformId='${platformId}'</if> " + " <if test=\"platformId != null and inPlatform == false \" > AND (platformId != '${platformId}' OR platformId is NULL ) </if> " + + " ORDER BY deviceId, channelId ASC" + " </script>"}) List<ChannelReduce> queryChannelListInAll(String query, Boolean online, Boolean hasSubChannel, String platformId, Boolean inPlatform); -- Gitblit v1.8.0