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> dayList = getDayList(params); + for (Pair 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) {