From 17482b6f60f7071b1431a207d467666ac66019b8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 15 八月 2024 09:35:07 +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 | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 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 fc4ca37..6d771f5 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
@@ -1,12 +1,15 @@
package com.ruoyi.chargingPile.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.chargingPile.api.dto.PageChargingPileListDTO;
import com.ruoyi.chargingPile.api.model.TChargingGun;
import com.ruoyi.chargingPile.api.model.TChargingPile;
import com.ruoyi.chargingPile.api.query.BatchSetAccountingStrategy;
import com.ruoyi.chargingPile.api.query.PageChargingPileList;
+import com.ruoyi.chargingPile.api.vo.TChargingGunVO;
+import com.ruoyi.chargingPile.api.vo.TChargingPileVO;
import com.ruoyi.chargingPile.domain.SiteMenu;
import com.ruoyi.chargingPile.mapper.TChargingPileMapper;
import com.ruoyi.chargingPile.service.IPartnerService;
@@ -23,6 +26,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -180,20 +184,22 @@
/**
* 删除充电桩
- * @param id
+ * @param ids
* @return
*/
@Override
- public AjaxResult delChargingPile(Integer id) {
+ public AjaxResult delChargingPile(Integer[] ids) {
//检查是否有关联数据
//接口
- long count = chargingGunService.count(new LambdaQueryWrapper<TChargingGun>().eq(TChargingGun::getChargingPileId, id).eq(TChargingGun::getDelFlag, 0));
+ long count = chargingGunService.count(new LambdaQueryWrapper<TChargingGun>().eq(TChargingGun::getChargingPileId, Arrays.asList(ids)).eq(TChargingGun::getDelFlag, 0));
if(count > 0){
return AjaxResult.error("该充电桩有关联的接口数据，删除失败！");
}
- TChargingPile chargingPile = this.getById(id);
- chargingPile.setDelFlag(true);
- this.updateById(chargingPile);
+ for (Integer id : ids) {
+ TChargingPile chargingPile = this.getById(id);
+ chargingPile.setDelFlag(true);
+ this.updateById(chargingPile);
+ }
return AjaxResult.success();
}
@@ -210,4 +216,17 @@
}
chargingGunService.updateBatchById(list);
}
+
+ @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));
+ // 查询充电枪信息
+ chargingPileVOS.forEach(item -> {
+ item.setChargingGunList(chargingGuns.stream().filter(gun -> gun.getChargingPileId().equals(item.getId())).collect(Collectors.toList()));
+ });
+ return chargingPileVOS;
+ }
}
--
Gitblit v1.7.1