From 8740b1c94ffd20b54b95962df886e43f722911c5 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 24 四月 2025 17:31:12 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/core/model/protocol/TaskProtocol.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/TaskProtocol.java b/src/main/java/com/zy/core/model/protocol/TaskProtocol.java
index 1e36720..927d04d 100644
--- a/src/main/java/com/zy/core/model/protocol/TaskProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/TaskProtocol.java
@@ -7,27 +7,42 @@
*/
@Data
public class TaskProtocol {
+ private volatile String taskNoDirection; // 浠诲姟鍙凤紙涓诲睘鎬э級
private volatile Long taskNo; // 浠诲姟鍙凤紙涓诲睘鎬э級
private volatile Long targetPosition = 0L; // 鐩爣浣嶇疆
- private volatile Long currentPosition = 0L; // 褰撳墠浣嶇疆
private volatile int isRunning = 0; // 杩愯鐘舵�� 0锛氬垵濮� 1锛氱瓑寰呮墽琛� 2锛氭墽琛屼腑 3锛氭墽琛屼腑鏂� 4锛氬畬缁�
private volatile int taskStatus = 0; //浣滀笟妯″紡 0锛氳璧� 1锛氬彇 2锛氭斁
+ private volatile boolean direction; // 鎵ц鏂瑰悜锛堥潰鏈濊建閬� 瀹氫綅鍊煎乏灏忓彸澶э級 true:宸� false:鍙�
+
public TaskProtocol(){}
- public TaskProtocol(Long taskNo, Long targetPosition, Long currentPosition, int isRunning, int taskStatus) {
+ public TaskProtocol(Long taskNo, Long targetPosition, int isRunning, int taskStatus, boolean direction) {
this.taskNo = taskNo;
this.targetPosition = targetPosition;
- this.currentPosition = currentPosition;
this.isRunning = isRunning;
this.taskStatus = taskStatus;
+ this.direction = direction;
}
public TaskProtocol(TaskProtocol taskProtocol) {
this.taskNo = taskProtocol.getTaskNo();
this.targetPosition = taskProtocol.getTargetPosition();
this.taskStatus = taskProtocol.getTaskStatus();
+ this.direction = taskProtocol.direction;
+ }
+
+
+ public String gettaskNoDirection$(Long taskNo,int taskStatus){
+ String taskStatusStr = "Walk";
+ switch (taskStatus){
+ case 1:
+ taskStatusStr = "Tack";
+ case 2:
+ taskStatusStr = "Put";
+ }
+ return taskNo+"_"+taskStatusStr;
}
}
--
Gitblit v1.9.1