From e9f36d42efaa757c7f93b00ba3ff9fb0d0bf46c9 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 14 十月 2024 17:11:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java |   50 +++++++++++++++++++++++++++++++++++---------------
 1 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java
index 38e0916..8029ad5 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java
@@ -8,17 +8,16 @@
 import com.ruoyi.chargingPile.api.model.Site;
 import com.ruoyi.chargingPile.api.model.TChargingGun;
 import com.ruoyi.chargingPile.api.model.TChargingPile;
+import com.ruoyi.chargingPile.api.model.TParkingLot;
 import com.ruoyi.chargingPile.api.query.GetSiteList;
+import com.ruoyi.chargingPile.api.query.SiteDetailQuery;
 import com.ruoyi.chargingPile.api.query.SiteQuery;
 import com.ruoyi.chargingPile.api.vo.SiteDetailVO;
 import com.ruoyi.chargingPile.api.vo.SiteVO;
 import com.ruoyi.chargingPile.api.vo.TAccountingStrategyVO;
 import com.ruoyi.chargingPile.domain.SiteMenu;
 import com.ruoyi.chargingPile.mapper.SiteMapper;
-import com.ruoyi.chargingPile.service.IPartnerService;
-import com.ruoyi.chargingPile.service.ISiteService;
-import com.ruoyi.chargingPile.service.TChargingGunService;
-import com.ruoyi.chargingPile.service.TChargingPileService;
+import com.ruoyi.chargingPile.service.*;
 import com.ruoyi.common.core.utils.ServletUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.web.domain.AjaxResult;
@@ -31,12 +30,16 @@
 import com.ruoyi.other.api.feignClient.VipClient;
 import com.ruoyi.system.api.domain.SysUser;
 import com.ruoyi.system.api.feignClient.SysUserClient;
+import com.ruoyi.system.api.feignClient.SysUserRoleClient;
+import com.ruoyi.system.api.model.SysUserRoleVo;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @author zhibing.pu
@@ -68,6 +71,10 @@
 	private AppUserClient appUserClient;
 	@Resource
 	private VipClient vipClient;
+	@Resource
+	private SysUserRoleClient sysUserRoleClient;
+	@Resource
+	private TParkingLotService parkingLotService;
 
 	
 	
@@ -90,8 +97,11 @@
 			//非管理员需要根据角色和用户配置查询允许的站点数据
 			if(!SecurityUtils.isAdmin(SecurityUtils.getUserId())){
 				List<Integer> data = userSiteClient.getSiteIds(sysUser.getUserId()).getData();
-				List<Integer> data1 = roleSiteClient.getSiteIds(sysUser.getRoleId()).getData();
-				data.addAll(data1);
+				List<SysUserRoleVo> data2 = sysUserRoleClient.getRoleByUserId(sysUser.getUserId()).getData();
+				if(data2.size() > 0){
+					List<Integer> data1 = roleSiteClient.getSiteIds(data2.get(0).getRoleId()).getData();
+					data.addAll(data1);
+				}
 				ids = new HashSet<>(data);
 			}
 		}
@@ -126,7 +136,8 @@
 			//非管理员需要根据角色和用户配置查询允许的站点数据
 			if(!SecurityUtils.isAdmin(SecurityUtils.getUserId())){
 				List<Integer> data = userSiteClient.getSiteIds(sysUser.getUserId()).getData();
-				List<Integer> data1 = roleSiteClient.getSiteIds(sysUser.getRoleId()).getData();
+				List<SysUserRoleVo> data2 = sysUserRoleClient.getRoleByUserId(sysUser.getUserId()).getData();
+				List<Integer> data1 = roleSiteClient.getSiteIds(data2.get(0).getRoleId()).getData();
 				data.addAll(data1);
 				ids = new HashSet<>(data);
 			}
