From ea4e6cf0a63fa8470846fd5188da9e912faf661e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 01 十一月 2024 10:01:24 +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/SiteServiceImpl.java | 92 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 73 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 80b0d10..3a4d301 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
@@ -1,30 +1,35 @@
package com.ruoyi.chargingPile.service.impl;
+import com.alibaba.fastjson2.JSON;
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.feignClient.AppUserVipDetailClient;
import com.ruoyi.account.api.model.TAppUser;
+import com.ruoyi.account.api.model.TAppUserVipDetail;
+import com.ruoyi.account.api.vo.GetAppUserVipDetail;
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.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.domain.R;
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;
@@ -36,9 +41,12 @@
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.math.BigDecimal;
import java.util.*;
+import java.util.stream.Collectors;
/**
* @author zhibing.pu
@@ -72,7 +80,13 @@
private VipClient vipClient;
@Resource
private SysUserRoleClient sysUserRoleClient;
-
+ @Resource
+ private TParkingLotService parkingLotService;
+
+ @Resource
+ private IntegrationClient integrationClient;
+ @Resource
+ private AppUserVipDetailClient vipDetailClient;
/**
@@ -80,6 +94,7 @@
* @param siteList
* @return
*/
+
@Override
public PageInfo<GetSiteListDTO> getSiteList(GetSiteList siteList) {
Set<Integer> ids = null;
@@ -87,12 +102,15 @@
SysUser sysUser = sysUserClient.getSysUser(SecurityUtils.getUserId()).getData();
Integer roleType = sysUser.getRoleType();
Integer objectId = sysUser.getObjectId();
+ R<Integer> admin = sysUserClient.isAdmin(SecurityUtils.getUserId());
//合作商
if(roleType == 2){
ids = partnerService.authSite(objectId, SiteMenu.SITE_LIST);
}else{
//非管理员需要根据角色和用户配置查询允许的站点数据
- if(!SecurityUtils.isAdmin(SecurityUtils.getUserId())){
+ //改用roleId=1来判断
+ if(admin.getData()!=1){
+// 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){
@@ -126,12 +144,14 @@
SysUser sysUser = sysUserClient.getSysUser(userId).getData();
Integer roleType = sysUser.getRoleType();
Integer objectId = sysUser.getObjectId();
+ R<Integer> admin = sysUserClient.isAdmin(SecurityUtils.getUserId());
+
//合作商
if(roleType == 2){
ids = partnerService.authSite(objectId, SiteMenu.SITE_LIST);
}else{
//非管理员需要根据角色和用户配置查询允许的站点数据
- if(!SecurityUtils.isAdmin(SecurityUtils.getUserId())){
+ if(admin.getData()!=1){
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();
@@ -230,9 +250,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("站点电话不能为空");
}
@@ -272,9 +292,9 @@
@Override
public PageInfo<SiteVO> pageList(SiteQuery query,Integer isLogin) {
TAppUser appUser = null;
+ // 获取当前登录用户id
+ Long userId = tokenService.getLoginUserApplet().getUserId();
if(isLogin == 1){
- // 获取当前登录用户id
- Long userId = tokenService.getLoginUserApplet().getUserId();
// 根据id查询用户信息
appUser = appUserClient.getUserById(userId).getData();
}
@@ -282,10 +302,19 @@
List<SiteVO> list = this.baseMapper.pageList(query,pageInfo);
if(Objects.nonNull(appUser) && Objects.nonNull(appUser.getVipId())){
// 查询会员信息
- TVip vip = vipClient.getInfo1(appUser.getVipId()).getData();
+// TVip vip = vipClient.getInfo1(appUser.getVipId()).getData();
+ GetAppUserVipDetail getAppUserVipDetail = new GetAppUserVipDetail();
+ getAppUserVipDetail.setAppUserId(userId);
+ getAppUserVipDetail.setVipId(appUser.getVipId());
+ R<TAppUserVipDetail> appUserVipDetail = vipDetailClient.getAppUserVipDetail(getAppUserVipDetail);
+ TAppUserVipDetail data1 = appUserVipDetail.getData();
+ String vipJson = data1.getVipJson();
+ TVip vip = JSON.parseObject(vipJson, TVip.class);
if(Objects.nonNull(vip) && vip.getType() == 2){
list.forEach(item -> {
- item.setVipElectrovalence(vip.getDiscount().multiply(item.getElectrovalence()));
+ if(Objects.nonNull(vip.getDiscount())){
+ item.setVipElectrovalence(vip.getDiscount().divide(new BigDecimal(10)).multiply(item.getServiceCharge()).add(item.getElectrovalenceOriginal()));
+ }
});
}
}
@@ -294,8 +323,8 @@
}
@Override
- public SiteDetailVO getDetailById(Integer siteId) {
- return this.baseMapper.getDetailById(siteId);
+ public SiteDetailVO getDetailById(SiteDetailQuery query) {
+ return this.baseMapper.getDetailById(query);
}
@Override
@@ -316,6 +345,18 @@
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);
@@ -358,10 +399,17 @@
List<SiteVO> list = this.baseMapper.getMapSiteList(query);
if(Objects.nonNull(appUser) && Objects.nonNull(appUser.getVipId())){
// 查询会员信息
- TVip vip = vipClient.getInfo1(appUser.getVipId()).getData();
+// TVip vip = vipClient.getInfo1(appUser.getVipId()).getData();
+ GetAppUserVipDetail getAppUserVipDetail = new GetAppUserVipDetail();
+ getAppUserVipDetail.setAppUserId(userId);
+ getAppUserVipDetail.setVipId(appUser.getVipId());
+ R<TAppUserVipDetail> appUserVipDetail = vipDetailClient.getAppUserVipDetail(getAppUserVipDetail);
+ TAppUserVipDetail data1 = appUserVipDetail.getData();
+ String vipJson = data1.getVipJson();
+ TVip vip = JSON.parseObject(vipJson, TVip.class);
if(Objects.nonNull(vip) && vip.getType() == 2){
list.forEach(item -> {
- item.setVipElectrovalence(vip.getDiscount().multiply(item.getElectrovalence()));
+ item.setVipElectrovalence(vip.getDiscount().divide(new BigDecimal(10)).multiply(item.getServiceCharge()).add(item.getElectrovalenceOriginal()));
});
}
}
@@ -380,10 +428,16 @@
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.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