From 6dd8a66b8ec854fb6726dd9ac9686560e4e4cc1d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 30 九月 2024 08:59:55 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java
index 143b83c..7219215 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java
@@ -264,7 +264,17 @@
 		List<TChargingGun> chargingGuns = chargingGunService.list(wrapper);
 		// 查询充电枪信息
 		chargingPileVOS.forEach(item -> {
-			item.setChargingGunList(chargingGuns.stream().filter(gun -> gun.getChargingPileId().equals(item.getId())).collect(Collectors.toList()));
+			List<TChargingGun> chargingGunList = chargingGuns.stream().filter(gun -> gun.getChargingPileId().equals(item.getId())).collect(Collectors.toList());
+			for (TChargingGun chargingGun : chargingGunList) {
+				if(chargingGun.getStatus().equals(4)){
+					// TODO 查询正在充电的单子的实时记录
+					chargingGun.setSoc(100);
+				}
+				if(chargingGun.getStatus().equals(5)){
+					chargingGun.setSoc(100);
+				}
+			}
+			item.setChargingGunList(chargingGunList);
 		});
 		return chargingPileVOS;
 	}
@@ -351,7 +361,9 @@
 		chargeMonitoring.setUtilizationTrend(utilizationTrend);
 		return chargeMonitoring;
 	}
-	
+
+
+
 	/**
 	 * 获取充电枪各种状态汇总
 	 * @param siteId 站点id

--
Gitblit v1.7.1