@@ -249,9 +260,10 @@
 	public AjaxResult delSite(Integer[] ids) {
 		//查询是否有关联数据
 		//充电桩
-		long count1 = chargingPileService.count(new LambdaQueryWrapper<TChargingPile>().eq(TChargingPile::getSiteId, Arrays.asList(ids)).eq(TChargingPile::getDelFlag, 0));
+		long count1 = chargingPileService.count(new LambdaQueryWrapper<TChargingPile>().in(TChargingPile::getSiteId, Arrays.asList(ids))
+				.eq(TChargingPile::getDelFlag, 0));
 		if(count1 > 0){
-			return AjaxResult.error("该站点有关联充电桩,删除失败!");
+			return AjaxResult.error("该站点已添加充电桩,不可删除。");
 		}
 		for (Integer id : ids) {
 			Site site = this.getById(id);
@@ -276,7 +288,7 @@
 			TVip vip = vipClient.getInfo1(appUser.getVipId()).getData();
 			if(Objects.nonNull(vip) && vip.getType() == 2){
 				list.forEach(item -> {
-					item.setVipElectrovalence(vip.getDiscount().multiply(item.getElectrovalence()));
+					item.setVipElectrovalence(vip.getDiscount().multiply(item.getServiceCharge()).add(item.getElectrovalenceOriginal()));
 				});
 			}
 		}
@@ -285,8 +297,8 @@
 	}
 
 	@Override
-	public SiteDetailVO getDetailById(Integer siteId) {
-		return this.baseMapper.getDetailById(siteId);
+	public SiteDetailVO getDetailById(SiteDetailQuery query) {
+		return this.baseMapper.getDetailById(query);
 	}
 
 	@Override
@@ -303,10 +315,17 @@
 			//非管理员需要根据角色和用户配置查询允许的站点数据
 			if(!SecurityUtils.isAdmin(SecurityUtils.getUserId())){
 				List<Integer> data = userSiteClient.getSiteIds(sysUser.getUserId()).getData();
-				List<Integer> data1 = roleSiteClient.getSiteIds(sysUser.getRoleId()).getData();
+				List<SysUserRoleVo> data2 = sysUserRoleClient.getRoleByUserId(sysUser.getUserId()).getData();
+				List<Integer> data1 = roleSiteClient.getSiteIds(data2.get(0).getRoleId()).getData();
 				data.addAll(data1);
 				ids = new HashSet<>(data);
 			}
+		}
+		// 查询所有的停车场的站点id
+		List<TParkingLot> list = parkingLotService.list();
+		List<Integer> siteIds = list.stream().map(TParkingLot::getSiteId).collect(Collectors.toList());
+		if(!CollectionUtils.isEmpty(ids) && !CollectionUtils.isEmpty(siteIds)){
+			ids.addAll(siteIds);
 		}
 		return this.baseMapper.getSiteListParkLot(ids);
 	}
@@ -325,7 +344,8 @@
 			//非管理员需要根据角色和用户配置查询允许的站点数据
 			if(!SecurityUtils.isAdmin(SecurityUtils.getUserId())){
 				List<Integer> data = userSiteClient.getSiteIds(sysUser.getUserId()).getData();
-				List<Integer> data1 = roleSiteClient.getSiteIds(sysUser.getRoleId()).getData();
+				List<SysUserRoleVo> data2 = sysUserRoleClient.getRoleByUserId(sysUser.getUserId()).getData();
+				List<Integer> data1 = roleSiteClient.getSiteIds(data2.get(0).getRoleId()).getData();
 				data.addAll(data1);
 				ids = new HashSet<>(data);
 			}
@@ -371,7 +391,7 @@
 		this.updateById(site);
 		List<TChargingGun> list = chargingGunService.list(new LambdaQueryWrapper<TChargingGun>().in(TChargingGun::getChargingPileId, id).eq(TChargingGun::getDelFlag, 0));
 		for (TChargingGun tChargingGun : list) {
-			tChargingGun.setChargingPileId(accountingStrategyId);
+			tChargingGun.setAccountingStrategyId(accountingStrategyId);
 		}
 		chargingGunService.updateBatchById(list);
 	}

--
Gitblit v1.7.1