From 15deef40aeb83d485fa1df9b5482b0deccfbdbc1 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 28 十月 2024 13:38:15 +0800
Subject: [PATCH] 修改
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java | 280 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 261 insertions(+), 19 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 5f8d3e5..aacf87e 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
@@ -2,22 +2,46 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.account.api.feignClient.AppUserClient;
+import com.ruoyi.account.api.model.TAppUser;
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.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.ISiteService;
-import com.ruoyi.chargingPile.service.TChargingGunService;
+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;
import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.integration.api.feignClient.IntegrationClient;
+import com.ruoyi.other.api.domain.TVip;
+import com.ruoyi.other.api.feignClient.RoleSiteClient;
+import com.ruoyi.other.api.feignClient.UserSiteClient;
+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.List;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* @author zhibing.pu
@@ -29,6 +53,34 @@
@Resource
private TChargingGunService chargingGunService;
+ @Resource
+ private TChargingPileService chargingPileService;
+
+ @Resource
+ private SysUserClient sysUserClient;
+
+ @Resource
+ private IPartnerService partnerService;
+
+ @Resource
+ private UserSiteClient userSiteClient;
+
+ @Resource
+ private RoleSiteClient roleSiteClient;
+ @Resource
+ private TokenService tokenService;
+ @Resource
+ private AppUserClient appUserClient;
+ @Resource
+ private VipClient vipClient;
+ @Resource
+ private SysUserRoleClient sysUserRoleClient;
+ @Resource
+ private TParkingLotService parkingLotService;
+
+ @Resource
+ private IntegrationClient integrationClient;
+
/**
@@ -38,11 +90,79 @@
*/
@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<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);
+ }
+ }
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);
}
-
+
+
+ @Override
+ public PageInfo<GetSiteListDTO> getSiteList1(Long userId) {
+ GetSiteList siteList = new GetSiteList();
+ siteList.setPageCurr(1);
+ siteList.setPageSize(9999);
+ Set<Integer> ids = null;
+ //校验合作商权限
+ SysUser sysUser = sysUserClient.getSysUser(userId).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<SysUserRoleVo> data2 = sysUserRoleClient.getRoleByUserId(sysUser.getUserId()).getData();
+ List<Integer> data1 = roleSiteClient.getSiteIds(data2.get(0).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, 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);
+ }
+
+
+
+
/**
* 添加站点信息
* @param site
@@ -118,9 +238,9 @@
if(StringUtils.isEmpty(site.getAddress())){
return AjaxResult.error("详细地址不能为空");
}
- if(StringUtils.isEmpty(site.getLon()) || StringUtils.isEmpty(site.getLat())){
- return AjaxResult.error("地图位置不能为空");
- }
+// if(StringUtils.isEmpty(site.getLon()) || StringUtils.isEmpty(site.getLat())){
+// return AjaxResult.error("地图位置不能为空");
+// }
if(StringUtils.isEmpty(site.getPhone())){
return AjaxResult.error("站点电话不能为空");
}
@@ -138,36 +258,158 @@
/**
* 删除站点
- * @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>().in(TChargingPile::getSiteId, Arrays.asList(ids))
+ .eq(TChargingPile::getDelFlag, 0));
+ if(count1 > 0){
+ return AjaxResult.error("该站点已添加充电桩，不可删除。");
+ }
+ for (Integer id : ids) {
+ Site site = this.getById(id);
+ this.removeById(site);
+ }
return AjaxResult.success();
}
-
-
+
+ @Override
+ public PageInfo<SiteVO> pageList(SiteQuery query,Integer isLogin) {
+ TAppUser appUser = null;
+ if(isLogin == 1){
+ // 获取当前登录用户id
+ Long userId = tokenService.getLoginUserApplet().getUserId();
+ // 根据id查询用户信息
+ appUser = appUserClient.getUserById(userId).getData();
+ }
+ PageInfo<SiteVO> pageInfo = new PageInfo<>(query.getPageCurr(),query.getPageSize());
+ List<SiteVO> list = this.baseMapper.pageList(query,pageInfo);
+ if(Objects.nonNull(appUser) && Objects.nonNull(appUser.getVipId())){
+ // 查询会员信息
+ TVip vip = vipClient.getInfo1(appUser.getVipId()).getData();
+ if(Objects.nonNull(vip) && vip.getType() == 2){
+ list.forEach(item -> {
+ item.setVipElectrovalence(vip.getDiscount().divide(new BigDecimal(10)).multiply(item.getServiceCharge()).add(item.getElectrovalenceOriginal()));
+ });
+ }
+ }
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
+
+ @Override
+ public SiteDetailVO getDetailById(SiteDetailQuery query) {
+ return this.baseMapper.getDetailById(query);
+ }
+
+ @Override
+ public List<Site> getSiteListParkLot() {
+ 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<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).distinct().collect(Collectors.toList());
+ if(!CollectionUtils.isEmpty(ids) && !CollectionUtils.isEmpty(siteIds)){
+ Iterator<Integer> iterator = ids.iterator();
+ while (iterator.hasNext()){
+ Integer next = iterator.next();
+ if(siteIds.contains(next)){
+ iterator.remove();
+ }
+ }
+ }
+ return this.baseMapper.getSiteListParkLot(ids);
+ }
+
+ @Override
+ public List<Site> getSiteListGun() {
+ 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<SysUserRoleVo> data2 = sysUserRoleClient.getRoleByUserId(sysUser.getUserId()).getData();
+ List<Integer> data1 = roleSiteClient.getSiteIds(data2.get(0).getRoleId()).getData();
+ data.addAll(data1);
+ ids = new HashSet<>(data);
+ }
+ }
+ return this.baseMapper.getSiteListGun(ids);
+ }
+
+ @Override
+ public List<SiteVO> getMapSiteList(SiteQuery query) {
+
+ if(StringUtils.isEmpty(query.getLon()) || StringUtils.isEmpty(query.getLat())){
+ return new ArrayList<>();
+ }
+
+ // 获取当前登录用户id
+ Long userId = tokenService.getLoginUserApplet().getUserId();
+ // 根据id查询用户信息
+ TAppUser appUser = appUserClient.getUserById(userId).getData();
+ List<SiteVO> list = this.baseMapper.getMapSiteList(query);
+ if(Objects.nonNull(appUser) && Objects.nonNull(appUser.getVipId())){
+ // 查询会员信息
+ TVip vip = vipClient.getInfo1(appUser.getVipId()).getData();
+ if(Objects.nonNull(vip) && vip.getType() == 2){
+ list.forEach(item -> {
+ item.setVipElectrovalence(vip.getDiscount().divide(new BigDecimal(10)).multiply(item.getServiceCharge()).add(item.getElectrovalenceOriginal()));
+ });
+ }
+ }
+ return list;
+ }
+
+
/**
* 设置站点计费策略
* @param id 站点id
* @param accountingStrategyId 计费策略id
*/
@Override
- @Transactional(propagation = Propagation.REQUIRES_NEW)
+ @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));
+ List<TChargingGun> list = chargingGunService.list(new LambdaQueryWrapper<TChargingGun>().in(TChargingGun::getSiteId, id).eq(TChargingGun::getDelFlag, 0));
for (TChargingGun tChargingGun : list) {
- tChargingGun.setChargingPileId(accountingStrategyId);
+ tChargingGun.setAccountingStrategyId(accountingStrategyId);
}
chargingGunService.updateBatchById(list);
+
+ //下发硬件数据
+ List<TChargingPile> list1 = chargingPileService.lambdaQuery().eq(TChargingPile::getSiteId, id).eq(TChargingPile::getDelFlag, 0).list();
+ for (TChargingPile tChargingPile : list1) {
+ integrationClient.setupBillingModel1(tChargingPile.getCode());
+ }
}
}
--
Gitblit v1.7.1