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 | 5 ++---
1 files changed, 2 insertions(+), 3 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 f87998a..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
@@ -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());
@@ -501,7 +501,6 @@
}
if(status == 4){
Integer id = gunMonitoring.getId();
- //根据订单数据查询车牌号
TChargingOrder chargingOrder = chargingOrderClient.getOrderDetailByGunId(id).getData();
if(null != chargingOrder){
Long appUserCarId = chargingOrder.getAppUserCarId();
--
Gitblit v1.7.1