From 87c4efe93e6fe31a9c989b4aa5cc0c8f559b845d Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 31 三月 2023 16:50:47 +0800
Subject: [PATCH] 提升机代码，四向穿梭车线程优化
---
src/main/java/com/zy/core/model/protocol/LiftProtocol.java | 66 +++++++++++++++++++++++++++++++++
1 files changed, 66 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 cd00e23..ff69c13 100644
--- a/src/main/java/com/zy/core/model/protocol/LiftProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/LiftProtocol.java
@@ -1,5 +1,13 @@
package com.zy.core.model.protocol;
+import com.core.common.SpringUtils;
+import com.zy.asrs.service.BasShuttleService;
+import com.zy.core.News;
+import com.zy.core.enums.LiftProtocolStatusType;
+import com.zy.core.enums.ShuttleErrorCodeType;
+import com.zy.core.enums.ShuttleProtocolStatusType;
+import com.zy.core.enums.ShuttleStatusType;
+import com.zy.core.model.command.LiftAssignCommand;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
@@ -19,6 +27,21 @@
* 浠诲姟鍙�
*/
private Short taskNo = 0;
+
+ /**
+ * 鍥涘悜绌挎杞﹀彿
+ */
+ private Short shuttleNo = 0;
+
+ /**
+ * 褰撳墠鎻愬崌鏈虹姸鎬侊紙鍐呴儴鑷垜缁存姢锛�
+ */
+ private Integer protocolStatus = 1;
+
+ /**
+ * 褰撳墠鎻愬崌鏈虹姸鎬佹灇涓�
+ */
+ private LiftProtocolStatusType protocolStatusType = LiftProtocolStatusType.IDLE;
/**
* 灞�
@@ -161,8 +184,51 @@
*/
private Short liftActualSpeed;
+ /**
+ * 浣滀笟鏍囪
+ */
+ private Boolean pakMk = true;
+
+ /**
+ * 浠诲姟鍛戒护
+ */
+ private LiftAssignCommand assignCommand;
+
public Short getLiftLockShortValue() {
return liftLock ? (short) 1 : (short) 0;
}
+ /**
+ * 璁剧疆鎻愬崌鏈虹姸鎬�
+ */
+ public void setProtocolStatus(Integer status) {
+ this.protocolStatus = status;
+ this.protocolStatusType = LiftProtocolStatusType.get(status);
+ }
+
+ /**
+ * 璁剧疆鎻愬崌鏈虹姸鎬�
+ */
+ public void setProtocolStatus(LiftProtocolStatusType status) {
+ this.protocolStatus = status.id;
+ this.protocolStatusType = status;
+ }
+
+ // 鏄惁澶勪簬绌洪棽寰呭懡鐘舵��
+ public Boolean isIdle() {
+ boolean res = this.taskNo == 0
+ && !this.liftLock
+ && this.ready
+ && !this.running
+ && this.mode
+ && this.pakMk.equals(true)
+ ;
+ return res;
+ }
+
+ public void setPositionArrivalFeedback(Short position) {
+ this.lev = position;//灞傞珮
+ this.positionArrivalFeedback = position;//浣嶇疆鍒拌揪鍙嶉
+ }
+
}
--
Gitblit v1.9.1