From 1f07f4ab4ceeb6029d3717cc4cb597d1ad6e7e67 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期五, 16 四月 2021 11:21:50 +0800
Subject: [PATCH] 解决国标平台通道数统计的错误
---
web_src/src/components/dialog/chooseChannel.vue | 2 +-
web_src/src/components/ParentPlatformList.vue | 4 +---
src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java | 9 ++++++++-
3 files changed, 10 insertions(+), 5 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 43be957..149b22a 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
@@ -46,7 +46,14 @@
@Delete("DELETE FROM parent_platform WHERE serverGBId=#{serverGBId}")
int delParentPlatform(ParentPlatform parentPlatform);
- @Select("SELECT *,( SELECT count(0) FROM platform_gb_channel pc WHERE pc.platformId = pp.serverGBId) as channelCount FROM parent_platform pp ")
+ @Select("SELECT *,(" +
+ "select sum(sum1) from ( " +
+ "SELECT count(0) as sum1 FROM platform_gb_channel pc WHERE pc.platformId = pp.serverGBId " +
+ "union all " +
+ "SELECT count(0) as sum1 FROM platform_gb_stream pgs WHERE pgs.platformId = pp.serverGBId " +
+ ") " +
+ ") as channelCount " +
+ "FROM parent_platform pp ")
List<ParentPlatform> getParentPlatformList();
@Select("SELECT * FROM parent_platform WHERE enable=#{enable}")
diff --git a/web_src/src/components/ParentPlatformList.vue b/web_src/src/components/ParentPlatformList.vue
index 47ffe2d..c4e6b0a 100644
--- a/web_src/src/components/ParentPlatformList.vue
+++ b/web_src/src/components/ParentPlatformList.vue
@@ -138,9 +138,7 @@
});
},
chooseChannel: function(platform) {
- this.$refs.chooseChannelDialog.openDialog(platform.serverGBId, ()=>{
- this.initData()
- })
+ this.$refs.chooseChannelDialog.openDialog(platform.serverGBId, this.initData)
},
initData: function() {
this.getPlatformList();
diff --git a/web_src/src/components/dialog/chooseChannel.vue b/web_src/src/components/dialog/chooseChannel.vue
index a6b9b44..87fc62e 100644
--- a/web_src/src/components/dialog/chooseChannel.vue
+++ b/web_src/src/components/dialog/chooseChannel.vue
@@ -62,7 +62,7 @@
this.closeCallback = closeCallback
},
close: function() {
-
+ this.closeCallback()
},
search: function() {
--
Gitblit v1.8.0