From 2eee001313a4a023c6554a6638dd109c44972c80 Mon Sep 17 00:00:00 2001
From: lishuai <lishuai@qq.com>
Date: Mon, 10 Feb 2025 16:49:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=85=E7=94=B5=E6=A1=A9=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=202025=E5=B9=B42=E6=9C=8810=E6=97=A516:49:19?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../thing/qingyuan/chargeStation/dto/EquipmentInfoDTO.java   | 4 ++--
 .../com/thing/qingyuan/chargeStation/task/StationTask.java   | 5 +++--
 .../main/java/com/thing/qingyuan/screen/StationSummary.java  | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/qingyuan/src/main/java/com/thing/qingyuan/chargeStation/dto/EquipmentInfoDTO.java b/modules/qingyuan/src/main/java/com/thing/qingyuan/chargeStation/dto/EquipmentInfoDTO.java
index 9130099..20cf98f 100644
--- a/modules/qingyuan/src/main/java/com/thing/qingyuan/chargeStation/dto/EquipmentInfoDTO.java
+++ b/modules/qingyuan/src/main/java/com/thing/qingyuan/chargeStation/dto/EquipmentInfoDTO.java
@@ -37,7 +37,7 @@ public class EquipmentInfoDTO implements Serializable {
     private BigDecimal equipmentLng;
     private String openForBusinessDate;
     @Schema(description = "充电枪数量")
-    private Integer gunNum;
+    private Integer gunNum=0;
     @Schema(description = "设备类型1:直流设备； 2:交流设备；3:交直流一体设备；4:无线设备；5:其他")
     private Integer equipmentType;
     @Schema(description = "充电设备纬度")
@@ -52,7 +52,7 @@ public class EquipmentInfoDTO implements Serializable {
     private String equipmentModel;
     private BigDecimal current;
     @Schema(description = "充电设备总功率单位：kW")
-    private BigDecimal power;
+    private BigDecimal power= BigDecimal.ZERO;
     private String stationId;
 
     public EquipmentInfoDTO add(EquipmentInfoDTO another) {
diff --git a/modules/qingyuan/src/main/java/com/thing/qingyuan/chargeStation/task/StationTask.java b/modules/qingyuan/src/main/java/com/thing/qingyuan/chargeStation/task/StationTask.java
index fbf54d8..0e35f3b 100644
--- a/modules/qingyuan/src/main/java/com/thing/qingyuan/chargeStation/task/StationTask.java
+++ b/modules/qingyuan/src/main/java/com/thing/qingyuan/chargeStation/task/StationTask.java
@@ -59,10 +59,11 @@ public class StationTask implements ITask {
     @Override
     public void run(String params) {
         log.info("StationTask run params: {}", params);
-        getDayList(params).forEach(timePair -> {
+        List<Pair<String, String>> dayList = getDayList(params);
+        for (Pair<String, String> timePair : dayList) {
             handleSequence(timePair);
             handleAgg(timePair);
-        });
+        }
         log.info("StationTask run end");
     }
 
diff --git a/modules/qingyuan/src/main/java/com/thing/qingyuan/screen/StationSummary.java b/modules/qingyuan/src/main/java/com/thing/qingyuan/screen/StationSummary.java
index 5cb3406..51908b9 100644
--- a/modules/qingyuan/src/main/java/com/thing/qingyuan/screen/StationSummary.java
+++ b/modules/qingyuan/src/main/java/com/thing/qingyuan/screen/StationSummary.java
@@ -34,7 +34,7 @@ public class StationSummary {
     @Schema(description = "年度充电量")
     private BigDecimal yearEnergy = BigDecimal.ZERO;
 
-    @Schema(description = "年度充电次数")
+    @Schema(description = "年度充电金额")
     private BigDecimal yearChargeCount = BigDecimal.ZERO;
 
     public StationSummary(int stationCount, int gunCount) {