装机容量

2025年2月28日11:55:47

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 = "发电功率")

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)){