From 24393cdbdcc3f3e921050e733bd6a27208d4ea55 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 09 五月 2023 12:48:54 +0800
Subject: [PATCH] console.html fixed
---
src/main/java/com/zy/core/model/protocol/LiftProtocol.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/LiftProtocol.java b/src/main/java/com/zy/core/model/protocol/LiftProtocol.java
index ff69c13..c471351 100644
--- a/src/main/java/com/zy/core/model/protocol/LiftProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/LiftProtocol.java
@@ -190,6 +190,11 @@
private Boolean pakMk = true;
/**
+ * 鍥涘悜绌挎杞﹁皟搴︽彁鍗囨満鏃讹紝闇�瑕侀攣瀹氭鏍囪
+ */
+ private Boolean securityMk = false;
+
+ /**
* 浠诲姟鍛戒护
*/
private LiftAssignCommand assignCommand;
@@ -216,12 +221,23 @@
// 鏄惁澶勪簬绌洪棽寰呭懡鐘舵��
public Boolean isIdle() {
+ if(this.taskNo == null
+ || this.liftLock == null
+ || this.ready == null
+ || this.running == null
+ || this.mode == null
+ || this.pakMk == null
+ ){
+ return false;
+ }
+
boolean res = this.taskNo == 0
&& !this.liftLock
&& this.ready
&& !this.running
&& this.mode
&& this.pakMk.equals(true)
+ && !this.securityMk
;
return res;
}
--
Gitblit v1.9.1