From 664d9030efca22edd8e43b4db4b2c0700fff44af Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期三, 14 一月 2026 09:18:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/command/CrnCommand.java | 64 ++++++--------------------------
1 files changed, 12 insertions(+), 52 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 1d951f6..dcc61c9 100644
--- a/src/main/java/com/zy/core/model/command/CrnCommand.java
+++ b/src/main/java/com/zy/core/model/command/CrnCommand.java
@@ -1,15 +1,9 @@
package com.zy.core.model.command;
-import com.alibaba.fastjson.annotation.JSONField;
-import com.zy.core.enums.CrnTaskModeType;
import lombok.Data;
-
-import java.util.Calendar;
-import java.util.Date;
/**
* 鍫嗗灈鏈哄懡浠ゆ姤鏂�
- * Created by vincent on 2020/8/11
*/
@Data
public class CrnCommand {
@@ -18,10 +12,10 @@
private Integer crnNo = 0;
// 浠诲姟瀹屾垚纭浣�
- private Short ackFinish = 0;
+ private Integer ackFinish = 0;
// 浠诲姟鍙�
- private Short taskNo = 0;
+ private Integer taskNo = 0;
/**
* 浠诲姟妯″紡锛�
@@ -32,65 +26,31 @@
* 4 = 绔欎綅绉昏浆 婧愬拰鐩爣閮藉彂
* 5 = 鍥炲師鐐� 涓嶇敤鍙�
* 6 = 鍘诲弽鍘熺偣 鐩爣鍙�
- * 7 = 鍧愭爣绉昏 鐩爣鍙�
+ * 7 = 鍧愭爣绉昏 鍙栬揣鍙�
* 90 = 璁剧疆鏃堕棿
* 99 = 鍙栨秷褰撳墠浠诲姟
*/
- private Short taskMode = 0;
-
- @JSONField(serialize = false)
- private CrnTaskModeType taskModeType;
+ private Integer taskMode = 0;
// 婧愪綅缃帓鍙�
- private Short sourcePosX = 0;
+ private Integer sourcePosX = 0;
// 婧愪綅缃垪鍙�
- private Short sourcePosY = 0;
+ private Integer sourcePosY = 0;
// 婧愪綅缃眰鍙�
- private Short sourcePosZ = 0;
+ private Integer sourcePosZ = 0;
// 鐩爣浣嶇疆鎺掑彿
- private Short destinationPosX = 0;
+ private Integer destinationPosX = 0;
// 鐩爣浣嶇疆鍒楀彿
- private Short destinationPosY = 0;
+ private Integer destinationPosY = 0;
// 鐩爣浣嶇疆灞傚彿
- private Short destinationPosZ = 0;
+ private Integer destinationPosZ = 0;
- private Short taskSend = 0;
+ // 浠诲姟纭 0锛氭湭纭 1锛氬凡纭
+ private Integer command = 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();
- }
-
- public static void main(String[] args) {
- Date date = new Date();
- Calendar cal = Calendar.getInstance();
- cal.setTime(date);
-
- System.out.println(cal.get(Calendar.YEAR));
- //榛樿浠�0-11
- System.out.println(cal.get(Calendar.MONTH)+1);
- System.out.println(cal.get(Calendar.DATE));
- int hour = cal.get(Calendar.HOUR_OF_DAY);
- System.out.println("鏃�");
- System.out.println(hour);
- int minute = cal.get(Calendar.MINUTE);
- System.out.println("鍒�");
- System.out.println(minute);
- int second = cal.get(Calendar.SECOND);
- System.out.println("绉�");
- System.out.println(second);
- int mm = cal.get(Calendar.DAY_OF_WEEK) - 1; // 鏄熸湡锛�0(鏃�)锝�6(鍏�)
- System.out.println("绀兼嫓");
- System.out.println(mm);
- }
}
--
Gitblit v1.9.1