From c19cf2f4c2419e403294ebdc025fe90ff7dee74c Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期四, 13 三月 2025 14:28:48 +0800
Subject: [PATCH] 配置信息
---
src/main/java/com/zy/asrs/entity/CommandInfoLog.java | 86 +++++++++++++++++++++++-------------------
1 files changed, 47 insertions(+), 39 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/CommandInfoLog.java b/src/main/java/com/zy/asrs/entity/CommandInfoLog.java
index 7576aef..275cee1 100644
--- a/src/main/java/com/zy/asrs/entity/CommandInfoLog.java
+++ b/src/main/java/com/zy/asrs/entity/CommandInfoLog.java
@@ -1,20 +1,18 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
+import com.zy.core.enums.CommandType;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import org.springframework.format.annotation.DateTimeFormat;
+
import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
@Data
@TableName("wcs_command_info_log")
@@ -22,105 +20,106 @@
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
* 宸ヤ綔鍙�
*/
- @ApiModelProperty(value= "宸ヤ綔鍙�")
+ @ApiModelProperty(value = "宸ヤ綔鍙�")
@TableField("wrk_no")
private Integer wrkNo;
/**
* 璧风偣浣嶇疆
*/
- @ApiModelProperty(value= "璧风偣浣嶇疆")
+ @ApiModelProperty(value = "璧风偣浣嶇疆")
@TableField("start_pos")
private String startPos;
/**
* 缁堢偣浣嶇疆
*/
- @ApiModelProperty(value= "缁堢偣浣嶇疆")
+ @ApiModelProperty(value = "缁堢偣浣嶇疆")
@TableField("end_pos")
private String endPos;
/**
* 鎸囦护鐘舵�� 1: 鍒涘缓 2: 鎵ц 3: 瀹屾垚
*/
- @ApiModelProperty(value= "鎸囦护鐘舵�� 1: 鍒涘缓 2: 鎵ц 3: 瀹屾垚 ")
+ @ApiModelProperty(value = "鎸囦护鐘舵�� 1: 鍒涘缓 2: 鎵ц 3: 瀹屾垚 ")
@TableField("command_status")
private Integer commandStatus;
/**
* 鍒涘缓鏃堕棿
*/
- @ApiModelProperty(value= "鍒涘缓鏃堕棿")
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
@TableField("start_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime;
/**
* 鎸囦护绫诲瀷
*/
- @ApiModelProperty(value= "鎸囦护绫诲瀷")
+ @ApiModelProperty(value = "鎸囦护绫诲瀷")
@TableField("command_type")
private Integer commandType;
/**
* 璁惧
*/
- @ApiModelProperty(value= "璁惧")
+ @ApiModelProperty(value = "璁惧")
private String device;
/**
* 璁惧鎵ц淇℃伅
*/
- @ApiModelProperty(value= "璁惧鎵ц淇℃伅")
+ @ApiModelProperty(value = "璁惧鎵ц淇℃伅")
@TableField("device_log")
private String deviceLog;
/**
* 鍛戒护鎻忚堪
*/
- @ApiModelProperty(value= "鍛戒护鎻忚堪")
+ @ApiModelProperty(value = "鍛戒护鎻忚堪")
@TableField("command_desc")
private String commandDesc;
/**
* 鍛戒护JSON
*/
- @ApiModelProperty(value= "鍛戒护JSON")
+ @ApiModelProperty(value = "鍛戒护JSON")
private String command;
/**
* 浠诲姟鍙�
*/
- @ApiModelProperty(value= "浠诲姟鍙�")
+ @ApiModelProperty(value = "浠诲姟鍙�")
@TableField("task_no")
private String taskNo;
/**
* 鎵ц鏃堕棿
*/
- @ApiModelProperty(value= "鎵ц鏃堕棿")
+ @ApiModelProperty(value = "鎵ц鏃堕棿")
@TableField("execute_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date executeTime;
/**
* 瀹屾垚鏃堕棿
*/
- @ApiModelProperty(value= "瀹屾垚鏃堕棿")
+ @ApiModelProperty(value = "瀹屾垚鏃堕棿")
@TableField("complete_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date completeTime;
- public CommandInfoLog() {}
+ public CommandInfoLog() {
+ }
- public CommandInfoLog(Integer wrkNo,String startPos,String endPos,Integer commandStatus,Date startTime,Integer commandType,String device,String deviceLog,String commandDesc,String command,String taskNo,Date executeTime,Date completeTime) {
+ public CommandInfoLog(Integer wrkNo, String startPos, String endPos, Integer commandStatus, Date startTime, Integer commandType, String device, String deviceLog, String commandDesc, String command, String taskNo, Date executeTime, Date completeTime) {
this.wrkNo = wrkNo;
this.startPos = startPos;
this.endPos = endPos;
@@ -152,9 +151,11 @@
// null // 瀹屾垚鏃堕棿
// );
- public String getCommandStatus$(){
- if (null == this.commandStatus){ return null; }
- switch (this.commandStatus){
+ public String getCommandStatus$() {
+ if (null == this.commandStatus) {
+ return null;
+ }
+ switch (this.commandStatus) {
case 1:
return "鍒涘缓";
case 2:
@@ -166,22 +167,22 @@
}
}
- public String getStartTime$(){
- if (Cools.isEmpty(this.startTime)){
+ public String getStartTime$() {
+ if (Cools.isEmpty(this.startTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.startTime);
}
- public String getExecuteTime$(){
- if (Cools.isEmpty(this.executeTime)){
+ public String getExecuteTime$() {
+ if (Cools.isEmpty(this.executeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.executeTime);
}
- public String getCompleteTime$(){
- if (Cools.isEmpty(this.completeTime)){
+ public String getCompleteTime$() {
+ if (Cools.isEmpty(this.completeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.completeTime);
@@ -212,5 +213,12 @@
return Math.abs(day) + "澶�" + Math.abs(hour) + "灏忔椂" + Math.abs(min) + "鍒�" + Math.abs(s) + "绉�";
}
+ public String getCommandType$() {
+ if (Cools.isEmpty(this.commandType)) {
+ return "";
+ }
+ return CommandType.get(this.commandType).desc;
+ }
+
}
--
Gitblit v1.9.1