From 9e889c570520f6ef43d74bb4c93d6fba712b4068 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期四, 27 八月 2020 13:25:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/command/CrnCommand.java | 52 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 32 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/core/model/command/CrnCommand.java b/src/main/java/com/zy/core/model/command/CrnCommand.java
index b031fb3..549c0ba 100644
--- a/src/main/java/com/zy/core/model/command/CrnCommand.java
+++ b/src/main/java/com/zy/core/model/command/CrnCommand.java
@@ -1,5 +1,7 @@
package com.zy.core.model.command;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.zy.core.enums.CrnTaskModeType;
import lombok.Data;
/**
@@ -10,46 +12,56 @@
public class CrnCommand {
// 鍫嗗灈鏈哄彿
- private Integer crnNo;
-
- // 浠诲姟涓嬪彂纭浣�
- private Short stb;
+ private Integer crnNo = 0;
// 浠诲姟瀹屾垚纭浣�
- private Short ackFinish;
+ private Short ackFinish = 0;
// 浠诲姟鍙�
- private Short taskNo;
+ private Short taskNo = 0;
/**
* 浠诲姟妯″紡锛�
* 0 = 鏃�
- * 1 = 鍏ュ簱
- * 2 = 鍑哄簱
- * 3 = 搴撲綅绉昏浆
- * 4 = 绔欎綅绉昏浆
- * 5 = 鍥炲師鐐�
- * 6 = 鍘诲弽鍘熺偣
- * 7 = 鍧愭爣绉昏
+ * 1 = 鍏ュ簱 婧愬拰鐩爣閮藉彂
+ * 2 = 鍑哄簱 婧愬拰鐩爣閮藉彂
+ * 3 = 搴撲綅绉昏浆 婧愬拰鐩爣閮藉彂
+ * 4 = 绔欎綅绉昏浆 婧愬拰鐩爣閮藉彂
+ * 5 = 鍥炲師鐐� 涓嶇敤鍙�
+ * 6 = 鍘诲弽鍘熺偣 鐩爣鍙�
+ * 7 = 鍧愭爣绉昏 鐩爣鍙�
*/
- private Short taskMode;
+ private Short taskMode = 0;
+
+ @JSONField(serialize = false)
+ private CrnTaskModeType taskModeType;
// 婧愪綅缃帓鍙�
- private Short sourcePosX;
+ private Short sourcePosX = 0;
// 婧愪綅缃垪鍙�
- private Short sourcePosY;
+ private Short sourcePosY = 0;
// 婧愪綅缃眰鍙�
- private Short sourcePosZ;
+ private Short sourcePosZ = 0;
// 鐩爣浣嶇疆鎺掑彿
- private Short destinationPosX;
+ private Short destinationPosX = 0;
// 鐩爣浣嶇疆鍒楀彿
- private Short destinationPosY;
+ private Short destinationPosY = 0;
// 鐩爣浣嶇疆灞傚彿
- private Short destinationPosZ;
+ private Short destinationPosZ = 0;
+
+ public void setTaskMode(Short taskMode){
+ this.taskMode = taskMode;
+ this.taskModeType = CrnTaskModeType.get(taskModeType);
+ }
+
+ public void setTaskMode(CrnTaskModeType type) {
+ this.taskModeType = type;
+ this.taskMode = CrnTaskModeType.get(type).id.shortValue();
+ }
}
--
Gitblit v1.9.1