From 763f1aefee01fd1bacd3e64bb6ba2f77d8804232 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 22 十月 2024 12:25:57 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java | 7 ++++---
1 files changed, 4 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 cddd92b..6976fdc 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(total.size());
+ chargeMonitoring.setTerminalTotal(sites.size());
chargeMonitoring.setCharging(charging.size());
chargeMonitoring.setNotCharged(total.size() - charging.size());
chargeMonitoring.setRatedPower(ratedPower.setScale(4, RoundingMode.HALF_EVEN));
@@ -501,12 +501,13 @@
}
if(status == 4){
Integer id = gunMonitoring.getId();
- //根据订单数据查询车牌号
TChargingOrder chargingOrder = chargingOrderClient.getOrderDetailByGunId(id).getData();
if(null != chargingOrder){
Long appUserCarId = chargingOrder.getAppUserCarId();
TAppUserCar tAppUserCar = appUserCarClient.getCarByIds(Arrays.asList(appUserCarId)).getData().get(0);
- gunMonitoring.setLicensePlate(tAppUserCar.getLicensePlate());
+ if(null != tAppUserCar){
+ gunMonitoring.setLicensePlate(tAppUserCar.getLicensePlate());
+ }
UploadRealTimeMonitoringData data = uploadRealTimeMonitoringDataClient.chargingOrderInfo(chargingOrder.getCode()).getData();
gunMonitoring.setChargingRatio(BigDecimal.valueOf(data.getSoc()));
--
Gitblit v1.7.1