1、修复能效趋势查询

mh-admin/src/main/resources/application-dev.yml

@@ -98,10 +98,10 @@ spring:
       # 主库数据源
       master:
         #添加allowMultiQueries=true 在批量更新时才不会出错
-        url: jdbc:postgresql://192.168.1.107:5232/bl_eems
+        url: jdbc:postgresql://127.0.0.1:5432/eemcs_blzj
 #        url: jdbc:postgresql://106.55.173.225:5505/eemcs
         username: postgres
-        password: mhtech@803
+        password: mh@803
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭

mh-system/src/main/resources/mapper/system/EnergyMapper.xml

@@ -1074,6 +1074,7 @@
             and dl.device_type = '5'
             and cpm.grade = 140
             and cpm.terminal_device_type = '15'
+            and cpm.param_type = '16'
         )
         group by
             device_type,
@@ -1101,6 +1102,7 @@
               and dl.device_type = '6'
               and cpm.grade = 140
               and cpm.terminal_device_type = '15'
+              and cpm.param_type = '17'
             )
         group by
             device_type,
@@ -1129,6 +1131,7 @@
             cpm.device_ledger_id = dl.id
           and dl.device_type = '5'
           and cpm.grade = 140
+          and cpm.param_type = '16'
             )
         group by
             device_type,
@@ -1155,6 +1158,7 @@
             cpm.device_ledger_id = dl.id
           and dl.device_type = '6'
           and cpm.grade = 140
+          and cpm.param_type = '17'
             )
         group by
             device_type,
@@ -1181,6 +1185,7 @@
             cpm.device_ledger_id = dl.id
           and dl.device_type = '5'
           and cpm.grade = 140
+          and cpm.param_type = '16'
             )
         group by
             device_type,
@@ -1207,6 +1212,7 @@
             cpm.device_ledger_id = dl.id
           and dl.device_type = '6'
           and cpm.grade = 140
+          and cpm.param_type = '17'
             )
         group by
             device_type,