From aa33e56e37cd19b88ae8eea69c5ebc7c6da8b1d2 Mon Sep 17 00:00:00 2001
From: Administrator <pjb>
Date: 星期四, 05 六月 2025 17:59:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/glccwcs' into glccwcs
---
src/main/java/com/zy/core/model/command/CrnCommand.java | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 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 8eedc95..2b5b9e1 100644
--- a/src/main/java/com/zy/core/model/command/CrnCommand.java
+++ b/src/main/java/com/zy/core/model/command/CrnCommand.java
@@ -1,7 +1,6 @@
package com.zy.core.model.command;
import com.alibaba.fastjson.annotation.JSONField;
-import com.zy.asrs.entity.CommandInfo;
import com.zy.core.enums.CrnTaskModeType;
import lombok.Data;
@@ -75,21 +74,21 @@
//鑱旀満妯″紡
private Short auto = 0;
+ //鐢宠瀹屾垚浠诲姟
+ private Short onlineWrk1 = 0;
+ //鐢宠鍙栨秷浠诲姟
+ private Short onlineWrk2 = 0;
+ //娓呴櫎鑱旀満浠诲姟
+ private Short onlineWrk3 = 0;
+ //鎭㈠鑱旀満浠诲姟
+ private Short onlineWrk4 = 0;
+ private Short reset = 0;
+
// 浠诲姟纭 0锛氭湭纭 1锛氬凡纭
private Short command = 0;
//鎸囦护ID
private Integer commandId;
-
- 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();
@@ -98,7 +97,7 @@
System.out.println(cal.get(Calendar.YEAR));
//榛樿浠�0-11
- System.out.println(cal.get(Calendar.MONTH)+1);
+ 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("鏃�");
@@ -113,4 +112,14 @@
System.out.println("绀兼嫓");
System.out.println(mm);
}
+
+ 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