From 59c79c08e100ada25616697b8bc85d266a680813 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 16 二月 2022 15:13:16 +0800
Subject: [PATCH] 修复级联通道回复错误
---
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java | 45 ++++++++++++++++++++++++---------------------
1 files changed, 24 insertions(+), 21 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 f882766..32dd7df 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
@@ -93,28 +93,31 @@
void startPlay(String deviceId, String channelId, String streamId);
- @Select(value = {" <script>" +
- "SELECT * FROM ( "+
- " SELECT dc.channelId, dc.deviceId, dc.name, de.manufacturer, de.hostAddress, " +
- "(SELECT count(0) FROM device_channel WHERE parentId=dc.channelId) as subCount, " +
- "(SELECT pc.platformId FROM platform_gb_channel pc WHERE pc.deviceId=dc.deviceId AND pc.channelId = dc.channelId AND pc.platformId = #{platformId}) as platformId, " +
- "(SELECT pc.catalogId FROM platform_gb_channel pc WHERE pc.deviceId=dc.deviceId AND pc.channelId = dc.channelId AND pc.platformId = #{platformId} ) as catalogId " +
- "FROM device_channel dc " +
- "LEFT JOIN device de ON dc.deviceId = de.deviceId " +
- " WHERE 1=1 " +
- " <if test='query != null'> AND (dc.channelId LIKE '%${query}%' OR dc.name LIKE '%${query}%' OR dc.name LIKE '%${query}%')</if> " +
- " <if test='online == true' > AND dc.status=1</if> " +
- " <if test='online == false' > AND dc.status=0</if> " +
- ") dcr" +
- " WHERE 1=1 " +
- " <if test='hasSubChannel!= null and hasSubChannel == true' > AND subCount >0</if> " +
- " <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);
+ @Select(value = {" <script>" +
+ "SELECT dc.channelId, "+
+ "dc.deviceId, " +
+ "dc.name, " +
+ "de.manufacturer, " +
+ "de.hostAddress, " +
+ "(SELECT count(0) FROM device_channel WHERE parentId = dc.channelId) as subCount, " +
+ "pgc.platformId as platformId, " +
+ "pgc.catalogId as catalogId " +
+ "FROM device_channel dc " +
+ "LEFT JOIN device de ON dc.deviceId = de.deviceId " +
+ "LEFT JOIN platform_gb_channel pgc on de.deviceId = pgc.deviceId and pgc.channelId = dc.channelId " +
+ "LEFT JOIN device_channel dc2 ON dc2.deviceId = de.deviceId AND dc2.parentId = dc.channelId " +
+ " WHERE 1=1 " +
+ " <if test='query != null'> AND (dc.channelId LIKE '%${query}%' OR dc.name LIKE '%${query}%' OR dc.name LIKE '%${query}%')</if> " +
+ " <if test='online == true' > AND dc.status=1</if> " +
+ " <if test='online == false' > AND dc.status=0</if> " +
+ " <if test='hasSubChannel!= null and hasSubChannel == true' > AND dc2.channelId is not null</if> " +
+ " <if test='hasSubChannel!= null and hasSubChannel == false' > AND dc2.channelId is null</if> " +
+ " <if test='catalogId == null ' > AND pgc.platformId is null AND pgc.catalogId is null</if> " +
+ " <if test='catalogId != null ' > AND pgc.platformId =#{platformId} AND pgc.catalogId = #{catalogId}</if> " +
+ " ORDER BY dc.deviceId, dc.channelId ASC" +
+ " </script>"})
+ List<ChannelReduce> queryChannelListInAll(String query, Boolean online, Boolean hasSubChannel, String platformId, String catalogId);
@Select("SELECT * FROM device_channel WHERE channelId=#{channelId}")
List<DeviceChannel> queryChannelByChannelId( String channelId);
--
Gitblit v1.8.0