From e04c38cdd62af6e17d7ae45b7374ef4ec46a90f1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 24 十月 2024 13:45:11 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 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 e5a11ea..eca82dd 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
@@ -298,8 +298,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);
@@ -442,7 +448,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();
@@ -488,8 +494,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());
@@ -504,8 +510,8 @@
TChargingOrder chargingOrder = chargingOrderClient.getOrderDetailByGunId(id).getData();
if(null != chargingOrder){
Long appUserCarId = chargingOrder.getAppUserCarId();
- TAppUserCar tAppUserCar = appUserCarClient.getCarByIds(Arrays.asList(appUserCarId)).getData().get(0);
- if(null != tAppUserCar){
+ if(null != appUserCarId){
+ TAppUserCar tAppUserCar = appUserCarClient.getCarByIds(Arrays.asList(appUserCarId)).getData().get(0);
gunMonitoring.setLicensePlate(tAppUserCar.getLicensePlate());
}
--
Gitblit v1.7.1