From 05f2733c4cdc4ea0765e08d61273728aebb70d16 Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期二, 18 三月 2025 15:51:46 +0800 Subject: [PATCH] # --- src/main/java/com/zy/core/model/command/ShuttleCommand.java | 85 ++++++++++-------------------------------- 1 files changed, 20 insertions(+), 65 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 2701793..a0c8b22 100644 --- a/src/main/java/com/zy/core/model/command/ShuttleCommand.java +++ b/src/main/java/com/zy/core/model/command/ShuttleCommand.java @@ -1,6 +1,9 @@ package com.zy.core.model.command; +import com.zy.common.model.NavigateNode; +import com.zy.core.enums.ShuttleCommandModeType; import lombok.Data; +import java.util.List; /** * 鍥涘悜绌挎杞﹀懡浠ゆ姤鏂� @@ -11,7 +14,7 @@ /** * 鍥涘悜绌挎杞﹀彿 */ - private Integer shuttleNo = 0; + private Integer shuttleNo; /** * 浠诲姟鍙� @@ -19,83 +22,35 @@ 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 Short commandWord; + private String body; /** - * 鍚浜岀淮缂栧彿 + * 鍛戒护鏄惁瀹屾垚,榛樿false鏈畬鎴� */ - private Short startCodeNum; + private Boolean complete = false; /** - * 涓棿浜岀淮缂栧彿 + * 琛岃蛋鍛戒护鎵�鍗犵敤鐨勮妭鐐筶ist */ - private Short middleCodeNum; + private List<NavigateNode> nodes; - /** - * 鐩爣浜岀淮缂栧彿 - */ - private Short distCodeNum; + public String getMode$() { + if (this.mode == null) { + return null; + } - /** - * 璧风偣鍒扮洰鏍囩偣鐨勮窛绂婚暱搴� - */ - private Integer startToDistDistance; - - /** - * 涓棿鐐瑰埌鐩爣鐐圭殑璺濈闀垮害 - */ - private Integer middleToDistDistance; - - /** - * 灏忚溅杩愯鏂瑰悜 - */ - private Short runDirection; - - /** - * 鎵樼洏椤跺崌 - */ - private Short palletLift; - - /** - * 灏忚溅寮哄埗绉诲姩璺濈 - */ - private Integer forceMoveDistance; - - /** - * 鍏呯數寮�鍏� - */ - private Short chargeSwitch; - - /** - * 灏忚溅IO鎺у埗 - */ - private Short IOControl; - - /** - * 灏忚溅杩愯閫熷害 - */ - private Short runSpeed; - - /** - * 灏忚溅闆疯揪澶囩敤 - */ - private Short radarTmp; - - /** - * 鎸囦护缁撴潫浣� - */ - private Short commandEnd; - + return ShuttleCommandModeType.get(this.mode).desc; + } } -- Gitblit v1.9.1