From aa73bc92cf889589097267ad72edb2528a2b6b7e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 30 十一月 2022 17:09:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/SteProtocol.java | 25 ++++++++++---------------
1 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/SteProtocol.java b/src/main/java/com/zy/core/model/protocol/SteProtocol.java
index 42515cc..dc815d7 100644
--- a/src/main/java/com/zy/core/model/protocol/SteProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/SteProtocol.java
@@ -70,6 +70,12 @@
*/
public Float charge = 0.0F;
+ public void setCharge(Float charge) {
+ if (charge >= 0) {
+ this.charge = charge;
+ }
+ }
+
/**
* 婊＄數
*/
@@ -257,6 +263,7 @@
// 鏄惁澶勪簬绌洪棽寰呭懡鐘舵��
public Boolean isIdle() {
boolean res = this.statusType.equals(SteStatusType.IDLE)
+ && this.mode == 1
&& this.pakMk.equals("N")
&& !isAlarm()
&& this.chargeStatus == 0
@@ -282,22 +289,10 @@
}
public Boolean isEnable() {
- if (Cools.isEmpty(row)) {
- if (row == 0) {
- return false;
- }
+ if (Cools.isEmpty(row, bay, lev)) {
+ return false;
}
- if (Cools.isEmpty(bay)) {
- if (bay == 0) {
- return false;
- }
- }
- if (Cools.isEmpty(lev)) {
- if (lev == 0) {
- return false;
- }
- }
- return true;
+ return row > 0 && bay > 0 && lev > 0;
}
}
--
Gitblit v1.9.1