From c2f64ff43f506b675b0fda1afee7636571d3f21b Mon Sep 17 00:00:00 2001
From: lishuai <lishuai@qq.com>
Date: Fri, 28 Feb 2025 14:19:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E6=9C=BA=E5=AE=B9=E9=87=8F=202025?=
 =?UTF-8?q?=E5=B9=B42=E6=9C=8828=E6=97=A511:55:47?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/thing/qingyuan/manageboard/dto/PlantDTO.java | 4 ++++
 .../manageboard/service/impl/PlantServiceImpl.java        | 8 +++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/modules/qingyuan/src/main/java/com/thing/qingyuan/manageboard/dto/PlantDTO.java b/modules/qingyuan/src/main/java/com/thing/qingyuan/manageboard/dto/PlantDTO.java
index a7a43d5..21b28e4 100644
--- a/modules/qingyuan/src/main/java/com/thing/qingyuan/manageboard/dto/PlantDTO.java
+++ b/modules/qingyuan/src/main/java/com/thing/qingyuan/manageboard/dto/PlantDTO.java
@@ -65,8 +65,12 @@ public class PlantDTO implements Serializable {
     private String reductionyy;
     @Schema(description = "当年发电A29")
     private String attrKey29yy;
+    @Schema(description = "当月发电A29")
+    private String attrKey29mm;
     @Schema(description = "当年发电量")
     private String val29yy;
+    @Schema(description = "当月发电量")
+    private String val29mm;
     @Schema(description = "发电功率A16")
     private String attrKey16;
     @Schema(description = "发电功率")
diff --git a/modules/qingyuan/src/main/java/com/thing/qingyuan/manageboard/service/impl/PlantServiceImpl.java b/modules/qingyuan/src/main/java/com/thing/qingyuan/manageboard/service/impl/PlantServiceImpl.java
index 0635467..3868335 100644
--- a/modules/qingyuan/src/main/java/com/thing/qingyuan/manageboard/service/impl/PlantServiceImpl.java
+++ b/modules/qingyuan/src/main/java/com/thing/qingyuan/manageboard/service/impl/PlantServiceImpl.java
@@ -115,7 +115,7 @@ public class PlantServiceImpl extends BaseServiceImpl<PlantMapper, PlantEntity>
                             .filter(s -> StringUtils.equals(s.getPlantId().toString(), tsKvDTO.getThingCode()))
                             .findFirst()
                             .ifPresent(s -> {
-                                BigDecimal income = CalculationUtil.income(new BigDecimal(tsKvDTO.getVal()), s.getProfitco2(), 2);
+                                BigDecimal income = CalculationUtil.income(new BigDecimal(tsKvDTO.getVal()), s.getUnitProfit(), 2);
                                 if (income == null) {
                                     income = BigDecimal.ZERO;
                                 }
@@ -229,6 +229,12 @@ public class PlantServiceImpl extends BaseServiceImpl<PlantMapper, PlantEntity>
                     plantDTO.setReductionyy(reductionUsage.toPlainString());
                 }
             }
+            //月发电量
+            TsKvDTO tsKvDTOmm = tsKvService.findLatestByCodeAndAttr(String.valueOf(plantId), "A29mm");
+            if(!Objects.isNull(tsKvDTOmm)){
+                plantDTO.setAttrKey29mm(tsKvDTOmm.getAttrKey());
+                plantDTO.setVal29mm(new BigDecimal(tsKvDTOmm.getVal()).toPlainString());
+            }
             //当前功率
             TsKvDTO tsKvDTO16 = tsKvService.findLatestByCodeAndAttr(String.valueOf(plantId), "A16");
             if(!Objects.isNull(tsKvDTO16)){