From a8d4353d8e0bd40a10b2c1eb0c437de9780b8c5e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 22 十月 2024 16:16:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java | 10 +++++-----
1 files changed, 5 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 6976fdc..1c55a4d 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
@@ -356,7 +356,7 @@
ChargeMonitoring chargeMonitoring = new ChargeMonitoring();
chargeMonitoring.setPhone(sites.size() == 1 ? sites.get(0).getPhone() : "");
chargeMonitoring.setAddress(sites.size() == 1 ? sites.get(0).getAddress() : "");
- chargeMonitoring.setTerminalTotal(sites.size());
+ chargeMonitoring.setTerminalTotal(total.size());
chargeMonitoring.setCharging(charging.size());
chargeMonitoring.setNotCharged(total.size() - charging.size());
chargeMonitoring.setRatedPower(ratedPower.setScale(4, RoundingMode.HALF_EVEN));
@@ -442,7 +442,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 +488,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 +504,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