From 0fe7e0b2ca4e0300aa78b76dc3cbfe1b3ea6aabf Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 08 十月 2024 14:25:03 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 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..d95c38f 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
@@ -228,9 +228,10 @@
public AjaxResult delChargingPile(Integer[] ids) {
//检查是否有关联数据
//接口
- long count = chargingGunService.count(new LambdaQueryWrapper<TChargingGun>().eq(TChargingGun::getChargingPileId, Arrays.asList(ids)).eq(TChargingGun::getDelFlag, 0));
+ long count = chargingGunService.count(new LambdaQueryWrapper<TChargingGun>().in(TChargingGun::getChargingPileId, Arrays.asList(ids))
+ .eq(TChargingGun::getDelFlag, 0));
if(count > 0){
- return AjaxResult.error("该充电桩有关联的接口数据，删除失败！");
+ return AjaxResult.error("该充电桩已添加接口，不可删除。");
}
for (Integer id : ids) {
TChargingPile chargingPile = this.getById(id);
@@ -264,7 +265,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 +362,9 @@
chargeMonitoring.setUtilizationTrend(utilizationTrend);
return chargeMonitoring;
}
-
+
+
+
/**
* 获取充电枪各种状态汇总
* @param siteId 站点id
--
Gitblit v1.7.1