From 272d8cdf04d2405043cb5ced1695c3993df4e049 Mon Sep 17 00:00:00 2001
From: "3067418132@qq.com" <ljf25604@163.com>
Date: Thu, 30 Apr 2026 11:49:12 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=94=A8=E9=87=8F=E5=88=86=E6=9E=90?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3(=E5=A4=9A=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=97=B6=E5=80=99)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../energy/FgdScrEnergyQueryMapper.java       | 36 ++++++++++++-------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/mh-system/src/main/java/com/mh/system/mapper/energy/FgdScrEnergyQueryMapper.java b/mh-system/src/main/java/com/mh/system/mapper/energy/FgdScrEnergyQueryMapper.java
index f88c6c8..5cf1c77 100644
--- a/mh-system/src/main/java/com/mh/system/mapper/energy/FgdScrEnergyQueryMapper.java
+++ b/mh-system/src/main/java/com/mh/system/mapper/energy/FgdScrEnergyQueryMapper.java
@@ -96,9 +96,10 @@ public interface FgdScrEnergyQueryMapper {
     @Select("<script>" +
             "select  " +
             "  sum(dm.calc_value) as curValue,  " +
-            "  CASE dm.device_type  " +
-            "       WHEN '5' THEN 'meter'  " +
-            "       WHEN '2' THEN 'cloud'  " +
+            "  CASE dm.device_num  " +
+            "       WHEN 'VD16' THEN 'so1'  " +
+            "       WHEN 'VD36' THEN 'so2'  " +
+            "       WHEN 'VD56' THEN 'loadCell'  " +
             "       ELSE 'Unknown'  " +
             "  END as deviceType," +
             "  TO_CHAR(dm.cur_time, " +
@@ -124,7 +125,12 @@ public interface FgdScrEnergyQueryMapper {
             "  join device_ledger dl   " +
             "on  " +
             "    cpm.device_ledger_id = dl.id  " +
-            "    and dl.device_type in ('5', '6') " +
+            "<if test='haveSO2 == true'> " +
+            "    and dl.device_type in ('31', '32')  " +
+            "</if>" +
+            "<if test='haveSO2 == false'> " +
+            "    and dl.device_type = '32'  " +
+            "</if>" +
             "<if test='systemType != null and systemType != \"\"'> " +
             "    and cpm.system_type = #{systemType} " +
             "</if>" +
@@ -133,7 +139,7 @@ public interface FgdScrEnergyQueryMapper {
             "</if>" +
             ")  " +
             "group by  " +
-            "  device_type,  " +
+            "  device_num,  " +
             "  TO_CHAR(dm.cur_time, " +
             "    <choose>" +
             "      <when test='len == 4'>'YYYY'</when>" +
@@ -147,9 +153,10 @@ public interface FgdScrEnergyQueryMapper {
             "union all " +
             "select  " +
             "  sum(dm.calc_value) as curValue,  " +
-            "  CASE dm.device_type  " +
-            "       WHEN '5' THEN 'meter'  " +
-            "       WHEN '2' THEN 'cloud'  " +
+            "  CASE dm.device_num  " +
+            "       WHEN 'VD16' THEN 'so1'  " +
+            "       WHEN 'VD36' THEN 'so2'  " +
+            "       WHEN 'VD56' THEN 'loadCell'  " +
             "       ELSE 'Unknown'  " +
             "  END as deviceType," +
             "  TO_CHAR(dm.cur_time, " +
@@ -175,7 +182,12 @@ public interface FgdScrEnergyQueryMapper {
             "  join device_ledger dl   " +
             "on  " +
             "    cpm.device_ledger_id = dl.id  " +
-            "    and dl.device_type in ('5', '6') " +
+            "<if test='haveSO2 == true'> " +
+            "    and dl.device_type in ('31', '32')  " +
+            "</if>" +
+            "<if test='haveSO2 == false'> " +
+            "    and dl.device_type = '32'  " +
+            "</if>" +
             "<if test='systemType != null and systemType != \"\"'> " +
             "    and cpm.system_type = #{systemType} " +
             "</if>" +
@@ -184,7 +196,7 @@ public interface FgdScrEnergyQueryMapper {
             "</if>" +
             ")  " +
             "group by  " +
-            "  device_type,  " +
+            "  device_num,  " +
             "  TO_CHAR(dm.cur_time, " +
             "    <choose>" +
             "      <when test='len == 4'>'YYYY'</when>" +
@@ -202,8 +214,8 @@ public interface FgdScrEnergyQueryMapper {
                                             @Param("curTableName") String curTableName,
                                             @Param("len") String dateLen,
                                             @Param("paramType") String paramType,
-                                            @Param("haveMeter") boolean haveMeter,
-                                            @Param("haveCloud") boolean haveCloud,
+                                            @Param("haveLoadCell") boolean haveLoadCell,
+                                            @Param("haveSO2") boolean haveSO2,
                                             @Param("systemType") String systemType);
 
 }