From 1f07f4ab4ceeb6029d3717cc4cb597d1ad6e7e67 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期五, 16 四月 2021 11:21:50 +0800
Subject: [PATCH] 解决国标平台通道数统计的错误

---
 src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 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 3049e5b..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
@@ -25,6 +25,7 @@
             "SET enable=#{enable}, " +
             "name=#{name}," +
             "deviceGBId=#{deviceGBId}," +
+            "serverGBId=#{serverGBId}, " +
             "serverGBDomain=#{serverGBDomain}, " +
             "serverIP=#{serverIP}," +
             "serverPort=#{serverPort}, " +
@@ -39,20 +40,30 @@
             "ptz=#{ptz}, " +
             "rtcp=#{rtcp}, " +
             "status=#{status} " +
-            "WHERE serverGBId=#{serverGBId}")
+            "WHERE id=#{id}")
     int updateParentPlatform(ParentPlatform parentPlatform);
 
     @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}")
     List<ParentPlatform> getEnableParentPlatformList(boolean enable);
 
     @Select("SELECT * FROM parent_platform WHERE serverGBId=#{platformGbId}")
-    ParentPlatform getParentPlatById(String platformGbId);
+    ParentPlatform getParentPlatByServerGBId(String platformGbId);
+
+    @Select("SELECT * FROM parent_platform WHERE id=#{id}")
+    ParentPlatform getParentPlatById(int id);
 
     @Update("UPDATE parent_platform SET status=false" )
     void outlineForAllParentPlatform();

--
Gitblit v1.8.0