From 9526971c403417c1c007804f24884c443b9e6cd7 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 04 九月 2024 00:34:40 +0800
Subject: [PATCH] 代码提交
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 258 ++++++++++++++++++++++++++-------------------------
1 files changed, 132 insertions(+), 126 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index 53ad695..44bd409 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -3,6 +3,10 @@
import java.util.Date;
import java.util.List;
import javax.validation.constraints.*;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@@ -14,311 +18,313 @@
/**
* 鐢ㄦ埛瀵硅薄 sys_user
- *
+ *
* @author ruoyi
*/
-public class SysUser extends BaseEntity
-{
+@ApiModel(value = "SysUser", description = "鐢ㄦ埛瀵硅薄")
+public class SysUser extends BaseEntity {
private static final long serialVersionUID = 1L;
- /** 鐢ㄦ埛ID */
+ /**
+ * 鐢ㄦ埛ID
+ */
+ @ApiModelProperty(value = "涓婚敭")
@Excel(name = "鐢ㄦ埛搴忓彿", cellType = ColumnType.NUMERIC, prompt = "鐢ㄦ埛缂栧彿")
private Long userId;
- /** 閮ㄩ棬ID */
+ /**
+ * 閮ㄩ棬ID
+ */
+ @ApiModelProperty(value = "閮ㄩ棬ID")
@Excel(name = "閮ㄩ棬缂栧彿", type = Type.IMPORT)
private Long deptId;
- /** 鐢ㄦ埛璐﹀彿 */
+ /**
+ * 鐢ㄦ埛璐﹀彿
+ */
+ @ApiModelProperty(value = "鐢ㄦ埛璐﹀彿")
@Excel(name = "鐧诲綍鍚嶇О")
private String userName;
- /** 鐢ㄦ埛鏄电О */
+ /**
+ * 鐢ㄦ埛鏄电О
+ */
+ @ApiModelProperty(value = "鐢ㄦ埛鏄电О")
@Excel(name = "鐢ㄦ埛鍚嶇О")
private String nickName;
- /** 鐢ㄦ埛閭 */
+ /**
+ * 鐢ㄦ埛閭
+ */
+ @ApiModelProperty(value = "鐢ㄦ埛閭")
@Excel(name = "鐢ㄦ埛閭")
private String email;
- /** 鎵嬫満鍙风爜 */
+ /**
+ * 鎵嬫満鍙风爜
+ */
+ @ApiModelProperty(value = "鎵嬫満鍙风爜")
@Excel(name = "鎵嬫満鍙风爜")
private String phonenumber;
- /** 鐢ㄦ埛鎬у埆 */
+ /**
+ * 鐢ㄦ埛鎬у埆
+ */
+ @ApiModelProperty(value = "鐢ㄦ埛鎬у埆")
@Excel(name = "鐢ㄦ埛鎬у埆", readConverterExp = "0=鐢�,1=濂�,2=鏈煡")
private String sex;
- /** 鐢ㄦ埛澶村儚 */
+ /**
+ * 鐢ㄦ埛澶村儚
+ */
+ @ApiModelProperty(value = "鐢ㄦ埛澶村儚")
private String avatar;
- /** 瀵嗙爜 */
+ /**
+ * 瀵嗙爜
+ */
+ @ApiModelProperty(value = "瀵嗙爜")
private String password;
- /** 甯愬彿鐘舵�侊紙0姝ｅ父 1鍋滅敤锛� */
+ /**
+ * 甯愬彿鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
+ */
+ @ApiModelProperty(value = "甯愬彿鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�")
@Excel(name = "甯愬彿鐘舵��", readConverterExp = "0=姝ｅ父,1=鍋滅敤")
private String status;
- /** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
+ /**
+ * 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�
+ */
+ @ApiModelProperty(value = "鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�")
private String delFlag;
- /** 鏈�鍚庣櫥褰旾P */
+ /**
+ * 鏈�鍚庣櫥褰旾P
+ */
+ @ApiModelProperty(value = "鏈�鍚庣櫥褰旾P")
@Excel(name = "鏈�鍚庣櫥褰旾P", type = Type.EXPORT)
private String loginIp;
- /** 鏈�鍚庣櫥褰曟椂闂� */
+ /**
+ * 鏈�鍚庣櫥褰曟椂闂�
+ */
+ @ApiModelProperty(value = "鏈�鍚庣櫥褰曟椂闂�")
@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)
- })
+ /**
+ * 閮ㄩ棬瀵硅薄
+ */
+ @ApiModelProperty(value = "閮ㄩ棬瀵硅薄")
+ @Excels({@Excel(name = "閮ㄩ棬鍚嶇О", targetAttr = "deptName", type = Type.EXPORT), @Excel(name = "閮ㄩ棬璐熻矗浜�", targetAttr = "leader", type = Type.EXPORT)})
private SysDept dept;
- /** 瑙掕壊瀵硅薄 */
+ @ApiModelProperty(value = "閮ㄩ棬闆嗗悎")
+ private List<Long> depts;
+
+ /**
+ * 瑙掕壊瀵硅薄
+ */
+ @ApiModelProperty(value = "瑙掕壊瀵硅薄")
private List<SysRole> roles;
- /** 瑙掕壊缁� */
+ /**
+ * 瑙掕壊缁�
+ */
+ @ApiModelProperty(value = "瑙掕壊缁�")
private Long[] roleIds;
- /** 宀椾綅缁� */
+ /**
+ * 宀椾綅缁�
+ */
+ @ApiModelProperty(value = "宀椾綅缁�")
private Long[] postIds;
- /** 瑙掕壊ID */
+ /**
+ * 瑙掕壊ID
+ */
+ @ApiModelProperty(value = "瑙掕壊ID")
private Long roleId;
- public SysUser()
- {
+ public SysUser() {
}
- public SysUser(Long userId)
- {
+ public SysUser(Long userId) {
this.userId = userId;
}
- public Long getUserId()
- {
+ public Long getUserId() {
return userId;
}
- public void setUserId(Long userId)
- {
+ public void setUserId(Long userId) {
this.userId = userId;
}
- public boolean isAdmin()
- {
+ public boolean isAdmin() {
return isAdmin(this.userId);
}
- public static boolean isAdmin(Long userId)
- {
+ public static boolean isAdmin(Long userId) {
return userId != null && 1L == userId;
}
- public Long getDeptId()
- {
+ public Long getDeptId() {
return deptId;
}
- public void setDeptId(Long deptId)
- {
+ public void setDeptId(Long deptId) {
this.deptId = deptId;
}
@Xss(message = "鐢ㄦ埛鏄电О涓嶈兘鍖呭惈鑴氭湰瀛楃")
@Size(min = 0, max = 30, message = "鐢ㄦ埛鏄电О闀垮害涓嶈兘瓒呰繃30涓瓧绗�")
- public String getNickName()
- {
+ public String getNickName() {
return nickName;
}
- public void setNickName(String nickName)
- {
+ public void setNickName(String nickName) {
this.nickName = nickName;
}
@Xss(message = "鐢ㄦ埛璐﹀彿涓嶈兘鍖呭惈鑴氭湰瀛楃")
@NotBlank(message = "鐢ㄦ埛璐﹀彿涓嶈兘涓虹┖")
@Size(min = 0, max = 30, message = "鐢ㄦ埛璐﹀彿闀垮害涓嶈兘瓒呰繃30涓瓧绗�")
- public String getUserName()
- {
+ public String getUserName() {
return userName;
}
- public void setUserName(String userName)
- {
+ public void setUserName(String userName) {
this.userName = userName;
}
@Email(message = "閭鏍煎紡涓嶆纭�")
@Size(min = 0, max = 50, message = "閭闀垮害涓嶈兘瓒呰繃50涓瓧绗�")
- public String getEmail()
- {
+ public String getEmail() {
return email;
}
- public void setEmail(String email)
- {
+ public void setEmail(String email) {
this.email = email;
}
@Size(min = 0, max = 11, message = "鎵嬫満鍙风爜闀垮害涓嶈兘瓒呰繃11涓瓧绗�")
- public String getPhonenumber()
- {
+ public String getPhonenumber() {
return phonenumber;
}
- public void setPhonenumber(String phonenumber)
- {
+ public void setPhonenumber(String phonenumber) {
this.phonenumber = phonenumber;
}
- public String getSex()
- {
+ public String getSex() {
return sex;
}
- public void setSex(String sex)
- {
+ public void setSex(String sex) {
this.sex = sex;
}
- public String getAvatar()
- {
+ public String getAvatar() {
return avatar;
}
- public void setAvatar(String avatar)
- {
+ public void setAvatar(String avatar) {
this.avatar = avatar;
}
- public String getPassword()
- {
+ public String getPassword() {
return password;
}
- public void setPassword(String password)
- {
+ public void setPassword(String password) {
this.password = password;
}
- public String getStatus()
- {
+ public String getStatus() {
return status;
}
- public void setStatus(String status)
- {
+ public void setStatus(String status) {
this.status = status;
}
- public String getDelFlag()
- {
+ public String getDelFlag() {
return delFlag;
}
- public void setDelFlag(String delFlag)
- {
+ public void setDelFlag(String delFlag) {
this.delFlag = delFlag;
}
- public String getLoginIp()
- {
+ public String getLoginIp() {
return loginIp;
}
- public void setLoginIp(String loginIp)
- {
+ public void setLoginIp(String loginIp) {
this.loginIp = loginIp;
}
- public Date getLoginDate()
- {
+ public Date getLoginDate() {
return loginDate;
}
- public void setLoginDate(Date loginDate)
- {
+ public void setLoginDate(Date loginDate) {
this.loginDate = loginDate;
}
- public SysDept getDept()
- {
+ public SysDept getDept() {
return dept;
}
- public void setDept(SysDept dept)
- {
+ public void setDept(SysDept dept) {
this.dept = dept;
}
- public List<SysRole> getRoles()
- {
+ public List<SysRole> getRoles() {
return roles;
}
- public void setRoles(List<SysRole> roles)
- {
+ public void setRoles(List<SysRole> roles) {
this.roles = roles;
}
- public Long[] getRoleIds()
- {
+ public Long[] getRoleIds() {
return roleIds;
}
- public void setRoleIds(Long[] roleIds)
- {
+ public void setRoleIds(Long[] roleIds) {
this.roleIds = roleIds;
}
- public Long[] getPostIds()
- {
+ public Long[] getPostIds() {
return postIds;
}
- public void setPostIds(Long[] postIds)
- {
+ public void setPostIds(Long[] postIds) {
this.postIds = postIds;
}
- public Long getRoleId()
- {
+ public Long getRoleId() {
return roleId;
}
- public void setRoleId(Long roleId)
- {
+ public void setRoleId(Long roleId) {
this.roleId = roleId;
+ }
+
+ public List<Long> getDepts() {
+ return depts;
+ }
+
+ public void setDepts(List<Long> depts) {
+ this.depts = depts;
}
@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("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();
+ 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("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