From 09fcc4ec56a1ce6c0fcb308348d8dd5e2c08d336 Mon Sep 17 00:00:00 2001 From: fyxc <fyxc@qq.com> Date: 星期四, 22 五月 2025 14:33:06 +0800 Subject: [PATCH] server commit files --- src/main/java/com/zy/core/model/command/LiftCommand.java | 75 +++++++++---------------------------- 1 files changed, 19 insertions(+), 56 deletions(-) diff --git a/src/main/java/com/zy/core/model/command/LiftCommand.java b/src/main/java/com/zy/core/model/command/LiftCommand.java index 040910c..72aa3c4 100644 --- a/src/main/java/com/zy/core/model/command/LiftCommand.java +++ b/src/main/java/com/zy/core/model/command/LiftCommand.java @@ -1,6 +1,6 @@ package com.zy.core.model.command; -import com.zy.core.model.protocol.StaProtocol; +import com.zy.core.enums.LiftCommandModeType; import lombok.Data; @@ -11,85 +11,48 @@ public class LiftCommand { /** - * 鎻愬崌鏈哄彿 + * 鎻愬崌鏈虹紪鍙� */ - private Short liftNo = 0; + private Integer liftNo; /** - * 浠诲姟鍙� + * 浠诲姟鏍囪瘑鍙� */ - private Short taskNo = 0; + private Integer taskNo; /** - * 寮�濮嬭繍琛� + * 鍛戒护绫诲瀷 */ - private Short run; + private Integer mode = LiftCommandModeType.NONE.id; /** - * 鐩爣浣嶇疆 + * 婧愬眰 */ - private Short distPosition; + private Integer originLev; /** - * 杩愯閫熷害 + * 鐩爣灞� */ - private Short speed; + private Integer targetLev; /** - * 浜屽眰楂樺害璁惧畾(鎻愬崌鏈轰笌杈撻�佺嚎骞冲眰) + * 婧愮珯 */ - private Short height2; - - /** - * 涓夊眰楂樺害璁惧畾(瀹為檯鐨勪簩灞�) - */ - private Short height3; - - /** - * 鍥涘眰楂樺害璁惧畾(瀹為檯鐨勪笁灞�) - */ - private Short height4; - - /** - * 浜斿眰楂樺害璁惧畾(瀹為檯鐨勫洓灞�) - */ - private Short height5; - - /** - * 鎻愬崌鏈洪攣瀹� - */ - private Boolean liftLock; - - /** - * 鎿嶄綔杈撻�佺珯鐐瑰彿 - */ - private Short operaStaNo; - - /** - * 杈撻�佺嚎鑱斿姩杞姩鏂瑰悜锛�0锛氬仠姝㈣浆鍔紝1锛氭鍚戣浆鍔紝2锛氬弽鍚戣浆鍔� - */ - private Integer rotationDire; - - /** - * 杈撻�佺嚎ID - */ - private Integer devpId; + private Integer originSta; /** * 鐩爣绔� */ - private Short staNo; + private Integer targetSta; + + /** + * 鎶ユ枃鍐呭 + */ + private String body; /** * 鍛戒护鏄惁瀹屾垚,榛樿false鏈畬鎴� */ private Boolean complete = false; - - public Short getLiftLockShortValue() { - if (liftLock == null) { - return (short) 0; - } - return liftLock ? (short) 1 : (short) 0; - } } -- Gitblit v1.9.1