From d9505e143cdf452c3a33752b380ee1b3a410601d Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 16 十月 2025 14:48:52 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/command/ShuttleCommand.java | 99 +++++++++++++++++--------------------------------
1 files changed, 35 insertions(+), 64 deletions(-)
diff --git a/src/main/java/com/zy/core/model/command/ShuttleCommand.java b/src/main/java/com/zy/core/model/command/ShuttleCommand.java
index 7acb6d6..8e420f9 100644
--- a/src/main/java/com/zy/core/model/command/ShuttleCommand.java
+++ b/src/main/java/com/zy/core/model/command/ShuttleCommand.java
@@ -1,14 +1,22 @@
package com.zy.core.model.command;
+import com.zy.common.model.NavigateNode;
+import com.zy.core.enums.ShuttleCommandModeType;
import lombok.Data;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 鍥涘悜绌挎杞﹀懡浠ゆ姤鏂�
+ */
@Data
public class ShuttleCommand {
/**
* 鍥涘悜绌挎杞﹀彿
*/
- private Integer shuttleNo = 0;
+ private Integer shuttleNo;
/**
* 浠诲姟鍙�
@@ -16,83 +24,46 @@
private Integer taskNo = 0;
/**
- * 浣滀笟绫诲瀷
+ * 鍛戒护绫诲瀷
*/
- private Short taskMode = 0;
+ private Integer mode = ShuttleCommandModeType.NONE.id;
/**
- * 浠诲姟纭 false锛氭湭纭 true锛氬凡纭
+ * 鐩爣搴撲綅
*/
- private Boolean complete = Boolean.FALSE;
+ private String targetLocNo;
/**
- * 鎺у埗鎸囦护瀛�
+ * 鎶ユ枃鍐呭
*/
- private Integer commandWord;
+ private String body;
/**
- * 鍚浜岀淮缂栧彿
+ * 鍛戒护鏄惁瀹屾垚,榛樿false鏈畬鎴�
*/
- private String startCodeNum;
+ private Boolean complete = false;
/**
- * 涓棿浜岀淮缂栧彿
+ * 琛岃蛋鍛戒护鎵�鍗犵敤鐨勮妭鐐筶ist
*/
- private String middleCodeNum;
+ private List<NavigateNode> nodes;
- /**
- * 鐩爣浜岀淮缂栧彿
- */
- private String distCodeNum;
+ public String getMode$() {
+ if (this.mode == null) {
+ return null;
+ }
+ return ShuttleCommandModeType.get(this.mode).desc;
+ }
- /**
- * 璧风偣鍒扮洰鏍囩偣鐨勮窛绂婚暱搴�
- */
- private Integer startToDistDistance;
-
- /**
- * 涓棿鐐瑰埌鐩爣鐐圭殑璺濈闀垮害
- */
- private Integer middleToDistDistance;
-
- /**
- * 灏忚溅杩愯鏂瑰悜
- */
- private Integer runDirection;
-
- /**
- * 鎵樼洏椤跺崌
- */
- private Integer palletLift;
-
- /**
- * 灏忚溅寮哄埗绉诲姩璺濈
- */
- private Integer forceMoveDistance;
-
- /**
- * 鍏呯數寮�鍏�
- */
- private Integer chargeSwitch;
-
- /**
- * 灏忚溅IO鎺у埗
- */
- private byte IOControl;
-
- /**
- * 灏忚溅杩愯閫熷害
- */
- private Integer runSpeed;
-
- /**
- * 灏忚溅闆疯揪澶囩敤
- */
- private Integer radarTmp;
-
- /**
- * 鎸囦护缁撴潫浣�
- */
- private Integer commandEnd;
+ public List<NavigateNode> getNodesDeepCopy() {
+ if (this.nodes == null) {
+ return null;
+ }
+ List<NavigateNode> navigateNodes = new ArrayList<>();
+ for (NavigateNode node : nodes) {
+ navigateNodes.add(node.clone());
+ }
+ return navigateNodes;
+ }
}
--
Gitblit v1.9.1