From 289fbc4d3ae64ade21c6d2eb6cd958610882daed Mon Sep 17 00:00:00 2001 From: zq Date: Tue, 23 Dec 2025 14:09:17 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8-=E5=8A=9F?= =?UTF-8?q?=E7=8E=87=E6=9B=B2=E7=BA=BF=EF=BC=9A=E7=BB=9F=E4=B8=80=E9=80=BB?= =?UTF-8?q?=E8=BE=91=EF=BC=8C=E5=82=A8=E8=83=BD=E5=8A=9F=E8=83=BD=E5=8F=96?= =?UTF-8?q?=E5=80=BC=E5=AD=97=E6=AE=B5secondary=5Ftotal=5Factive=5Fpower?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=8F=96total=5Factive=5Fpower?= =?UTF-8?q?=EF=BC=9B=E8=B4=9F=E8=8D=B7=E5=8A=9F=E7=8E=87=3D=E7=94=B5?= =?UTF-8?q?=E7=BD=91=E5=8A=9F=E7=8E=87+=E5=85=89=E4=BC=8F=E5=8A=9F?= =?UTF-8?q?=E7=8E=87-=E5=82=A8=E8=83=BD=E5=8A=9F=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xzzn/ems/domain/vo/PointDataResponse.java | 2 +- .../xzzn/ems/domain/vo/PowerStatisListVo.java | 2 +- .../impl/EmsStatsReportServiceImpl.java | 21 +++++++++++-------- .../mapper/ems/EmsAmmeterDataMapper.xml | 2 +- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/vo/PointDataResponse.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/PointDataResponse.java index d8ca59d..392117b 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/vo/PointDataResponse.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/vo/PointDataResponse.java @@ -12,7 +12,7 @@ public class PointDataResponse{ private BigDecimal gridPower; /** 负载功率 */ private BigDecimal loadPower; - /** 储能功率-secondary_total_active_power(METE) */ + /** 储能功率-total_active_power(METE) */ private BigDecimal storagePower; /** 光伏功率-total_active_power(METEGT) */ private BigDecimal pvPower; diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/vo/PowerStatisListVo.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/PowerStatisListVo.java index 5bd7671..f7a6b1c 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/vo/PowerStatisListVo.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/vo/PowerStatisListVo.java @@ -22,7 +22,7 @@ public class PowerStatisListVo { private BigDecimal loadPower; /** - * 储能功率-secondary_total_active_power(METE) + * 储能功率-total_active_power(METE) */ private BigDecimal storagePower; diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsStatsReportServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsStatsReportServiceImpl.java index 0b6b5f3..2cf1a3e 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsStatsReportServiceImpl.java +++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsStatsReportServiceImpl.java @@ -577,15 +577,18 @@ public class EmsStatsReportServiceImpl implements IEmsStatsReportService BigDecimal pvPower = powerStatisListVo.getPvPower() == null ? BigDecimal.ZERO : powerStatisListVo.getPvPower(); BigDecimal loadPower = new BigDecimal(0); - // 电动所：负荷功率=电网功率+光伏功率-储能功率 - if (SiteEnum.DDS.getCode().equals(siteId)){ - loadPower = gridPower.add(pvPower).subtract(storagePower); - powerStatisListVo.setLoadPower(loadPower); - } else if (SiteEnum.FX.getCode().equals(siteId)){ - // 奉贤：负荷功率=电网功率-储能功率； - loadPower = gridPower.subtract(storagePower); - powerStatisListVo.setLoadPower(loadPower); - } + // 负荷功率=电网功率+光伏功率-储能功率 + loadPower = gridPower.add(pvPower).subtract(storagePower); + powerStatisListVo.setLoadPower(loadPower); +// // 电动所：负荷功率=电网功率+光伏功率-储能功率 +// if (SiteEnum.DDS.getCode().equals(siteId)){ +// loadPower = gridPower.add(pvPower).subtract(storagePower); +// powerStatisListVo.setLoadPower(loadPower); +// } else if (SiteEnum.FX.getCode().equals(siteId)){ +// // 奉贤：负荷功率=电网功率-储能功率； +// loadPower = gridPower.subtract(storagePower); +// powerStatisListVo.setLoadPower(loadPower); +// } } } diff --git a/ems-system/src/main/resources/mapper/ems/EmsAmmeterDataMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsAmmeterDataMapper.xml index f679965..8b1c6e8 100644 --- a/ems-system/src/main/resources/mapper/ems/EmsAmmeterDataMapper.xml +++ b/ems-system/src/main/resources/mapper/ems/EmsAmmeterDataMapper.xml @@ -977,7 +977,7 @@ - MAX(CASE WHEN t.device_id = 'METE' THEN t.secondary_total_active_power END) AS storagePower, + MAX(CASE WHEN t.device_id = 'METE' THEN t.total_active_power END) AS storagePower, MAX(CASE WHEN t.device_id = 'LOAD' THEN t.total_active_power END) AS gridPower, MAX(CASE WHEN t.device_id = 'METEGF' THEN t.total_active_power END) AS pvPower