From f45ddcbccf26e1166f546584bd66ceec67e5bdf9 Mon Sep 17 00:00:00 2001
From: lishuai <lishuai@qq.com>
Date: Wed, 12 Feb 2025 18:11:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=85=E7=94=B5=E6=A1=A9=E7=9A=84=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=202025=E5=B9=B42=E6=9C=8812=E6=97=A516:40:12?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qingyuan/screen/StationChargeStatus.java      | 15 ++++++++++++---
 .../service/impl/StationScreenServiceImpl.java    |  6 ++----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/modules/qingyuan/src/main/java/com/thing/qingyuan/screen/StationChargeStatus.java b/modules/qingyuan/src/main/java/com/thing/qingyuan/screen/StationChargeStatus.java
index 2d564b6..46b1adb 100644
--- a/modules/qingyuan/src/main/java/com/thing/qingyuan/screen/StationChargeStatus.java
+++ b/modules/qingyuan/src/main/java/com/thing/qingyuan/screen/StationChargeStatus.java
@@ -55,7 +55,8 @@ public class StationChargeStatus {
     public static class GunUsageDuration {
         @Schema(description = "枪名")
         private String gunName;
-
+//        @Schema(description = "枪id")
+//        private String connectorId;
         @Schema(description = "枪使用时长，单位 h")
         private BigDecimal hours;
     }
@@ -75,7 +76,7 @@ public class StationChargeStatus {
                         .collect(
                                 Collectors.toMap(
                                         ConnectorInfoEntity::getConnectorId,
-                                        ConnectorInfoEntity::getConnectorName,
+                                        ConnectorInfoEntity::getConnectorId,
                                         (v1, v2) -> v1));
 
         // 汇总使用率数据
@@ -97,10 +98,18 @@ public class StationChargeStatus {
                         BigDecimal.valueOf(24 * (long) chargeStatus.getTotalGunCount()),
                         3,
                         RoundingMode.HALF_UP);
+        List<GunUsageDuration> updatedList =
+                gunUsageDurationList.stream()
+                        .sorted(Comparator.comparing(GunUsageDuration::getGunName)) // 排序
+                        .toList();
 
+        // 遍历排序后的列表，设置connectorName为下标
+        for (int i = 0; i < updatedList.size(); i++) {
+            updatedList.get(i).setGunName(String.valueOf(i)); // 设置connectorName为下标值
+        }
         return chargeStatus
                 .setUsagePercent(usagePercent.multiply(new BigDecimal("100")))
-                .setGunUsageDurations(gunUsageDurationList);
+                .setGunUsageDurations(updatedList);
     }
 
     private StationChargeStatus add(ConnectorInfoEntity gunInfo) {
diff --git a/modules/qingyuan/src/main/java/com/thing/qingyuan/screen/service/impl/StationScreenServiceImpl.java b/modules/qingyuan/src/main/java/com/thing/qingyuan/screen/service/impl/StationScreenServiceImpl.java
index 97728b7..72b16fa 100644
--- a/modules/qingyuan/src/main/java/com/thing/qingyuan/screen/service/impl/StationScreenServiceImpl.java
+++ b/modules/qingyuan/src/main/java/com/thing/qingyuan/screen/service/impl/StationScreenServiceImpl.java
@@ -16,12 +16,10 @@ import lombok.RequiredArgsConstructor;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 /**
  * @author SiYang