From 1badfb47887a8b95e422341fb7b44f1610cae11b Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期一, 14 七月 2025 20:16:36 +0800 Subject: [PATCH] no message --- rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceBind.java | 70 +++++++++++++++++++++++++++++----- 1 files changed, 59 insertions(+), 11 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceBind.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceBind.java index dc98990..6d70197 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceBind.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceBind.java @@ -12,7 +12,10 @@ import com.vincent.rsf.framework.common.SpringUtils; import com.vincent.rsf.server.system.service.UserService; import com.vincent.rsf.server.system.entity.User; +import org.springframework.format.annotation.DateTimeFormat; + import java.io.Serializable; +import java.text.SimpleDateFormat; import java.util.Date; @Data @@ -88,6 +91,36 @@ @ApiModelProperty(value= "绌烘澘闈犺繎寮�鍏�") private String emptySimilar; + @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ") + @TableLogic + private Integer deleted; + + /** + * 鍒涘缓浜� + */ + @ApiModelProperty(value= "鍒涘缓浜�") + private Long createBy; + + /** + * 鍒涘缓鏃堕棿 + */ + @ApiModelProperty(value= "鍒涘缓鏃堕棿") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date createTime; + + /** + * 鏇存柊浜� + */ + @ApiModelProperty(value= "鏇存柊浜�") + private Long updateBy; + + /** + * 鏇存柊鏃堕棿 + */ + @ApiModelProperty(value= "鏇存柊鏃堕棿") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date updateTime; + public DeviceBind() {} public DeviceBind(Integer currentRow,Integer startRow,Integer endRow,Integer deviceQty,Integer startDeviceNo,Integer endDeviceNo,String staList,Integer typeId,String beSimilar,String emptySimilar) { @@ -116,18 +149,33 @@ // null // 绌烘澘闈犺繎寮�鍏� // ); - - - public Boolean getStatusBool(){ - if (null == this.status){ return null; } - switch (this.status){ - case 1: - return true; - case 0: - return false; - default: - return null; + public String getCreateTime$(){ + if (Cools.isEmpty(this.createTime)){ + return ""; } + return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime); } + public String getUpdateTime$(){ + if (Cools.isEmpty(this.updateTime)){ + return ""; + } + return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime); + } + + + +// public Boolean getStatusBool(){ +// if (null == this.status){ return null; } +// switch (this.status){ +// case 1: +// return true; +// case 0: +// return false; +// default: +// return null; +// } +// } + + } -- Gitblit v1.9.1