From a146097a15d719c60af3cdeb4de1f21aa7b5ca8d Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 20 九月 2024 10:47:53 +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/TChargingGunServiceImpl.java | 96 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 85 insertions(+), 11 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 e88f663..1918cc5 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
@@ -5,14 +5,14 @@
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.api.vo.*;
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;
@@ -23,16 +23,15 @@
import com.ruoyi.other.api.feignClient.UserSiteClient;
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.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.*;
import java.util.stream.Collectors;
-import java.util.Set;
/**
* <p>
@@ -56,6 +55,11 @@
@Resource
private RoleSiteClient roleSiteClient;
+ @Autowired
+ private TChargingPileService chargingPileService;
+
+ @Resource
+ private SysUserRoleClient sysUserRoleClient;
@@ -74,7 +78,8 @@
//非管理员需要根据角色和用户配置查询允许的站点数据
if(!SecurityUtils.isAdmin(SecurityUtils.getUserId())){
List<Integer> data = userSiteClient.getSiteIds(sysUser.getUserId()).getData();
- List<Integer> data1 = roleSiteClient.getSiteIds(sysUser.getRoleId()).getData();
+ List<SysUserRoleVo> data2 = sysUserRoleClient.getRoleByUserId(sysUser.getUserId()).getData();
+ List<Integer> data1 = roleSiteClient.getSiteIds(data2.get(0).getRoleId()).getData();
data.addAll(data1);
siteIds = new HashSet<>(data);
}
@@ -142,8 +147,20 @@
@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));
+ 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);
@@ -164,6 +181,63 @@
return map;
}
+ @Override
+ public GunStatusStatisticsVO gunStatusStatistics(List<Integer> siteIds) {
+ GunStatusStatisticsVO gunStatusStatisticsVO = new GunStatusStatisticsVO();
+
+ if(CollectionUtils.isEmpty(siteIds)){
+ Map<Integer, Integer> modeStatisticsNull = new HashMap<>();
+ modeStatisticsNull.put(1, 0);
+ modeStatisticsNull.put(2, 0);
+ modeStatisticsNull.put(3, 0);
+ gunStatusStatisticsVO.setModeStatistics(modeStatisticsNull);
+ Map<Integer, Integer> statusStatisticsNull = new HashMap<>();
+ statusStatisticsNull.put(1, 0);
+ statusStatisticsNull.put(2, 0);
+ statusStatisticsNull.put(3, 0);
+ gunStatusStatisticsVO.setStatusStatistics(statusStatisticsNull);
+ List<StatusModeStatisticsVO> statusModeStatistics = new ArrayList<>();
+ for (int i = 1; i < 4; i++) {
+ StatusModeStatisticsVO statusModeStatisticsVO = new StatusModeStatisticsVO();
+ statusModeStatisticsVO.setChargeMode(i);
+ statusModeStatisticsVO.setChargingCount(0);
+ statusModeStatisticsVO.setFilledCount(0);
+ statusModeStatisticsVO.setInsertCount(0);
+ statusModeStatisticsVO.setFreeCount(0);
+ statusModeStatistics.add(statusModeStatisticsVO);
+ }
+ gunStatusStatisticsVO.setStatusModeStatistics(statusModeStatistics);
+ }
+
+ Map<Integer, Integer> modeStatistics = this.baseMapper.getModeStatistics(siteIds);
+ gunStatusStatisticsVO.setModeStatistics(modeStatistics);
+
+ Map<Integer, Integer> statusStatistics = new HashMap<>();
+ // 离线
+ Long count = this.baseMapper.selectCount(Wrappers.lambdaQuery(TChargingGun.class)
+ .eq(TChargingGun::getStatus, 1));
+ statusStatistics.put(1, count.intValue());
+ // 故障
+ count = this.baseMapper.selectCount(Wrappers.lambdaQuery(TChargingGun.class)
+ .eq(TChargingGun::getStatus, 7));
+ statusStatistics.put(2, count.intValue());
+ // 充电中
+ count = this.baseMapper.selectCount(Wrappers.lambdaQuery(TChargingGun.class)
+ .in(TChargingGun::getStatus, Arrays.asList(3,4,5,6)));
+ statusStatistics.put(3, count.intValue());
+ gunStatusStatisticsVO.setModeStatistics(statusStatistics);
+
+ List<StatusModeStatisticsVO> statusModeStatisticsVOS = new ArrayList<>();
+ StatusModeStatisticsVO statusModeStatistics1 = this.baseMapper.getStatusModeStatistics(siteIds,1);
+ StatusModeStatisticsVO statusModeStatistics2 = this.baseMapper.getStatusModeStatistics(siteIds,2);
+ StatusModeStatisticsVO statusModeStatistics3 = this.baseMapper.getStatusModeStatistics(siteIds,3);
+ statusModeStatisticsVOS.add(statusModeStatistics1);
+ statusModeStatisticsVOS.add(statusModeStatistics2);
+ statusModeStatisticsVOS.add(statusModeStatistics3);
+ gunStatusStatisticsVO.setStatusModeStatistics(statusModeStatisticsVOS);
+ return gunStatusStatisticsVO;
+ }
+
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());
--
Gitblit v1.7.1