From e3bd1dab9944dd57ea699f5d7514b1b0b29e2bee Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 27 九月 2024 13:32:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java | 52 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 32 insertions(+), 20 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 496022c..9badeb7 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
@@ -186,16 +186,22 @@
GunStatusStatisticsVO gunStatusStatisticsVO = new GunStatusStatisticsVO();
if(CollectionUtils.isEmpty(siteIds)){
- List<Map<Integer, Integer>> modeStatisticsNull = new ArrayList<>();
- modeStatisticsNull.add(new HashMap<>(1,0));
- modeStatisticsNull.add(new HashMap<>(2,0));
- modeStatisticsNull.add(new HashMap<>(3,0));
- gunStatusStatisticsVO.setModeStatistics(modeStatisticsNull);
- Map<Integer, Integer> statusStatisticsNull = new HashMap<>();
- statusStatisticsNull.put(1, 0);
- statusStatisticsNull.put(2, 0);
- statusStatisticsNull.put(3, 0);
- gunStatusStatisticsVO.setStatusStatistics(statusStatisticsNull);
+// List<Map<Integer, Integer>> modeStatisticsNull = new ArrayList<>();
+// HashMap<Integer, Integer> objectObjectHashMap1 = new HashMap<>();
+// objectObjectHashMap1.put(1, 0);
+// modeStatisticsNull.add(objectObjectHashMap1);
+// HashMap<Integer, Integer> objectObjectHashMap2= new HashMap<>();
+// objectObjectHashMap2.put(2, 0);
+// modeStatisticsNull.add(objectObjectHashMap2);
+// HashMap<Integer, Integer> objectObjectHashMap3= new HashMap<>();
+// objectObjectHashMap3.put(3, 0);
+// modeStatisticsNull.add(objectObjectHashMap3);
+// gunStatusStatisticsVO.setModeStatistics(modeStatisticsNull);
+// Map<Integer, Integer> statusStatisticsNull = new HashMap<>();
+// statusStatisticsNull.put(1, 0);
+// statusStatisticsNull.put(2, 0);
+// statusStatisticsNull.put(3, 0);
+// gunStatusStatisticsVO.setStatusStatistics(statusStatisticsNull);
List<StatusModeStatisticsVO> statusModeStatistics = new ArrayList<>();
for (int i = 1; i < 4; i++) {
StatusModeStatisticsVO statusModeStatisticsVO = new StatusModeStatisticsVO();
@@ -209,35 +215,41 @@
gunStatusStatisticsVO.setStatusModeStatistics(statusModeStatistics);
}
- List<Map<Integer, Integer>> modeStatistics = this.baseMapper.getModeStatistics(siteIds);
+ List<Map<String, Object>> modeStatistics = this.baseMapper.getModeStatistics(siteIds);
if(CollectionUtils.isEmpty(modeStatistics)){
- Map<Integer, Integer> modeStatistics1 = new HashMap<>(3,0);
- modeStatistics1.put(1, 0);
- modeStatistics1.put(2, 0);
- modeStatistics1.put(3, 0);
+ Map<String, Object> modeStatistics1 = new HashMap<>();
+ modeStatistics1.put("1", "0");
+ modeStatistics1.put("2", "0");
+ modeStatistics1.put("3", "0");
modeStatistics.add(modeStatistics1);
}
gunStatusStatisticsVO.setModeStatistics(modeStatistics);
- List<Map<Integer, Integer>> statusStatistics = new ArrayList<>();
+ List<Map<String, Integer>> statusStatistics = new ArrayList<>();
// 离线
Long count = this.baseMapper.selectCount(Wrappers.lambdaQuery(TChargingGun.class)
.eq(TChargingGun::getStatus, 1));
- statusStatistics.add(new HashMap<>(1,count.intValue()));
+ HashMap<String, Integer> objectObjectHashMap1 = new HashMap<>();
+ objectObjectHashMap1.put("1", count.intValue());
+ statusStatistics.add(objectObjectHashMap1);
// statusStatistics.put(1, count.intValue());
// 故障
count = this.baseMapper.selectCount(Wrappers.lambdaQuery(TChargingGun.class)
.eq(TChargingGun::getStatus, 7));
- statusStatistics.add(new HashMap<>(2,count.intValue()));
+ HashMap<String, Integer> objectObjectHashMap2 = new HashMap<>();
+ objectObjectHashMap2.put("2", count.intValue());
+ statusStatistics.add(objectObjectHashMap2);
// statusStatistics.put(2, count.intValue());
// 充电中
count = this.baseMapper.selectCount(Wrappers.lambdaQuery(TChargingGun.class)
.in(TChargingGun::getStatus, Arrays.asList(3,4,5,6)));
- statusStatistics.add(new HashMap<>(3,count.intValue()));
+ HashMap<String, Integer> objectObjectHashMap = new HashMap<>();
+ objectObjectHashMap.put("3", count.intValue());
+ statusStatistics.add(objectObjectHashMap);
// statusStatistics.put(3, count.intValue());
- gunStatusStatisticsVO.setModeStatistics(statusStatistics);
+ gunStatusStatisticsVO.setStatusStatistics(statusStatistics);
List<StatusModeStatisticsVO> statusModeStatisticsVOS = new ArrayList<>();
StatusModeStatisticsVO statusModeStatistics1 = this.baseMapper.getStatusModeStatistics(siteIds,1);
--
Gitblit v1.7.1