From 109c64e7c20e044ee3fa650f0d0599aeb64633e8 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期五, 13 三月 2020 22:14:58 +0800
Subject: [PATCH] 批量替换表前缀调整
---
ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 57 insertions(+), 1 deletions(-)
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java
index f6549bb..88a80c3 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java
@@ -2,6 +2,16 @@
import java.util.Date;
import java.util.List;
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel.Type;
+import com.ruoyi.framework.aspectj.lang.annotation.Excels;
import com.ruoyi.framework.web.domain.BaseEntity;
/**
@@ -14,24 +24,31 @@
private static final long serialVersionUID = 1L;
/** 鐢ㄦ埛ID */
+ @Excel(name = "鐢ㄦ埛搴忓彿", cellType = ColumnType.NUMERIC, prompt = "鐢ㄦ埛缂栧彿")
private Long userId;
/** 閮ㄩ棬ID */
+ @Excel(name = "閮ㄩ棬缂栧彿", type = Type.IMPORT)
private Long deptId;
/** 鐢ㄦ埛璐﹀彿 */
+ @Excel(name = "鐧诲綍鍚嶇О")
private String userName;
/** 鐢ㄦ埛鏄电О */
+ @Excel(name = "鐢ㄦ埛鍚嶇О")
private String nickName;
/** 鐢ㄦ埛閭 */
+ @Excel(name = "鐢ㄦ埛閭")
private String email;
/** 鎵嬫満鍙风爜 */
+ @Excel(name = "鎵嬫満鍙风爜")
private String phonenumber;
/** 鐢ㄦ埛鎬у埆 */
+ @Excel(name = "鐢ㄦ埛鎬у埆", readConverterExp = "0=鐢�,1=濂�,2=鏈煡")
private String sex;
/** 鐢ㄦ埛澶村儚 */
@@ -44,18 +61,25 @@
private String salt;
/** 甯愬彿鐘舵�侊紙0姝ｅ父 1鍋滅敤锛� */
+ @Excel(name = "甯愬彿鐘舵��", readConverterExp = "0=姝ｅ父,1=鍋滅敤")
private String status;
/** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
private String delFlag;
/** 鏈�鍚庣櫥闄咺P */
+ @Excel(name = "鏈�鍚庣櫥闄咺P", type = Type.EXPORT)
private String loginIp;
/** 鏈�鍚庣櫥闄嗘椂闂� */
+ @Excel(name = "鏈�鍚庣櫥闄嗘椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
private Date loginDate;
/** 閮ㄩ棬瀵硅薄 */
+ @Excels({
+ @Excel(name = "閮ㄩ棬鍚嶇О", targetAttr = "deptName", type = Type.EXPORT),
+ @Excel(name = "閮ㄩ棬璐熻矗浜�", targetAttr = "leader", type = Type.EXPORT)
+ })
private SysDept dept;
/** 瑙掕壊瀵硅薄 */
@@ -107,6 +131,7 @@
this.deptId = deptId;
}
+ @Size(min = 0, max = 30, message = "鐢ㄦ埛鏄电О闀垮害涓嶈兘瓒呰繃30涓瓧绗�")
public String getNickName()
{
return nickName;
@@ -117,6 +142,8 @@
this.nickName = nickName;
}
+ @NotBlank(message = "鐢ㄦ埛璐﹀彿涓嶈兘涓虹┖")
+ @Size(min = 0, max = 30, message = "鐢ㄦ埛璐﹀彿闀垮害涓嶈兘瓒呰繃30涓瓧绗�")
public String getUserName()
{
return userName;
@@ -127,6 +154,8 @@
this.userName = userName;
}
+ @Email(message = "閭鏍煎紡涓嶆纭�")
+ @Size(min = 0, max = 50, message = "閭闀垮害涓嶈兘瓒呰繃50涓瓧绗�")
public String getEmail()
{
return email;
@@ -137,6 +166,7 @@
this.email = email;
}
+ @Size(min = 0, max = 11, message = "鎵嬫満鍙风爜闀垮害涓嶈兘瓒呰繃11涓瓧绗�")
public String getPhonenumber()
{
return phonenumber;
@@ -167,6 +197,7 @@
this.avatar = avatar;
}
+ @JsonProperty
public String getPassword()
{
return password;
@@ -266,5 +297,30 @@
{
this.postIds = postIds;
}
-
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("userId", getUserId())
+ .append("deptId", getDeptId())
+ .append("userName", getUserName())
+ .append("nickName", getNickName())
+ .append("email", getEmail())
+ .append("phonenumber", getPhonenumber())
+ .append("sex", getSex())
+ .append("avatar", getAvatar())
+ .append("password", getPassword())
+ .append("salt", getSalt())
+ .append("status", getStatus())
+ .append("delFlag", getDelFlag())
+ .append("loginIp", getLoginIp())
+ .append("loginDate", getLoginDate())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .append("updateBy", getUpdateBy())
+ .append("updateTime", getUpdateTime())
+ .append("remark", getRemark())
+ .append("dept", getDept())
+ .toString();
+ }
}
--
Gitblit v1.9.3