From 3ee0ff0bd24d4df9b795146ece6da43a78bf8bd0 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 12 十二月 2023 20:55:18 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/LiftProtocol.java | 41 +++++++++++++++++++++++++++++------------
1 files changed, 29 insertions(+), 12 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 abc2b26..ed9bd30 100644
--- a/src/main/java/com/zy/core/model/protocol/LiftProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/LiftProtocol.java
@@ -115,12 +115,24 @@
/**
* 浣滀笟鏍囪
*/
- private Boolean pakMk = true;
+ private Boolean pakMk = false;
+
+ /**
+ * 鐙崰浠ょ墝
+ * 鏈浠诲姟鍗犳嵁锛屼护鐗屼负0
+ * 琚换鍔″崰鎹紝灏嗕换鍔″彿璧嬪�肩粰浠ょ墝
+ */
+ private Integer token = 0;
/**
* 浠诲姟鍛戒护
*/
private LiftAssignCommand assignCommand;
+
+ /**
+ * 鎸囦护涓嬪彂鏃堕棿
+ */
+ private Long sendTime = 0L;
/**
* 璁剧疆鎻愬崌鏈虹姸鎬�
@@ -140,20 +152,22 @@
// 鏄惁澶勪簬绌洪棽寰呭懡鐘舵��
public Boolean isIdle(Short taskNo) {
- if(this.taskNo == null
- || this.busy == null
+ if(this.busy == null
|| this.model == null
|| this.deviceError == null
|| this.pakMk == null
+ || this.token == null
){
return false;
}
- boolean res = (this.taskNo == 0 || this.taskNo.intValue() == taskNo.intValue())
- && !this.busy
+ boolean res =
+// (this.taskNo.equals(this.completeTaskNo) || this.taskNo.intValue() == taskNo.intValue())
+ !this.busy
&& this.model
- && this.pakMk.equals(true)
+ && !this.pakMk
&& !this.deviceError
+ && this.protocolStatusType.equals(LiftProtocolStatusType.IDLE)
;
return res;
}
@@ -165,23 +179,26 @@
|| this.model == null
|| this.deviceError == null
|| this.pakMk == null
+ || this.token == null
){
return false;
}
- boolean res = this.taskNo == 0
- && !this.busy
+ boolean res =
+// this.taskNo.equals(this.completeTaskNo)
+ !this.busy
&& this.model
- && this.pakMk.equals(true)
+ && !this.pakMk
&& !this.deviceError
+ && this.token == 0
+ && this.protocolStatusType.equals(LiftProtocolStatusType.IDLE)
;
return res;
}
// 鏄惁澶勪簬绌洪棽寰呭懡鐘舵�侊紝涓嶅垽鏂换鍔″彿
public Boolean isIdleNoTask() {
- if(this.taskNo == null
- || this.busy == null
+ if(this.busy == null
|| this.model == null
|| this.deviceError == null
|| this.pakMk == null
@@ -191,7 +208,7 @@
boolean res = !this.busy
&& this.model
- && this.pakMk.equals(true)
+ && !this.pakMk
&& !this.deviceError
;
return res;
--
Gitblit v1.9.1