From e947320e6604a12f5fd6e323b0a885b9a77c1e95 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 29 八月 2022 18:09:24 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java
index 62c577e..e8ab57f 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java
@@ -47,7 +47,7 @@
@Slf4j
@AllArgsConstructor
public class C3ChargingService extends BaseServiceImpl<C3mChargingMapper, C3mCharging> {
- private C3mChargingMapper c3mChargingMapper;
+ private final C3mChargingMapper c3mChargingMapper;
private final C3mChargingChargeService c3mChargingChargeService;
private final PoleBindingService bindingService;
private final PoleService poleService;
@@ -110,7 +110,7 @@
System.out.println("璁剧疆璐圭巼寮�濮�");
C3mCharging c3mCharging1 = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getMcuUdid, mcuUdid));
List<C3mChargingCharge> list = c3mChargingChargeService.list(Wrappers.lambdaQuery(C3mChargingCharge.class).eq(C3mChargingCharge::getC3Id, c3mCharging1.getC3Id()));
- if (list.size() == 0) {//璐圭巼琛ㄤ腑娌℃湁姝ゅ厖鐢垫々鏁版嵁鏃� 娣诲姞榛樿璐圭巼
+ if (list == null && list.size() == 0) {//璐圭巼琛ㄤ腑娌℃湁姝ゅ厖鐢垫々鏁版嵁鏃� 娣诲姞榛樿璐圭巼
c3mChargingChargeService.initCharge((c3mCharging1.getC3Id()).intValue());
}
String rateState = setRate(c3Mac, list, true);
@@ -154,6 +154,12 @@
Thread.sleep(1000);
/**
+ * 鏄惁鏈夎繘琛屼腑鐨勪釜璁㈠崟
+ */
+ SpringContextHolder.getBean(C3mOrderService.class).stopCharingOrder( aPackage);
+
+
+ /**
* finally銆佸悓姝ョ粨鏉�
*/
System.out.println("鍚屾缁撴潫 寮�濮�");
--
Gitblit v1.9.3