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/SiteServiceImpl.java | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 101 insertions(+), 7 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 d07b067..fe3d696 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
@@ -4,18 +4,36 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.chargingPile.api.dto.GetSiteListDTO;
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.query.GetSiteList;
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.common.core.utils.StringUtils;
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 org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
/**
* @author zhibing.pu
@@ -23,6 +41,25 @@
*/
@Service
public class SiteServiceImpl extends ServiceImpl<SiteMapper, Site> implements ISiteService {
+
+ @Resource
+ private TChargingGunService chargingGunService;
+
+ @Resource
+ private TChargingPileService chargingPileService;
+
+ @Resource
+ private SysUserClient sysUserClient;
+
+ @Resource
+ private IPartnerService partnerService;
+
+ @Resource
+ private UserSiteClient userSiteClient;
+
+ @Resource
+ private RoleSiteClient roleSiteClient;
+
/**
@@ -32,10 +69,38 @@
*/
@Override
public PageInfo<GetSiteListDTO> getSiteList(GetSiteList siteList) {
+ Set<Integer> ids = null;
+ //校验合作商权限
+ SysUser sysUser = sysUserClient.getSysUser(SecurityUtils.getUserId()).getData();
+ Integer roleType = sysUser.getRoleType();
+ Integer objectId = sysUser.getObjectId();
+ //合作商
+ if(roleType == 2){
+ ids = partnerService.authSite(objectId, SiteMenu.SITE_LIST);
+ }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);
+ ids = new HashSet<>(data);
+ }
+ }
PageInfo<GetSiteListDTO> pageInfo = new PageInfo<>(siteList.getPageCurr(), siteList.getPageSize());
- List<GetSiteListDTO> list = this.baseMapper.getSiteList(pageInfo, siteList);
+ List<GetSiteListDTO> list = this.baseMapper.getSiteList(pageInfo, siteList, ids);
+ for (GetSiteListDTO getSiteListDTO : list) {
+ Integer siteId = getSiteListDTO.getId();
+ getSiteListDTO.setAuthAccountingStrategy(roleType == 1 ? true : partnerService.authMenu(objectId, siteId, SiteMenu.SITE_ACCOUNTING_STRATEGY));
+ //平台账号才有此权限
+ getSiteListDTO.setAuthPartner(roleType == 1 ? true : false);
+ getSiteListDTO.setAuthUpdate(roleType == 1 ? true : partnerService.authMenu(objectId, siteId, SiteMenu.SITE_UPDATE));
+ getSiteListDTO.setAuthDelete(roleType == 1 ? true : partnerService.authMenu(objectId, siteId, SiteMenu.SITE_DELETE));
+ }
return pageInfo.setRecords(list);
}
+
+
+
/**
* 添加站点信息
@@ -132,17 +197,22 @@
/**
* 删除站点
- * @param id 站点id
+ * @param ids 站点id
* @return
*/
@Override
- public AjaxResult delSite(Integer id) {
+ public AjaxResult delSite(Integer[] ids) {
//查询是否有关联数据
//充电桩
- // todo 待完善
- Site site = this.getById(id);
- site.setDelFlag(true);
- this.updateById(site);
+ long count1 = chargingPileService.count(new LambdaQueryWrapper<TChargingPile>().eq(TChargingPile::getSiteId, Arrays.asList(ids)).eq(TChargingPile::getDelFlag, 0));
+ if(count1 > 0){
+ return AjaxResult.error("该站点有关联充电桩，删除失败！");
+ }
+ for (Integer id : ids) {
+ Site site = this.getById(id);
+ site.setDelFlag(true);
+ this.updateById(site);
+ }
return AjaxResult.success();
}
@@ -153,4 +223,28 @@
pageInfo.setRecords(list);
return pageInfo;
}
+
+ @Override
+ public SiteDetailVO getDetailById(Integer siteId) {
+ return this.baseMapper.getDetailById(siteId);
+ }
+
+
+ /**
+ * 设置站点计费策略
+ * @param id 站点id
+ * @param accountingStrategyId 计费策略id
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void setAccountingStrategy(Integer id, Integer accountingStrategyId) {
+ Site site = this.getById(id);
+ site.setAccountingStrategyId(accountingStrategyId);
+ 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);
+ }
+ chargingGunService.updateBatchById(list);
+ }
}
--
Gitblit v1.7.1