From 1e7d666ff6f626cb44cfaf1cdaa30a15810dcc75 Mon Sep 17 00:00:00 2001 From: "3067418132@qq.com" Date: Fri, 17 Jul 2026 14:08:06 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8D=E8=83=BD=E6=95=88?= =?UTF-8?q?=E8=B6=8B=E5=8A=BF=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mh-admin/src/main/resources/application-dev.yml | 4 ++-- mh-system/src/main/resources/mapper/system/EnergyMapper.xml | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/mh-admin/src/main/resources/application-dev.yml b/mh-admin/src/main/resources/application-dev.yml index a93b3bc..cfb1bbc 100644 --- a/mh-admin/src/main/resources/application-dev.yml +++ b/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: # 从数据源开关/默认关闭 diff --git a/mh-system/src/main/resources/mapper/system/EnergyMapper.xml b/mh-system/src/main/resources/mapper/system/EnergyMapper.xml index 9377ffb..d2e0136 100644 --- a/mh-system/src/main/resources/mapper/system/EnergyMapper.xml +++ b/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,