From ab9bc35f9f3e6fe2e57fe054aa0dc898fe9a8d2c Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期四, 02 九月 2021 15:45:57 +0800 Subject: [PATCH] update MP字段验证策略更改为 NOT_NULL 个别特殊字段使用注解单独处理 --- ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java | 167 +++++++++++++++---------------------------------------- 1 files changed, 46 insertions(+), 121 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java index bb61634..72d624a 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java @@ -1,143 +1,68 @@ package com.ruoyi.common.core.domain; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + import java.io.Serializable; import java.util.Date; import java.util.HashMap; import java.util.Map; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonIgnore; /** * Entity鍩虹被 - * + * * @author ruoyi */ -public class BaseEntity implements Serializable -{ - private static final long serialVersionUID = 1L; - /** 鎼滅储鍊� */ - private String searchValue; +@Data +@NoArgsConstructor +@Accessors(chain = true) +public class BaseEntity implements Serializable { - /** 鍒涘缓鑰� */ - private String createBy; + private static final long serialVersionUID = 1L; - /** 鍒涘缓鏃堕棿 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date createTime; + /** + * 鎼滅储鍊� + */ + @ApiModelProperty(value = "鎼滅储鍊�") + private String searchValue; - /** 鏇存柊鑰� */ - private String updateBy; + /** + * 鍒涘缓鑰� + */ + @ApiModelProperty(value = "鍒涘缓鑰�") + private String createBy; - /** 鏇存柊鏃堕棿 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date updateTime; + /** + * 鍒涘缓鏃堕棿 + */ + @ApiModelProperty(value = "鍒涘缓鏃堕棿") + private Date createTime; - /** 澶囨敞 */ - private String remark; + /** + * 鏇存柊鑰� + */ + @ApiModelProperty(value = "鏇存柊鑰�") + private String updateBy; - /** 寮�濮嬫椂闂� */ - @JsonIgnore - private String beginTime; + /** + * 鏇存柊鏃堕棿 + */ + @ApiModelProperty(value = "鏇存柊鏃堕棿") + private Date updateTime; - /** 缁撴潫鏃堕棿 */ - @JsonIgnore - private String endTime; + /** + * 澶囨敞 + */ + @ApiModelProperty(value = "澶囨敞") + private String remark; - /** 璇锋眰鍙傛暟 */ - private Map<String, Object> params; + /** + * 璇锋眰鍙傛暟 + */ + @ApiModelProperty(value = "璇锋眰鍙傛暟") + private Map<String, Object> params = new HashMap<>(); - public String getSearchValue() - { - return searchValue; - } - - public void setSearchValue(String searchValue) - { - this.searchValue = searchValue; - } - - public String getCreateBy() - { - return createBy; - } - - public void setCreateBy(String createBy) - { - this.createBy = createBy; - } - - public Date getCreateTime() - { - return createTime; - } - - public void setCreateTime(Date createTime) - { - this.createTime = createTime; - } - - public String getUpdateBy() - { - return updateBy; - } - - public void setUpdateBy(String updateBy) - { - this.updateBy = updateBy; - } - - public Date getUpdateTime() - { - return updateTime; - } - - public void setUpdateTime(Date updateTime) - { - this.updateTime = updateTime; - } - - public String getRemark() - { - return remark; - } - - public void setRemark(String remark) - { - this.remark = remark; - } - - public String getBeginTime() - { - return beginTime; - } - - public void setBeginTime(String beginTime) - { - this.beginTime = beginTime; - } - - public String getEndTime() - { - return endTime; - } - - public void setEndTime(String endTime) - { - this.endTime = endTime; - } - - public Map<String, Object> getParams() - { - if (params == null) - { - params = new HashMap<>(); - } - return params; - } - - public void setParams(Map<String, Object> params) - { - this.params = params; - } } -- Gitblit v1.9.3