From ac2ce578ab4f44b8022bf3eedfd4fd0ba5ff1c06 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期日, 30 三月 2025 19:11:38 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingPileServiceImpl.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 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 398afb2..3632b19 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
@@ -200,6 +200,7 @@
 					return AjaxResult.error("华为创建设备失败");
 				}
 			}else{
+				log.error("华为创建设备失败" + JSON.toJSONString(deviceResp));
 				return AjaxResult.error("华为创建设备失败");
 			}
 		}else{
@@ -401,7 +402,11 @@
 					TChargingOrder chargingOrder = chargingOrderClient.getOrderDetailByGunId(chargingGun.getId()).getData();
 					if(Objects.nonNull(chargingOrder)){
 						UploadRealTimeMonitoringData uploadRealTimeMonitoringData = uploadRealTimeMonitoringDataClient.chargingOrderInfo(chargingOrder.getCode()).getData();
-						chargingGun.setSoc(uploadRealTimeMonitoringData.getSoc());
+						if(null != uploadRealTimeMonitoringData){
+							chargingGun.setSoc(uploadRealTimeMonitoringData.getSoc());
+						}else{
+							chargingGun.setSoc(0);
+						}
 					}else {
 						chargingGun.setSoc(100);
 					}
@@ -693,7 +698,8 @@
 		}
 		for (TChargingGun chargingGun : list) {
 			Long time = (Long) charging_gun_online.get(chargingGun.getFullNumber());
-			if(null != time && System.currentTimeMillis() - time > 60000){
+			//判断设备是否真的脸1分钟(1分钟+代码中的30秒间隔处理存储)
+			if(null != time && System.currentTimeMillis() - time > 90000){
 				TChargingGun chargingGun1 = new TChargingGun();
 				chargingGun1.setId(chargingGun.getId());
 				chargingGun1.setStatus(1);

--
Gitblit v1.7.1