From bce5a6d8ddcb867e35e7c5d57d7a48bef2617bbf Mon Sep 17 00:00:00 2001
From: MercuryZ <zdmisif@126.com>
Date: 星期五, 23 九月 2022 17:14:43 +0800
Subject: [PATCH] fix bug
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java | 8 ++------
1 files changed, 2 insertions(+), 6 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 89ef4ee..60d2e7e 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
@@ -142,7 +142,7 @@
System.out.println("璁剧疆璐圭巼寮�濮�");
C3mCharging c3mCharging1 = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getMcuUdid, mcuUdid).last("limit 1"));
List<C3mChargingCharge> list = c3mChargingChargeService.list(Wrappers.lambdaQuery(C3mChargingCharge.class).eq(C3mChargingCharge::getC3Id, c3mCharging1.getC3Id()));
- if (list == null && list.size() == 0) {//璐圭巼琛ㄤ腑娌℃湁姝ゅ厖鐢垫々鏁版嵁鏃� 娣诲姞榛樿璐圭巼
+ if (list == null || list.size() == 0) {//璐圭巼琛ㄤ腑娌℃湁姝ゅ厖鐢垫々鏁版嵁鏃� 娣诲姞榛樿璐圭巼
c3mChargingChargeService.initCharge((c3mCharging1.getC3Id()).intValue());
}
String rateState = setRate(newC3Mac, list, true);
@@ -480,7 +480,6 @@
/**
* 缁撴潫鍏呯數
- *
*/
@Transactional(rollbackFor = Exception.class)
public String finishCharging(Long c3Id, String openId) {
@@ -1064,7 +1063,6 @@
/**
* 杞噸鍚�
- *
*/
public String restartCharging(Long c3Id) {
C3mCharging one = getById(c3Id);
@@ -1122,9 +1120,7 @@
* 娣诲姞鍏呯數妗� 鏃ュ織璁板綍缁撴潫
*/
- return
-
- save(c3mCharging);
+ return save(c3mCharging);
}
--
Gitblit v1.9.3