From b7716e14b1a7627ceb7d0d1d3ef2094814b1a302 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 26 八月 2024 18:04:58 +0800
Subject: [PATCH] 修改
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 fda8e8f..12c5b72 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
@@ -222,8 +222,7 @@
}
for (Integer id : ids) {
TChargingPile chargingPile = this.getById(id);
- chargingPile.setDelFlag(true);
- this.updateById(chargingPile);
+ this.removeById(chargingPile);
}
return AjaxResult.success();
}
@@ -245,9 +244,12 @@
@Override
public List<TChargingPileVO> getChargingGunList(Integer siteId,Integer type) {
List<TChargingPileVO> chargingPileVOS = this.baseMapper.getChargingGunList(siteId);
- List<TChargingGun> chargingGuns = chargingGunService.list(Wrappers.lambdaQuery(TChargingGun.class)
- .eq(TChargingGun::getSiteId, siteId)
- .eq(TChargingGun::getChargeMode, type));
+ LambdaQueryWrapper<TChargingGun> wrapper = new LambdaQueryWrapper<>();
+ if(Objects.nonNull(type)){
+ wrapper.eq(TChargingGun::getChargeMode, type);
+ }
+ wrapper.eq(TChargingGun::getSiteId, siteId);
+ List<TChargingGun> chargingGuns = chargingGunService.list(wrapper);
// 查询充电枪信息
chargingPileVOS.forEach(item -> {
item.setChargingGunList(chargingGuns.stream().filter(gun -> gun.getChargingPileId().equals(item.getId())).collect(Collectors.toList()));
--
Gitblit v1.7.1