From 4375f7c1ccd8d6b7b3cfb4f641a3ce84b0907594 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 21 四月 2025 16:36:53 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/core/model/command/RgvCommand.java | 96 +++++++-----------------------------------------
1 files changed, 14 insertions(+), 82 deletions(-)
diff --git a/src/main/java/com/zy/core/model/command/RgvCommand.java b/src/main/java/com/zy/core/model/command/RgvCommand.java
index 5be8072..ffa6640 100644
--- a/src/main/java/com/zy/core/model/command/RgvCommand.java
+++ b/src/main/java/com/zy/core/model/command/RgvCommand.java
@@ -21,109 +21,41 @@
private Short ackFinish1 = 0;
// 宸ヤ綅1浠诲姟鍙�
- private Short taskNo1 = 0;
+ private Short taskNo = 0;
/**
* 浠诲姟妯″紡锛�
* 0 = 鏃�
* 1 = 鍙栬揣
* 2 = 鏀捐揣
- * 3 = 鍙栨斁璐�
+ * 3 = 琛岃蛋
*/
- private Short taskMode1 = 0;
+ private Short taskMode = 0;
@JSONField(serialize = false)
- private RgvTaskModeType taskModeType1;
+ private RgvTaskModeType taskModeType;
/*
- 宸ヤ綅1婧愮珯
- */
- private Short sourceStaNo1 = 0;
+ * 浣滀笟鐐�
+ * */
+ private Long destinationStaNo = 0L;
- /*
- 宸ヤ綅1鐩爣绔�
- */
- private Short destinationStaNo1 = 0;
-
- ////////////////////// 宸ヤ綅2瀹氫箟 //////////////////////////////////////////////////
// 宸ヤ綅1浠诲姟瀹屾垚纭浣�
- private Short ackFinish2 = 0;
-
- // 宸ヤ綅2浠诲姟鍙�
- private Short taskNo2 = 0;
+ private Short ackFinish = 0;
/**
* 浠诲姟妯″紡锛�
- * 0 = 鏃�
- * 1 = 鍙栬揣
- * 2 = 鏀捐揣
- * 3 = 鍙栨斁璐�
- */
- private Short taskMode2 = 0;
-
- @JSONField(serialize = false)
- private RgvTaskModeType taskModeType2;
-
- /*
- 宸ヤ綅1婧愮珯
- */
- private Short sourceStaNo2 = 0;
-
- /*
- 宸ヤ綅1鐩爣绔�
- */
- private Short destinationStaNo2 = 0;
- ///////////////////////////////////////////////////////////////////////////////////////
-
- /**
- * 浠诲姟妯″紡锛�
- * 0 = 鏈‘璁�
- * 1 = 宸ヤ綅1浠诲姟纭
- * 2 = 宸ヤ綅2浠诲姟纭
- * 3 = 宸ヤ綅1銆�2浠诲姟鍚屾椂纭
*/
private Short command = 0;
- public void setTaskMode1(Short taskMode1){
- this.taskMode1 = taskMode1;
- this.taskModeType1 = RgvTaskModeType.get(taskModeType1);
+ public void setTaskMode(Short taskMode){
+ this.taskMode = taskMode;
+ this.taskModeType = RgvTaskModeType.get(taskModeType);
}
- public void setTaskMode1(RgvTaskModeType type1) {
- this.taskModeType1 = type1;
- this.taskMode1 = RgvTaskModeType.get(type1).id.shortValue();
+ public void setTaskMode(RgvTaskModeType type) {
+ this.taskModeType = type;
+ this.taskMode = RgvTaskModeType.get(type).id.shortValue();
}
- public void setTaskMode2(Short taskMode2){
- this.taskMode2 = taskMode2;
- this.taskModeType2 = RgvTaskModeType.get(taskModeType2);
- }
-
- public void setTaskMode2(RgvTaskModeType type2) {
- this.taskModeType2 = type2;
- this.taskMode2 = RgvTaskModeType.get(type2).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