From 553a9c1328512bae1f03d3931313e7aab2b89375 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期二, 13 八月 2024 19:49:57 +0800
Subject: [PATCH] 新增加分布式事务配置和修改启动异常
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java | 43 ++++++++++++++++++++++++++++++++-----------
1 files changed, 32 insertions(+), 11 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 4c2d1e5..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
@@ -19,12 +19,17 @@
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.other.api.feignClient.RoleSiteClient;
+import com.ruoyi.other.api.feignClient.UserSiteClient;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
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;
import java.util.stream.Collectors;
/**
@@ -47,6 +52,12 @@
@Resource
private IPartnerService partnerService;
+ @Resource
+ private UserSiteClient userSiteClient;
+
+ @Resource
+ private RoleSiteClient roleSiteClient;
+
@@ -57,7 +68,7 @@
*/
@Override
public PageInfo<PageChargingPileListDTO> pageChargingPileList(PageChargingPileList page) {
- List<Integer> siteIds = null;
+ Set<Integer> siteIds = null;
//校验合作商权限
SysUser sysUser = sysUserClient.getSysUser(SecurityUtils.getUserId()).getData();
Integer roleType = sysUser.getRoleType();
@@ -65,6 +76,14 @@
//合作商
if(roleType == 2){
siteIds = partnerService.authSite(objectId, SiteMenu.CHARGING_PILE);
+ }else{
+ //非管理员需要根据角色和用户配置查询允许的站点数据
+ if(!SecurityUtils.isAdmin(SecurityUtils.getUserId())){
+ List<Integer> data = userSiteClient.getSiteIds(sysUser.getUserId()).getData();
+ List<Integer> data1 = roleSiteClient.getSiteIds(sysUser.getRoleId()).getData();
+ data.addAll(data1);
+ siteIds = new HashSet<>(data);
+ }
}
PageInfo<PageChargingPileListDTO> pageInfo = new PageInfo<>(page.getPageCurr(), page.getPageSize());
List<PageChargingPileListDTO> list = this.baseMapper.pageChargingPileList(pageInfo, page, siteIds);
@@ -165,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();
}
@@ -197,14 +218,14 @@
}
@Override
- public List<TChargingPileVO> getChargingGunList(Integer siteId) {
+ 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::getSiteId, siteId)
+ .eq(TChargingGun::getChargeMode, type));
// 查询充电枪信息
chargingPileVOS.forEach(item -> {
- List<TChargingGun> gunList = chargingGuns.stream().filter(gun -> gun.getChargingPileId().equals(item.getId())).collect(Collectors.toList());
- item.setChargingGunList(gunList);
+ item.setChargingGunList(chargingGuns.stream().filter(gun -> gun.getChargingPileId().equals(item.getId())).collect(Collectors.toList()));
});
return chargingPileVOS;
}
--
Gitblit v1.7.1