From e7f3458dccf410501e5c7019f851a3afdc255e1f Mon Sep 17 00:00:00 2001 From: FCD <2453864257@qq.com> Date: Wed, 26 Nov 2025 08:53:45 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E8=A1=A8=E6=95=B4=E7=82=B9=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=97=A0=E6=B3=95=E5=AF=BC=E5=87=BA=E5=92=8C=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/RecordDnbInstantServiceImpl.java | 6 +++--- .../resources/mapper/report/ReportPointDnbMapper.xml | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/op-modules/op-energy/src/main/java/com/op/energy/record/service/impl/RecordDnbInstantServiceImpl.java b/op-modules/op-energy/src/main/java/com/op/energy/record/service/impl/RecordDnbInstantServiceImpl.java index 256d06212..113588c0a 100644 --- a/op-modules/op-energy/src/main/java/com/op/energy/record/service/impl/RecordDnbInstantServiceImpl.java +++ b/op-modules/op-energy/src/main/java/com/op/energy/record/service/impl/RecordDnbInstantServiceImpl.java @@ -297,7 +297,6 @@ public class RecordDnbInstantServiceImpl implements IRecordDnbInstantService { String address = array.getJSONObject(i).getString("Address"); if (address.equals(item.getMonitorId())) { item.setGlys(getSafeBigDecimal(array.getJSONObject(i), "GLYS")); - item.setZxyg(getSafeBigDecimal(array.getJSONObject(i), "YGGL")); item.setActivePower(getSafeBigDecimal(array.getJSONObject(i), "YGGL")); item.setReactivePower(getSafeBigDecimal(array.getJSONObject(i), "WGGL")); } @@ -316,6 +315,7 @@ public class RecordDnbInstantServiceImpl implements IRecordDnbInstantService { for (RecordDnbInstant item : list) { String address = array.getJSONObject(i).getString("Address"); if (address.equals(item.getMonitorId())) { + item.setZxyg(getSafeBigDecimal(array.getJSONObject(i), "ZYGDNSZ")); item.setReactivePower(getSafeBigDecimal(array.getJSONObject(i), "ZYGDN")); } } @@ -329,8 +329,8 @@ public class RecordDnbInstantServiceImpl implements IRecordDnbInstantService { for (RecordDnbInstant item : list) { BaseMonitorInfo temp = new BaseMonitorInfo(); temp.setConnCode(item.getMonitorId()); - List BaseList = baseMonitorInfoMapper.selectBaseMonitorInfoList(temp); - for (BaseMonitorInfo base : BaseList) { + List baseList = baseMonitorInfoMapper.selectBaseMonitorInfoList(temp); + for (BaseMonitorInfo base : baseList) { item.setMonitorId(base.getMonitorId()); recordDnbInstantMapper.insertRecordDnbInstant(item); } diff --git a/op-modules/op-energy/src/main/resources/mapper/report/ReportPointDnbMapper.xml b/op-modules/op-energy/src/main/resources/mapper/report/ReportPointDnbMapper.xml index b61a9116f..7647cb861 100644 --- a/op-modules/op-energy/src/main/resources/mapper/report/ReportPointDnbMapper.xml +++ b/op-modules/op-energy/src/main/resources/mapper/report/ReportPointDnbMapper.xml @@ -179,21 +179,21 @@ order by ert.monitor_id, ert.monitor_name, ert.pointTime - + select ert.monitor_id monitorId, + ert.monitor_name monitorName, CAST( CASE WHEN #{params.timeSub} = 10 THEN ert.pointTime WHEN #{params.timeSub} = 7 THEN concat(ert.pointTime, '-01') WHEN #{params.timeSub} = 4 THEN concat(ert.pointTime, '-01-01') - END AS datetime) AS begin_time, + END AS datetime) AS beginTime, CAST( CASE WHEN #{params.timeSub} = 10 THEN ert.pointTime WHEN #{params.timeSub} = 7 THEN EOMONTH(CONVERT(DATE, CONCAT(ert.pointTime, '-01'))) WHEN #{params.timeSub} = 4 THEN EOMONTH(CONVERT(DATE, CONCAT(ert.pointTime, '-12-01'))) - END AS datetime) AS end_time, + END AS datetime) AS endTime, sum(isnull(ert.expend,0)) expend, - max(ert.meter_value) meter_value, + max(ert.meter_value) meterValue, max(ert.monitor_addr) address from ( select rpd.monitor_id, m.monitor_name, left(CONVERT(VARCHAR(19), rpd.begin_time, 120), #{params.timeSub}) pointTime, rpd.expend,