From d8786c8c3b5084bdad9ef318d056d81579e622f0 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 30 九月 2024 11:11:04 +0800
Subject: [PATCH] 合并

---
 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java
index 9badeb7..41b90e0 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java
@@ -230,14 +230,17 @@
         Long count = this.baseMapper.selectCount(Wrappers.lambdaQuery(TChargingGun.class)
                 .eq(TChargingGun::getStatus, 1));
         HashMap<String, Integer> objectObjectHashMap1 = new HashMap<>();
-        objectObjectHashMap1.put("1", count.intValue());
+        objectObjectHashMap1.put("charge_mode",1);
+        objectObjectHashMap1.put("modeCount", count.intValue());
         statusStatistics.add(objectObjectHashMap1);
 //        statusStatistics.put(1, count.intValue());
         // 故障
         count = this.baseMapper.selectCount(Wrappers.lambdaQuery(TChargingGun.class)
                 .eq(TChargingGun::getStatus, 7));
         HashMap<String, Integer> objectObjectHashMap2 = new HashMap<>();
-        objectObjectHashMap2.put("2", count.intValue());
+//        objectObjectHashMap2.put("2", count.intValue());
+        objectObjectHashMap2.put("charge_mode",2);
+        objectObjectHashMap2.put("modeCount", count.intValue());
         statusStatistics.add(objectObjectHashMap2);
 
 //        statusStatistics.put(2, count.intValue());
@@ -245,7 +248,8 @@
         count = this.baseMapper.selectCount(Wrappers.lambdaQuery(TChargingGun.class)
                 .in(TChargingGun::getStatus, Arrays.asList(3,4,5,6)));
        HashMap<String, Integer> objectObjectHashMap = new HashMap<>();
-        objectObjectHashMap.put("3", count.intValue());
+        objectObjectHashMap.put("charge_mode",3);
+        objectObjectHashMap.put("modeCount", count.intValue());
         statusStatistics.add(objectObjectHashMap);
 
 //        statusStatistics.put(3, count.intValue());

--
Gitblit v1.7.1