From 3f68c7a7f117eda92eed81c8951317429e6a9a0c Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期五, 02 二月 2024 12:01:48 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/entity/CommandInfo.java |   55 ++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/CommandInfo.java b/src/main/java/com/zy/asrs/entity/CommandInfo.java
index 52f670c..e49b7bc 100644
--- a/src/main/java/com/zy/asrs/entity/CommandInfo.java
+++ b/src/main/java/com/zy/asrs/entity/CommandInfo.java
@@ -5,6 +5,8 @@
 import com.baomidou.mybatisplus.annotations.TableField;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+
+import com.zy.core.enums.CommandType;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import io.swagger.annotations.ApiModelProperty;
@@ -52,14 +54,6 @@
     private Date startTime;
 
     /**
-     * 缁撴潫鏃堕棿
-     */
-    @ApiModelProperty(value= "缁撴潫鏃堕棿")
-    @TableField("end_time")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private Date endTime;
-
-    /**
      * 鎸囦护绫诲瀷
      */
     @ApiModelProperty(value= "鎸囦护绫诲瀷")
@@ -93,20 +87,37 @@
     @TableField("command")
     private String command;
 
+    /**
+     * 鎵ц鏃堕棿
+     */
+    @ApiModelProperty(value= "鎵ц鏃堕棿")
+    @TableField("execute_time")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date executeTime;
+
+    /**
+     * 瀹屾垚鏃堕棿
+     */
+    @ApiModelProperty(value= "瀹屾垚鏃堕棿")
+    @TableField("complete_time")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date completeTime;
+
     public CommandInfo() {}
 
-    public CommandInfo(Integer id, Integer wrkNo, String taskNo, Integer commandStatus, Date startTime, Date endTime, Integer commandType, String device, String deviceLog, String commandDesc, String command) {
+    public CommandInfo(Integer id, Integer wrkNo, String taskNo, Integer commandStatus, Date startTime, Integer commandType, String device, String deviceLog, String commandDesc, String command, Date executeTime, Date completeTime) {
         this.id = id;
         this.wrkNo = wrkNo;
         this.taskNo = taskNo;
         this.commandStatus = commandStatus;
         this.startTime = startTime;
-        this.endTime = endTime;
         this.commandType = commandType;
         this.device = device;
         this.deviceLog = deviceLog;
         this.commandDesc = commandDesc;
         this.command = command;
+        this.executeTime = executeTime;
+        this.completeTime = completeTime;
     }
 
     public String getStartTime$(){
@@ -116,11 +127,18 @@
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.startTime);
     }
 
-    public String getEndTime$(){
-        if (Cools.isEmpty(this.endTime)){
+    public String getExecuteTime$(){
+        if (Cools.isEmpty(this.executeTime)){
             return "";
         }
-        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.endTime);
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.executeTime);
+    }
+
+    public String getCompleteTime$(){
+        if (Cools.isEmpty(this.completeTime)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.completeTime);
     }
 
     /**
@@ -132,8 +150,8 @@
         }
 
         Date endDate = new Date();
-        if (!Cools.isEmpty(this.endTime)) {
-            endDate = this.endTime;
+        if (!Cools.isEmpty(this.completeTime)) {
+            endDate = this.completeTime;
         }
 
         //鐢ㄦ潵鑾峰彇涓や釜鏃堕棿鐩稿樊鐨勬绉掓暟
@@ -165,5 +183,12 @@
         }
     }
 
+    public String getCommandType$() {
+        if (Cools.isEmpty(this.commandType)) {
+            return "";
+        }
+        return CommandType.get(this.commandType).desc;
+    }
+
 
 }

--
Gitblit v1.9.1