From 04bf9fe1c13816d96c54873521cfdc178a6a6b51 Mon Sep 17 00:00:00 2001
From: zq <nwwb-zhouqin@nuanwa.net>
Date: Thu, 22 Jan 2026 14:30:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E7=9B=8A=E6=8A=A5=E8=A1=A8=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E4=B8=80=E5=88=97=E2=80=9D=E5=AE=9E=E9=99=85=E6=94=B6?=
 =?UTF-8?q?=E7=9B=8A=E2=80=9C=EF=BC=8C=E4=BB=B7=E6=A0=BC=E4=BF=9D=E7=95=99?=
 =?UTF-8?q?=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 @@
     <select id="getRevenueDataBySiteId" resultType="com.xzzn.ems.domain.vo.AmmeterRevenueStatisListVo">
         select
             t.data_date as dataTime,
-            t.peak_charge_diff * pc.peak as activePeakPrice,
-            t.peak_discharge_diff * pc.peak as reActivePeakPrice,
-            t.high_charge_diff * pc.high as activeHighPrice,
-            t.high_discharge_diff * pc.high as reActiveHighPrice,
-            t.flat_charge_diff * pc.flat as activeFlatPrice,
-            t.flat_discharge_diff * pc.flat as reActiveFlatPrice,
-            t.valley_charge_diff * pc.valley as activeValleyPrice,
-            t.valley_discharge_diff * pc.valley as reActiveValleyPrice
+            ROUND(t.peak_charge_diff * pc.peak, 3) as activePeakPrice,
+            ROUND(t.peak_discharge_diff * pc.peak, 3) as reActivePeakPrice,
+            ROUND(t.high_charge_diff * pc.high, 3) as activeHighPrice,
+            ROUND(t.high_discharge_diff * pc.high, 3) as reActiveHighPrice,
+            ROUND(t.flat_charge_diff * pc.flat, 3) as activeFlatPrice,
+            ROUND(t.flat_discharge_diff * pc.flat, 3) as reActiveFlatPrice,
+            ROUND(t.valley_charge_diff * pc.valley, 3) as activeValleyPrice,
+            ROUND(t.valley_discharge_diff * pc.valley, 3) as reActiveValleyPrice
         from ems_daily_energy_data t
         left join (
             select