From d474bf929e3787b6ac88cfb5b2ee242844a0339b Mon Sep 17 00:00:00 2001
From: dengming <dengming@ctfo.com>
Date: 星期四, 10 三月 2022 15:24:50 +0800
Subject: [PATCH] 删除多余依赖包com.google.guava:30.0-jre，项目引用了版本31
---
src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java
index d10dde5..f74b6d4 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java
@@ -88,7 +88,7 @@
"</script>"})
int setDefaultCatalog(String platformId, String catalogId);
- @Select("select 'channel' as name, count(pgc.platformId) count from platform_gb_channel pgc where pgc.platformId=#{platformId} and pgc.channelId =#{gbId} " +
+ @Select("select 'channel' as name, count(pgc.platformId) count from platform_gb_channel pgc left join device_channel dc on dc.id = pgc.deviceChannelId where pgc.platformId=#{platformId} and dc.channelId =#{gbId} " +
"union " +
"select 'stream' as name, count(pgs.platformId) count from platform_gb_stream pgs left join gb_stream gs on pgs.gbStreamId = gs.gbStreamId where pgs.platformId=#{platformId} and gs.gbId = #{gbId}")
List<ChannelSourceInfo> getChannelSource(String platformId, String gbId);
--
Gitblit v1.8.0