From d1343bb53cdff7bd2f42fa8cf0472dd295ac2cc3 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 05 七月 2023 08:43:12 +0800
Subject: [PATCH] 充电任务taskmodel
---
src/main/java/com/zy/core/model/protocol/LiftProtocol.java | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 45 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 fd78a3c..1eebef4 100644
--- a/src/main/java/com/zy/core/model/protocol/LiftProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/LiftProtocol.java
@@ -246,6 +246,29 @@
}
// 鏄惁澶勪簬绌洪棽寰呭懡鐘舵��
+ public Boolean isIdle(Short taskNo) {
+ 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.taskNo.intValue() == taskNo.intValue())
+ && !this.liftLock
+// && this.ready
+ && !this.running
+ && this.mode
+ && this.pakMk.equals(true)
+ && !this.securityMk
+ ;
+ return res;
+ }
+
+ // 鏄惁澶勪簬绌洪棽寰呭懡鐘舵��
public Boolean isIdle() {
if(this.taskNo == null
|| this.liftLock == null
@@ -268,6 +291,28 @@
return res;
}
+ // 鏄惁澶勪簬绌洪棽寰呭懡鐘舵�侊紝涓嶅垽鏂换鍔″彿
+ public Boolean isIdleNoTask() {
+ if(this.taskNo == null
+ || this.liftLock == null
+ || this.ready == null
+ || this.running == null
+ || this.mode == null
+ || this.pakMk == null
+ ){
+ return false;
+ }
+
+ boolean res = !this.liftLock
+// && this.ready
+ && !this.running
+ && this.mode
+ && this.pakMk
+ && !this.securityMk
+ ;
+ return res;
+ }
+
public void setPositionArrivalFeedback(Short position) {
Short lev = null;
switch (position) {
--
Gitblit v1.9.1