Merge branch '2.6.8' into wvp-28181-2.0

648540858

2023-06-19 6b3732b8c43165342b7521b1e3ea788e471d58e8

 src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java

@@ -450,4 +450,14 @@

    @Select("select count(1) from wvp_device_channel")
    int getAllChannelCount();

    @Select(value = {" <script>" +
            "select * " +
            "from device_channel " +
            "where device_id=#{deviceId}" +
            " <if test='parentId != null '> and parent_id = #{parentId} </if>" +
            " <if test='parentId == null '> and parent_id is null </if>" +
            " <if test='onlyCatalog == true '> and parental = 1 </if>" +
            " </script>"})
    List<DeviceChannel> getSubChannelsByDeviceId(String deviceId, String parentId, boolean onlyCatalog);
}