From b79c0fa3aa4f7dffe18ab419b6cf4ed47ebd22f9 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 27 八月 2024 17:33:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java | 66 +++++++++++++++++++++++++++++++-
1 files changed, 63 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java
index 06d2090..ac10f19 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java
@@ -1,16 +1,22 @@
package com.ruoyi.chargingPile.service.impl;
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.chargingPile.api.dto.TChargingGunDTO;
import com.ruoyi.chargingPile.api.model.TChargingGun;
+import com.ruoyi.chargingPile.api.model.TChargingPile;
import com.ruoyi.chargingPile.api.query.TChargingGunQuery;
+import com.ruoyi.chargingPile.api.vo.ChargingGunCountVO;
import com.ruoyi.chargingPile.api.vo.TChargingGunVO;
import com.ruoyi.chargingPile.api.vo.TMonitoringEquipmentVO;
import com.ruoyi.chargingPile.domain.SiteMenu;
import com.ruoyi.chargingPile.mapper.TChargingGunMapper;
import com.ruoyi.chargingPile.service.IPartnerService;
import com.ruoyi.chargingPile.service.TChargingGunService;
+import com.ruoyi.chargingPile.service.TChargingPileService;
+import com.ruoyi.common.core.enums.status.ChargingGunModeEnum;
+import com.ruoyi.common.core.enums.status.ChargingGunStatusEnum;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
@@ -19,12 +25,17 @@
import com.ruoyi.other.api.feignClient.UserSiteClient;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.util.Arrays;
import java.util.HashSet;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
import java.util.Set;
/**
@@ -49,6 +60,8 @@
@Resource
private RoleSiteClient roleSiteClient;
+ @Autowired
+ private TChargingPileService chargingPileService;
@@ -98,7 +111,8 @@
if(ajaxResult.isError()){
return ajaxResult;
}
- long count = this.count(new LambdaQueryWrapper<TChargingGun>().eq(TChargingGun::getCode, dto.getCode()).eq(TChargingGun::getDelFlag, 0));
+ long count = this.count(new LambdaQueryWrapper<TChargingGun>().eq(TChargingGun::getCode, dto.getCode())
+ .eq(TChargingGun::getDelFlag, 0));
if(count > 0){
return AjaxResult.error("接口编码已存在");
}
@@ -122,14 +136,60 @@
if(ajaxResult.isError()){
return ajaxResult;
}
- TChargingGun one = this.getOne(new LambdaQueryWrapper<TChargingGun>().eq(TChargingGun::getCode, dto.getCode()).eq(TChargingGun::getDelFlag, 0));
+ TChargingGun one = this.getOne(new LambdaQueryWrapper<TChargingGun>().eq(TChargingGun::getCode, dto.getCode())
+ .eq(TChargingGun::getDelFlag, 0));
if(null != one && !dto.getId().equals(one.getId())){
return AjaxResult.error("接口编码已存在");
}
this.updateById(dto);
return AjaxResult.success();
}
-
+
+ @Override
+ public Map<String, ChargingGunCountVO> getChargingGunCount(Integer siteId) {
+ Map<String, ChargingGunCountVO> map = new HashMap<>(4);
+ //查询充电桩
+ List<TChargingPile> pileList = chargingPileService.list(Wrappers.lambdaQuery(TChargingPile.class)
+ .eq(TChargingPile::getSiteId, siteId));
+ if(CollectionUtils.isEmpty(pileList)){
+ map.put("superSufficient", new ChargingGunCountVO(0,0));
+ map.put("fastSufficient", new ChargingGunCountVO(0,0));
+ map.put("slowSufficient", new ChargingGunCountVO(0,0));
+ map.put("totalSufficient", new ChargingGunCountVO(0,0));
+ return map;
+ }
+ Set<Integer> pileIds = pileList.stream().map(TChargingPile::getId).collect(Collectors.toSet());
+ // 查询全部充电枪
+ List<TChargingGun> list = this.list(Wrappers.lambdaQuery(TChargingGun.class).eq(TChargingGun::getSiteId, siteId)
+ .in(TChargingGun::getChargingPileId, pileIds));
+ int freeCount = 0;
+ // 超级充
+ ChargingGunCountVO superSufficient = getGunCount(ChargingGunModeEnum.SUPER_SUFFICIENT.getCode(), list);
+ freeCount += superSufficient.getFreeCount();
+ map.put("superSufficient", superSufficient);
+ // 快充
+ ChargingGunCountVO fastSufficient = getGunCount(ChargingGunModeEnum.FAST_SUFFICIENT.getCode(), list);
+ freeCount += fastSufficient.getFreeCount();
+ map.put("fastSufficient", fastSufficient);
+ // 慢充
+ ChargingGunCountVO slowSufficient = getGunCount(ChargingGunModeEnum.SLOW_SUFFICIENT.getCode(), list);
+ freeCount += slowSufficient.getFreeCount();
+ map.put("slowSufficient", slowSufficient);
+ ChargingGunCountVO chargingGunCountVO = new ChargingGunCountVO();
+ chargingGunCountVO.setTotalCount(list.size());
+ chargingGunCountVO.setFreeCount(freeCount);
+ map.put("totalSufficient", chargingGunCountVO);
+ return map;
+ }
+
+ private ChargingGunCountVO getGunCount(Integer chargeMode, List<TChargingGun> list){
+ ChargingGunCountVO chargingGunCountVO = new ChargingGunCountVO();
+ chargingGunCountVO.setTotalCount(list.stream().filter(tChargingGun -> tChargingGun.getChargeMode().equals(chargeMode)).collect(Collectors.toList()).size());
+ chargingGunCountVO.setFreeCount(list.stream().filter(tChargingGun -> tChargingGun.getChargeMode().equals(chargeMode)
+ && tChargingGun.getStatus()== ChargingGunStatusEnum.IDLE.getCode()).collect(Collectors.toList()).size());
+ return chargingGunCountVO;
+ }
+
/**
* 校验必填项
* @param dto
--
Gitblit v1.7.1