From d5449236ef0b3adafb3e4cc872f50479efa0ce7b Mon Sep 17 00:00:00 2001 From: zhangc <zc@123> Date: 星期二, 11 三月 2025 16:10:29 +0800 Subject: [PATCH] 配置信息 --- src/main/java/com/zy/asrs/entity/CommandInfo.java | 61 +++++++++++++++--------------- 1 files changed, 31 insertions(+), 30 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/CommandInfo.java b/src/main/java/com/zy/asrs/entity/CommandInfo.java index e49b7bc..093a18a 100644 --- a/src/main/java/com/zy/asrs/entity/CommandInfo.java +++ b/src/main/java/com/zy/asrs/entity/CommandInfo.java @@ -1,18 +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 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 org.springframework.format.annotation.DateTimeFormat; - 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") @@ -20,90 +20,91 @@ 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; /** * WMS浠诲姟鍙� */ - @ApiModelProperty(value= "浠诲姟鍙�") + @ApiModelProperty(value = "浠诲姟鍙�") @TableField("task_no") private String taskNo; /** * 鎸囦护绫诲瀷{1:鍒涘缓,2:鎵ц,3:瀹屾垚} */ - @ApiModelProperty(value= "鎸囦护鐘舵��") + @ApiModelProperty(value = "鎸囦护鐘舵��") @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") @TableField("command") private String command; /** * 鎵ц鏃堕棿 */ - @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 CommandInfo() {} + public CommandInfo() { + } 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; @@ -120,22 +121,22 @@ this.completeTime = completeTime; } - 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); -- Gitblit v1.9.1