|
@@ -13,71 +13,134 @@ import java.util.List;
|
|
|
|
|
|
/**
|
|
|
* 用户对象 sys_user
|
|
|
- *
|
|
|
+ *
|
|
|
* @author ruoyi
|
|
|
*/
|
|
|
-public class SysUserVO extends BaseEntity
|
|
|
-{
|
|
|
+public class SysUserVO extends BaseEntity {
|
|
|
private static final long serialVersionUID = 1L;
|
|
|
|
|
|
- /** 用户ID */
|
|
|
+ /**
|
|
|
+ * 用户ID
|
|
|
+ */
|
|
|
private Long userId;
|
|
|
|
|
|
- /** 部门ID */
|
|
|
+ /**
|
|
|
+ * 部门ID
|
|
|
+ */
|
|
|
private Long deptId;
|
|
|
|
|
|
- /** 用户账号 */
|
|
|
+ /**
|
|
|
+ * 用户账号
|
|
|
+ */
|
|
|
private String userName;
|
|
|
|
|
|
- /** 用户昵称 */
|
|
|
+ /**
|
|
|
+ * 用户昵称
|
|
|
+ */
|
|
|
private String nickName;
|
|
|
|
|
|
- /** 用户邮箱 */
|
|
|
+ /**
|
|
|
+ * 用户邮箱
|
|
|
+ */
|
|
|
private String email;
|
|
|
|
|
|
- /** 手机号码 */
|
|
|
+ /**
|
|
|
+ * 手机号码
|
|
|
+ */
|
|
|
private String phonenumber;
|
|
|
|
|
|
- /** 用户性别 */
|
|
|
+ /**
|
|
|
+ * 用户性别
|
|
|
+ */
|
|
|
private String sex;
|
|
|
|
|
|
- /** 用户头像 */
|
|
|
+ /**
|
|
|
+ * 用户头像
|
|
|
+ */
|
|
|
private String avatar;
|
|
|
|
|
|
- /** 密码 */
|
|
|
+ /**
|
|
|
+ * 密码
|
|
|
+ */
|
|
|
private String password;
|
|
|
|
|
|
- /** 帐号状态(0正常 1停用) */
|
|
|
+ /**
|
|
|
+ * 盐加密
|
|
|
+ */
|
|
|
+ private String salt;
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 帐号状态(0正常 1停用)
|
|
|
+ */
|
|
|
private String status;
|
|
|
|
|
|
- /** 删除标志(0代表存在 2代表删除) */
|
|
|
+ /**
|
|
|
+ * 删除标志(0代表存在 2代表删除)
|
|
|
+ */
|
|
|
private String delFlag;
|
|
|
|
|
|
- /** 最后登录IP */
|
|
|
+ /**
|
|
|
+ * 最后登录IP
|
|
|
+ */
|
|
|
private String loginIp;
|
|
|
|
|
|
- /** 最后登录时间 */
|
|
|
+ /**
|
|
|
+ * 最后登录时间
|
|
|
+ */
|
|
|
private Date loginDate;
|
|
|
|
|
|
- /** 部门对象 */
|
|
|
+ /**
|
|
|
+ * 部门对象
|
|
|
+ */
|
|
|
private SysDeptVO dept;
|
|
|
|
|
|
- /** 角色对象 */
|
|
|
+ /**
|
|
|
+ * 角色对象
|
|
|
+ */
|
|
|
private List<SysRoleVO> roles;
|
|
|
|
|
|
- /** 角色组 */
|
|
|
+ /**
|
|
|
+ * 角色组
|
|
|
+ */
|
|
|
private Long[] roleIds;
|
|
|
|
|
|
- /** 岗位组 */
|
|
|
+ /**
|
|
|
+ * 岗位组
|
|
|
+ */
|
|
|
private Long[] postIds;
|
|
|
|
|
|
- /** 角色ID */
|
|
|
+ /**
|
|
|
+ * 角色ID
|
|
|
+ */
|
|
|
private Long roleId;
|
|
|
/**
|
|
|
* 租户id
|
|
|
*/
|
|
|
private Integer tenantId;
|
|
|
|
|
|
+ /**
|
|
|
+ * 地址
|
|
|
+ */
|
|
|
+ private String address;
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 用户类型
|
|
|
+ */
|
|
|
+ private String userType;
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 姓名
|
|
|
+ */
|
|
|
+ private String fullName;
|
|
|
+
|
|
|
+ public String getAddress() {
|
|
|
+ return address;
|
|
|
+ }
|
|
|
+
|
|
|
+ public void setAddress(String address) {
|
|
|
+ this.address = address;
|
|
|
+ }
|
|
|
+
|
|
|
public Integer getTenantId() {
|
|
|
return tenantId;
|
|
|
}
|
|
@@ -86,236 +149,211 @@ public class SysUserVO extends BaseEntity
|
|
|
this.tenantId = tenantId;
|
|
|
}
|
|
|
|
|
|
+ public String getUserType() {
|
|
|
+ return userType;
|
|
|
+ }
|
|
|
|
|
|
+ public void setUserType(String userType) {
|
|
|
+ this.userType = userType;
|
|
|
+ }
|
|
|
|
|
|
- public SysUserVO()
|
|
|
- {
|
|
|
+ public String getFullName() {
|
|
|
+ return fullName;
|
|
|
+ }
|
|
|
|
|
|
+ public void setFullName(String fullName) {
|
|
|
+ this.fullName = fullName;
|
|
|
}
|
|
|
|
|
|
- public SysUserVO(Long userId)
|
|
|
- {
|
|
|
+ public SysUserVO() {
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ public SysUserVO(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;
|
|
|
}
|
|
|
|
|
|
@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;
|
|
|
}
|
|
|
|
|
|
@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;
|
|
|
}
|
|
|
|
|
|
@JsonProperty
|
|
|
- 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 SysDeptVO getDept()
|
|
|
- {
|
|
|
+ public SysDeptVO getDept() {
|
|
|
return dept;
|
|
|
}
|
|
|
|
|
|
- public void setDept(SysDeptVO dept)
|
|
|
- {
|
|
|
+ public void setDept(SysDeptVO dept) {
|
|
|
this.dept = dept;
|
|
|
}
|
|
|
|
|
|
- public List<SysRoleVO> getRoles()
|
|
|
- {
|
|
|
+ public List<SysRoleVO> getRoles() {
|
|
|
return roles;
|
|
|
}
|
|
|
|
|
|
- public void setRoles(List<SysRoleVO> roles)
|
|
|
- {
|
|
|
+ public void setRoles(List<SysRoleVO> 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;
|
|
|
}
|
|
|
+
|
|
|
@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();
|
|
|
}
|
|
|
}
|