From 3b533f35c37e990d8ef6de1c8ee7c0cd7ffc6dbf Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 24 十月 2024 15:50:45 +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/TChargingPileServiceImpl.java | 174 ++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 104 insertions(+), 70 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 3477646..5a8e7ee 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
@@ -9,6 +9,7 @@
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.TFaultMessage;
import com.ruoyi.chargingPile.api.query.BatchSetAccountingStrategy;
import com.ruoyi.chargingPile.api.query.PageChargingPileList;
import com.ruoyi.chargingPile.api.vo.TChargingGunVO;
@@ -19,10 +20,7 @@
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;
-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.StringUtils;
import com.ruoyi.common.core.web.domain.AjaxResult;
@@ -51,6 +49,7 @@
import java.math.MathContext;
import java.math.RoundingMode;
import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -104,6 +103,9 @@
@Resource
private RedisService redisService;
+
+ @Resource
+ private TFaultMessageService faultMessageService;
@@ -298,8 +300,14 @@
List<TChargingGun> chargingGunList = chargingGuns.stream().filter(gun -> gun.getChargingPileId().equals(item.getId())).collect(Collectors.toList());
for (TChargingGun chargingGun : chargingGunList) {
if(chargingGun.getStatus().equals(4)){
- // TODO 查询正在充电的单子的实时记录
- chargingGun.setSoc(100);
+ // 查询正在充电的单子的实时记录
+ TChargingOrder chargingOrder = chargingOrderClient.getOrderDetailByGunId(chargingGun.getId()).getData();
+ if(Objects.nonNull(chargingOrder)){
+ UploadRealTimeMonitoringData uploadRealTimeMonitoringData = uploadRealTimeMonitoringDataClient.chargingOrderInfo(chargingOrder.getCode()).getData();
+ chargingGun.setSoc(uploadRealTimeMonitoringData.getSoc());
+ }else {
+ chargingGun.setSoc(100);
+ }
}
if(chargingGun.getStatus().equals(5)){
chargingGun.setSoc(100);
@@ -320,7 +328,7 @@
public ChargeMonitoring chargeMonitoring(Integer siteId) {
//获取当前登录账户的站点权限数据
Set<Integer> siteIds = new HashSet<>();
- if(null == siteId){
+ if(0 == siteId){
SysUser sysUser = sysUserClient.getSysUser(SecurityUtils.getUserId()).getData();
Integer roleType = sysUser.getRoleType();
Integer objectId = sysUser.getObjectId();
@@ -334,12 +342,20 @@
List<Integer> data1 = roleSiteClient.getSiteIds(data2.get(0).getRoleId()).getData();
data.addAll(data1);
siteIds = new HashSet<>(data);
+ }else{
+ siteIds = null;
}
}
}else{
siteIds.add(siteId);
}
- List<Site> sites = siteService.listByIds(siteIds);
+ List<Site> sites = null;
+ if(null == siteIds){
+ sites = siteService.list(new LambdaQueryWrapper<Site>().eq(Site::getDelFlag, 0));
+ siteIds = sites.stream().map(Site::getId).collect(Collectors.toSet());
+ }else{
+ sites = siteService.listByIds(siteIds);
+ }
List<TChargingGun> total = chargingGunService.list(new LambdaQueryWrapper<TChargingGun>().in(TChargingGun::getSiteId, siteIds).eq(TChargingGun::getDelFlag, 0));
List<TChargingGun> charging = chargingGunService.list(new LambdaQueryWrapper<TChargingGun>().in(TChargingGun::getSiteId, siteIds).eq(TChargingGun::getStatus, 4).eq(TChargingGun::getDelFlag, 0));
BigDecimal ratedPower = total.stream().map(TChargingGun::getRatedPower).reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -361,9 +377,9 @@
}
List<String> dates = new ArrayList<>();
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MMM-dd");
- Calendar calendar = Calendar.getInstance();
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
for (int i = 6; i >= 0; i--) {
+ Calendar calendar = Calendar.getInstance();
calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - i);
dates.add(sdf.format(calendar.getTime()));
}
@@ -382,7 +398,7 @@
if(list.size() == 0){
value2.add(0D);
}else{
- Double datum1 = new BigDecimal(datum).divide(new BigDecimal(list.size()).multiply(v).multiply(new BigDecimal(24))).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
+ Double datum1 = new BigDecimal(datum).divide(new BigDecimal(list.size()).multiply(v).multiply(new BigDecimal(24)), new MathContext(4, RoundingMode.HALF_EVEN)).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
value2.add(datum1);
}
}
@@ -404,7 +420,7 @@
public ChargingGunCountMonitoring getChargingGunCountMonitoring(Integer siteId) {
//获取当前登录账户的站点权限数据
Set<Integer> siteIds = new HashSet<>();
- if(null == siteId){
+ if(0 == siteId){
SysUser sysUser = sysUserClient.getSysUser(SecurityUtils.getUserId()).getData();
Integer roleType = sysUser.getRoleType();
Integer objectId = sysUser.getObjectId();
@@ -418,6 +434,9 @@
List<Integer> data1 = roleSiteClient.getSiteIds(data2.get(0).getRoleId()).getData();
data.addAll(data1);
siteIds = new HashSet<>(data);
+ }else{
+ List<Site> list = siteService.list(new LambdaQueryWrapper<Site>().eq(Site::getDelFlag, 0));
+ siteIds = list.stream().map(Site::getId).collect(Collectors.toSet());
}
}
}else{
@@ -431,7 +450,7 @@
//充电中
long charging = list.stream().filter(s -> s.getStatus().equals(4)).count();
//离网
- long offline = list.stream().filter(s -> s.getStatus().equals(0)).count();
+ long offline = list.stream().filter(s -> s.getStatus().equals(1)).count();
//故障
long breakdown = list.stream().filter(s -> s.getStatus().equals(7)).count();
ChargingGunCountMonitoring chargingGunCountMonitoring = new ChargingGunCountMonitoring();
@@ -452,7 +471,7 @@
public PageInfo<ChargingGunMonitoring> getChargingGunMonitoring(GetChargingGunMonitoring query) {
//获取当前登录账户的站点权限数据
Set<Integer> siteIds = new HashSet<>();
- if(null == query.getSiteId()){
+ if(0 == query.getSiteId()){
SysUser sysUser = sysUserClient.getSysUser(SecurityUtils.getUserId()).getData();
Integer roleType = sysUser.getRoleType();
Integer objectId = sysUser.getObjectId();
@@ -466,6 +485,9 @@
List<Integer> data1 = roleSiteClient.getSiteIds(data2.get(0).getRoleId()).getData();
data.addAll(data1);
siteIds = new HashSet<>(data);
+ }else{
+ List<Site> list = siteService.list(new LambdaQueryWrapper<Site>().eq(Site::getDelFlag, 0));
+ siteIds = list.stream().map(Site::getId).collect(Collectors.toSet());
}
}
}else{
@@ -474,8 +496,8 @@
if(null != query.getStatus() && 0 < query.getStatus().size()){
if(query.getStatus().contains(3)){
+ query.getStatus().add(5);
query.getStatus().add(6);
- query.getStatus().add(7);
}
}
PageInfo<ChargingGunMonitoring> pageInfo = new PageInfo<>(query.getPageCurr(), query.getPageSize());
@@ -487,64 +509,63 @@
}
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());
- }
-
- UploadRealTimeMonitoringData data = uploadRealTimeMonitoringDataClient.chargingOrderInfo(chargingOrder.getCode()).getData();
- gunMonitoring.setChargingRatio(BigDecimal.valueOf(data.getSoc()));
- gunMonitoring.setElectricQuantity(data.getCharging_degree().toString());
- gunMonitoring.setSoc(data.getSoc().toString());
- gunMonitoring.setElectricCurrent(data.getOutput_current().toString());
- gunMonitoring.setVoltage(data.getOutput_voltage().toString());
- switch (data.getHardware_fault()){
- case 1:
- gunMonitoring.setFaultCause("急停按钮动作故障");
- break;
- case 2:
- gunMonitoring.setFaultCause("无可用整流模块");
- break;
- case 3:
- gunMonitoring.setFaultCause("出风口温度过高");
- break;
- case 4:
- gunMonitoring.setFaultCause("交流防雷故障");
- break;
- case 5:
- gunMonitoring.setFaultCause("交直流模块 DC20 通信中断");
- break;
- case 6:
- gunMonitoring.setFaultCause("绝缘检测模块 FC08 通信中断");
- break;
- case 7:
- gunMonitoring.setFaultCause("电度表通信中断");
- break;
- case 8:
- gunMonitoring.setFaultCause("读卡器通信中断");
- break;
- case 9:
- gunMonitoring.setFaultCause("RC10 通信中断");
- break;
- case 10:
- gunMonitoring.setFaultCause("风扇调速板故障");
- break;
- case 11:
- gunMonitoring.setFaultCause("直流熔断器故障");
- break;
- case 12:
- gunMonitoring.setFaultCause("高压接触器故障");
- break;
- case 13:
- gunMonitoring.setFaultCause("门打开");
- break;
+ if(null != chargingOrder){
+ Long appUserCarId = chargingOrder.getAppUserCarId();
+ if(null != appUserCarId){
+ TAppUserCar tAppUserCar = appUserCarClient.getCarByIds(Arrays.asList(appUserCarId)).getData().get(0);
+ gunMonitoring.setLicensePlate(tAppUserCar.getLicensePlate());
+ }
+
+ UploadRealTimeMonitoringData data = uploadRealTimeMonitoringDataClient.chargingOrderInfo(chargingOrder.getCode()).getData();
+ gunMonitoring.setChargingRatio(BigDecimal.valueOf(data.getSoc()));
+ gunMonitoring.setElectricQuantity(data.getCharging_degree().toString());
+ gunMonitoring.setSoc(data.getSoc().toString());
+ gunMonitoring.setElectricCurrent(data.getOutput_current().toString());
+ gunMonitoring.setVoltage(data.getOutput_voltage().toString());
+ switch (data.getHardware_fault()){
+ case 1:
+ gunMonitoring.setFaultCause("急停按钮动作故障");
+ break;
+ case 2:
+ gunMonitoring.setFaultCause("无可用整流模块");
+ break;
+ case 3:
+ gunMonitoring.setFaultCause("出风口温度过高");
+ break;
+ case 4:
+ gunMonitoring.setFaultCause("交流防雷故障");
+ break;
+ case 5:
+ gunMonitoring.setFaultCause("交直流模块 DC20 通信中断");
+ break;
+ case 6:
+ gunMonitoring.setFaultCause("绝缘检测模块 FC08 通信中断");
+ break;
+ case 7:
+ gunMonitoring.setFaultCause("电度表通信中断");
+ break;
+ case 8:
+ gunMonitoring.setFaultCause("读卡器通信中断");
+ break;
+ case 9:
+ gunMonitoring.setFaultCause("RC10 通信中断");
+ break;
+ case 10:
+ gunMonitoring.setFaultCause("风扇调速板故障");
+ break;
+ case 11:
+ gunMonitoring.setFaultCause("直流熔断器故障");
+ break;
+ case 12:
+ gunMonitoring.setFaultCause("高压接触器故障");
+ break;
+ case 13:
+ gunMonitoring.setFaultCause("门打开");
+ break;
+ }
}
}
-
-
}
return pageInfo.setRecords(chargingGunMonitoring);
}
@@ -567,6 +588,19 @@
}
if(datas.size() > 0){
+ for (TChargingPile data : datas) {
+ if(data.getStatus() == 1){
+ TFaultMessage faultMessage = new TFaultMessage();
+ faultMessage.setSiteId(data.getSiteId());
+ faultMessage.setChargingPileId(data.getId());
+ faultMessage.setStatus(1);
+ faultMessage.setDownTime(LocalDateTime.now());
+ faultMessage.setCreateTime(LocalDateTime.now());
+ faultMessage.setDelFlag(false);
+ faultMessage.setContent("设备离线");
+ faultMessageService.save(faultMessage);
+ }
+ }
this.updateBatchById(datas);
}
}
--
Gitblit v1.7.1