From 92c572e50893a93a810bbe6adb6d3cdbfc225073 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 20 五月 2025 14:17:33 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/entity/CommandInfoLog.java |   62 ++++++++++++++++++++++++------
 1 files changed, 49 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/CommandInfoLog.java b/src/main/java/com/zy/asrs/entity/CommandInfoLog.java
index 142f7da..231285f 100644
--- a/src/main/java/com/zy/asrs/entity/CommandInfoLog.java
+++ b/src/main/java/com/zy/asrs/entity/CommandInfoLog.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 java.text.SimpleDateFormat;
 import java.util.Date;
@@ -17,48 +19,48 @@
 import java.io.Serializable;
 
 @Data
-@TableName("wcs_command_info_log")
+@TableName("\"SOURCE\".\"wcs_command_info_log\"")
 public class CommandInfoLog implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value= "")
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "ID", type = IdType.AUTO)
     private Integer id;
 
     /**
      * 宸ヤ綔鍙�
      */
     @ApiModelProperty(value= "宸ヤ綔鍙�")
-    @TableField("wrk_no")
+    @TableField("WRK_NO")
     private Integer wrkNo;
 
     /**
      * 璧风偣浣嶇疆
      */
     @ApiModelProperty(value= "璧风偣浣嶇疆")
-    @TableField("start_pos")
+    @TableField("START_POS")
     private String startPos;
 
     /**
      * 缁堢偣浣嶇疆
      */
     @ApiModelProperty(value= "缁堢偣浣嶇疆")
-    @TableField("end_pos")
+    @TableField("END_POS")
     private String endPos;
 
     /**
      * 鎸囦护鐘舵�� 1: 鍒涘缓  2: 鎵ц  3: 瀹屾垚  
      */
     @ApiModelProperty(value= "鎸囦护鐘舵�� 1: 鍒涘缓  2: 鎵ц  3: 瀹屾垚  ")
-    @TableField("command_status")
+    @TableField("COMMAND_STATUS")
     private Integer commandStatus;
 
     /**
      * 鍒涘缓鏃堕棿
      */
     @ApiModelProperty(value= "鍒涘缓鏃堕棿")
-    @TableField("start_time")
+    @TableField("START_TIME")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date startTime;
 
@@ -66,47 +68,49 @@
      * 鎸囦护绫诲瀷
      */
     @ApiModelProperty(value= "鎸囦护绫诲瀷")
-    @TableField("command_type")
+    @TableField("COMMAND_TYPE")
     private Integer commandType;
 
     /**
      * 璁惧
      */
     @ApiModelProperty(value= "璁惧")
+    @TableField("DEVICE")
     private String device;
 
     /**
      * 璁惧鎵ц淇℃伅
      */
     @ApiModelProperty(value= "璁惧鎵ц淇℃伅")
-    @TableField("device_log")
+    @TableField("DEVICE_LOG")
     private String deviceLog;
 
     /**
      * 鍛戒护鎻忚堪
      */
     @ApiModelProperty(value= "鍛戒护鎻忚堪")
-    @TableField("command_desc")
+    @TableField("COMMAND_DESC")
     private String commandDesc;
 
     /**
      * 鍛戒护JSON
      */
     @ApiModelProperty(value= "鍛戒护JSON")
+    @TableField("COMMAND")
     private String command;
 
     /**
      * 浠诲姟鍙�
      */
     @ApiModelProperty(value= "浠诲姟鍙�")
-    @TableField("task_no")
+    @TableField("TASK_NO")
     private String taskNo;
 
     /**
      * 鎵ц鏃堕棿
      */
     @ApiModelProperty(value= "鎵ц鏃堕棿")
-    @TableField("execute_time")
+    @TableField("EXECUTE_TIME")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date executeTime;
 
@@ -114,7 +118,7 @@
      * 瀹屾垚鏃堕棿
      */
     @ApiModelProperty(value= "瀹屾垚鏃堕棿")
-    @TableField("complete_time")
+    @TableField("COMPLETE_TIME")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date completeTime;
 
@@ -187,5 +191,37 @@
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.completeTime);
     }
 
+    /**
+     * 鑾峰彇鎸佺画鏃堕棿
+     */
+    public String getDurationTime() {
+        if (Cools.isEmpty(this.startTime)) {
+            return "";
+        }
+
+        Date endDate = new Date();
+        if (!Cools.isEmpty(this.completeTime)) {
+            endDate = this.completeTime;
+        }
+
+        //鐢ㄦ潵鑾峰彇涓や釜鏃堕棿鐩稿樊鐨勬绉掓暟
+        long l = this.startTime.getTime() - endDate.getTime();
+
+        //鍒嗗埆璁＄畻鐩稿樊鐨勫ぉ銆佸皬鏃躲�佸垎銆佺
+        long day = l / (24 * 60 * 60 * 1000);
+        long hour = (l / (60 * 60 * 1000) - day * 24);
+        long min = ((l / (60 * 1000)) - day * 24 * 60 - hour * 60);
+        long s = (l / 1000 - day * 24 * 60 * 60 - hour * 60 * 60 - min * 60);
+
+        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