From b4f867f79615c870cd37904d4074ad86611b91d8 Mon Sep 17 00:00:00 2001 From: zq Date: Thu, 22 Jan 2026 14:17:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xzzn/ems/service/impl/SingleSiteServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/SingleSiteServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/SingleSiteServiceImpl.java index 24add30..645a698 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/impl/SingleSiteServiceImpl.java +++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/SingleSiteServiceImpl.java @@ -564,7 +564,7 @@ public class SingleSiteServiceImpl implements ISingleSiteService { for (Map clusterDevice : clusterIds) { BMSBatteryClusterVo bmsBatteryClusterVo = new BMSBatteryClusterVo(); bmsBatteryClusterVo.setDeviceName(clusterDevice.get("deviceName").toString()); - bmsBatteryClusterVo.setParentDeviceName(clusterDevice.get("parentDeviceName").toString()); + bmsBatteryClusterVo.setParentDeviceName(clusterDevice.get("parentDeviceName") == null ? null : clusterDevice.get("parentDeviceName").toString()); // 从redis取单个簇详细数据 String clusterId = clusterDevice.get("id").toString(); EmsBatteryCluster clusterData = redisCache.getCacheObject(RedisKeyConstants.CLUSTER +siteId+"_"+clusterId); From 04bf9fe1c13816d96c54873521cfdc178a6a6b51 Mon Sep 17 00:00:00 2001 From: zq Date: Thu, 22 Jan 2026 14:30:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=94=B6=E7=9B=8A=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=80=E5=88=97=E2=80=9D=E5=AE=9E=E9=99=85?= =?UTF-8?q?=E6=94=B6=E7=9B=8A=E2=80=9C=EF=BC=8C=E4=BB=B7=E6=A0=BC=E4=BF=9D?= =?UTF-8?q?=E7=95=99=E4=B8=89=E4=BD=8D=E5=B0=8F=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/vo/AmmeterRevenueStatisListVo.java | 11 +++++++++++ .../service/impl/EmsStatsReportServiceImpl.java | 3 ++- .../mapper/ems/EmsDailyEnergyDataMapper.xml | 16 ++++++++-------- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/vo/AmmeterRevenueStatisListVo.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/AmmeterRevenueStatisListVo.java index 614f5a7..c0acd13 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/vo/AmmeterRevenueStatisListVo.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/vo/AmmeterRevenueStatisListVo.java @@ -41,6 +41,9 @@ public class AmmeterRevenueStatisListVo { /** 组合无功-谷 */ private BigDecimal reActiveValleyPrice = BigDecimal.ZERO; + /** 实际收益 */ + private BigDecimal actualRevenue = BigDecimal.ZERO; + public String getDataTime() { return dataTime; } @@ -128,4 +131,12 @@ public class AmmeterRevenueStatisListVo { public void setReActiveValleyPrice(BigDecimal reActiveValleyPrice) { this.reActiveValleyPrice = reActiveValleyPrice; } + + public BigDecimal getActualRevenue() { + return actualRevenue; + } + + public void setActualRevenue(BigDecimal actualRevenue) { + this.actualRevenue = actualRevenue; + } } 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 dd071a3..5105ca1 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 @@ -347,10 +347,11 @@ public class EmsStatsReportServiceImpl implements IEmsStatsReportService if (CollectionUtils.isEmpty(resultList)) { return Collections.emptyList(); } - //计算每天总收益 + //计算每天总收益和当日实际收益（放电总-充电总） resultList.forEach(ammeterRevenue -> { ammeterRevenue.setActiveTotalPrice(ammeterRevenue.getActivePeakPrice().add(ammeterRevenue.getActiveHighPrice()).add(ammeterRevenue.getActiveFlatPrice()).add(ammeterRevenue.getActiveValleyPrice())); ammeterRevenue.setReActiveTotalPrice(ammeterRevenue.getReActivePeakPrice().add(ammeterRevenue.getReActiveHighPrice()).add(ammeterRevenue.getReActiveFlatPrice()).add(ammeterRevenue.getReActiveValleyPrice())); + ammeterRevenue.setActualRevenue(ammeterRevenue.getReActiveFlatPrice().subtract(ammeterRevenue.getActiveTotalPrice())); }); return resultList; diff --git a/ems-system/src/main/resources/mapper/ems/EmsDailyEnergyDataMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsDailyEnergyDataMapper.xml index f33854f..3b34ab5 100644 --- a/ems-system/src/main/resources/mapper/ems/EmsDailyEnergyDataMapper.xml +++ b/ems-system/src/main/resources/mapper/ems/EmsDailyEnergyDataMapper.xml @@ -236,14 +236,14 @@