From 0c0ca0349e7392cd08d8bb1417f51c320e77088d Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期六, 17 八月 2024 15:58:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java | 136 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 131 insertions(+), 5 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 ccf8f17..a6567a5 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
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.account.api.feignClient.AppUserCarClient;
+import com.ruoyi.account.api.model.TAppUserCar;
import com.ruoyi.chargingPile.api.dto.PageChargingPileListDTO;
import com.ruoyi.chargingPile.api.model.Site;
import com.ruoyi.chargingPile.api.model.TChargingGun;
@@ -13,6 +15,9 @@
import com.ruoyi.chargingPile.api.vo.TChargingPileVO;
import com.ruoyi.chargingPile.domain.SiteMenu;
import com.ruoyi.chargingPile.dto.ChargeMonitoring;
+import com.ruoyi.chargingPile.dto.ChargingGunCountMonitoring;
+import com.ruoyi.chargingPile.dto.ChargingGunMonitoring;
+import com.ruoyi.chargingPile.dto.GetChargingGunMonitoring;
import com.ruoyi.chargingPile.mapper.TChargingPileMapper;
import com.ruoyi.chargingPile.service.IPartnerService;
import com.ruoyi.chargingPile.service.ISiteService;
@@ -23,6 +28,8 @@
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.order.api.feignClient.ChargingOrderAccountingStrategyClient;
+import com.ruoyi.order.api.feignClient.ChargingOrderClient;
+import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.other.api.feignClient.RoleSiteClient;
import com.ruoyi.other.api.feignClient.UserSiteClient;
import com.ruoyi.system.api.domain.SysUser;
@@ -68,6 +75,12 @@
@Resource
private ChargingOrderAccountingStrategyClient chargingOrderAccountingStrategyClient;
+
+ @Resource
+ private ChargingOrderClient chargingOrderClient;
+
+ @Resource
+ private AppUserCarClient appUserCarClient;
@@ -209,8 +222,7 @@
}
for (Integer id : ids) {
TChargingPile chargingPile = this.getById(id);
- chargingPile.setDelFlag(true);
- this.updateById(chargingPile);
+ this.removeById(chargingPile);
}
return AjaxResult.success();
}
@@ -250,6 +262,7 @@
*/
@Override
public ChargeMonitoring chargeMonitoring(Integer siteId) {
+ //获取当前登录账户的站点权限数据
Set<Integer> siteIds = new HashSet<>();
if(null == siteId){
SysUser sysUser = sysUserClient.getSysUser(SecurityUtils.getUserId()).getData();
@@ -292,14 +305,127 @@
calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - i);
dates.add(sdf.format(calendar.getTime()));
}
- List<List<Map<String, Object>>> value1 = chargingOrderAccountingStrategyClient.getTotalElectricQuantity(6).getData();
+ List<List<Map<String, Object>>> value1 = chargingOrderAccountingStrategyClient.getTotalElectricQuantity(6, siteIds).getData();
Map<String, Object> chargeTrend = new HashMap<>();
chargeTrend.put("date", dates);
chargeTrend.put("value", value1);
chargeMonitoring.setChargeTrend(chargeTrend);
-
-// chargeMonitoring.setUtilizationTrend();
+ //每日利用率=当日充电度数/（总桩数量*桩总功率*24小时）
+ List<TChargingPile> list = this.list(new LambdaQueryWrapper<TChargingPile>().in(TChargingPile::getSiteId, siteIds).eq(TChargingPile::getDelFlag, 0));
+ BigDecimal v = list.stream().map(TChargingPile::getRatedPower).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(4, RoundingMode.HALF_EVEN);
+ List<Double> data = chargingOrderAccountingStrategyClient.getDailyChargingDegree(6, siteIds).getData();
+ List<Double> value2 = new ArrayList<>();
+ for (Double datum : data) {
+ Double datum1 = new BigDecimal(datum).divide(new BigDecimal(list.size()).multiply(v).multiply(new BigDecimal(24))).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
+ value2.add(datum1);
+ }
+ Map<String, Object> utilizationTrend = new HashMap<>();
+ utilizationTrend.put("date", dates);
+ utilizationTrend.put("value", value2);
+ chargeMonitoring.setUtilizationTrend(utilizationTrend);
return chargeMonitoring;
}
+
+ /**
+ * 获取充电枪各种状态汇总
+ * @param siteId 站点id
+ * @return
+ */
+ @Override
+ public ChargingGunCountMonitoring getChargingGunCountMonitoring(Integer siteId) {
+ //获取当前登录账户的站点权限数据
+ Set<Integer> siteIds = new HashSet<>();
+ if(null == siteId){
+ SysUser sysUser = sysUserClient.getSysUser(SecurityUtils.getUserId()).getData();
+ Integer roleType = sysUser.getRoleType();
+ Integer objectId = sysUser.getObjectId();
+ if(2 == roleType){
+ siteIds = 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);
+ siteIds = new HashSet<>(data);
+ }
+ }
+ }else{
+ siteIds.add(siteId);
+ }
+ List<TChargingGun> list = chargingGunService.list(new LambdaQueryWrapper<TChargingGun>().in(TChargingGun::getSiteId, siteIds).eq(TChargingGun::getDelFlag, 0));
+ //空闲
+ long leisure = list.stream().filter(s -> s.getStatus().equals(2)).count();
+ //已插枪
+ long loaded = list.stream().filter(s -> Arrays.asList(3, 5, 6).contains(s.getStatus())).count();
+ //充电中
+ long charging = list.stream().filter(s -> s.getStatus().equals(4)).count();
+ //离网
+ long offline = list.stream().filter(s -> s.getStatus().equals(0)).count();
+ //故障
+ long breakdown = list.stream().filter(s -> s.getStatus().equals(7)).count();
+ ChargingGunCountMonitoring chargingGunCountMonitoring = new ChargingGunCountMonitoring();
+ chargingGunCountMonitoring.setLeisure(leisure);
+ chargingGunCountMonitoring.setLoaded(loaded);
+ chargingGunCountMonitoring.setCharging(charging);
+ chargingGunCountMonitoring.setOffline(offline);
+ chargingGunCountMonitoring.setBreakdown(breakdown);
+ return chargingGunCountMonitoring;
+ }
+
+ /**
+ * 获取充电枪监控数据
+ * @param query
+ * @return
+ */
+ @Override
+ public PageInfo<ChargingGunMonitoring> getChargingGunMonitoring(GetChargingGunMonitoring query) {
+ //获取当前登录账户的站点权限数据
+ Set<Integer> siteIds = new HashSet<>();
+ if(null == query.getSiteId()){
+ SysUser sysUser = sysUserClient.getSysUser(SecurityUtils.getUserId()).getData();
+ Integer roleType = sysUser.getRoleType();
+ Integer objectId = sysUser.getObjectId();
+ if(2 == roleType){
+ siteIds = 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);
+ siteIds = new HashSet<>(data);
+ }
+ }
+ }else{
+ siteIds.add(query.getSiteId());
+ }
+ // todo 待完善
+ if(null != query.getStatus() && 0 < query.getStatus().size()){
+ if(query.getStatus().contains(3)){
+ query.getStatus().add(6);
+ query.getStatus().add(7);
+ }
+ }
+ PageInfo<ChargingGunMonitoring> pageInfo = new PageInfo<>(query.getPageCurr(), query.getPageSize());
+ List<ChargingGunMonitoring> chargingGunMonitoring = this.baseMapper.getChargingGunMonitoring(pageInfo, siteIds, query);
+ for (ChargingGunMonitoring gunMonitoring : chargingGunMonitoring) {
+ Integer status = gunMonitoring.getStatus();
+ if(status == 5 || status == 6){
+ gunMonitoring.setStatus(3);
+ }
+ if(status == 4){
+ Integer id = gunMonitoring.getId();
+ //根据订单数据查询车牌号
+ TChargingOrder chargingOrder = chargingOrderClient.getOrderDetailByGunId(id).getData();
+ Long appUserCarId = chargingOrder.getAppUserCarId();
+ if(null != appUserCarId){
+ TAppUserCar tAppUserCar = appUserCarClient.getCarByIds(Arrays.asList(appUserCarId)).getData().get(0);
+ gunMonitoring.setLicensePlate(tAppUserCar.getLicensePlate());
+ }
+ }
+ }
+ return pageInfo.setRecords(chargingGunMonitoring);
+ }
}
--
Gitblit v1.7.1