Skip to content

W
wangxiaolu-sfa-api-system
提交 eb0b496e authored 作者: 李秋林's avatar 李秋林
浏览文件
操作

创建UserVo，与SysUser解耦

上级 eb34206c
隐藏空白字符变更
内嵌 并排
正在显示 包含 180 行增加 和 230 行删除
pom.xml
浏览文件 @ eb0b496e
...@@ -19,7 +19,18 @@ ...@@ -19,7 +19,18 @@
</description> </description>
<dependencies> <dependencies>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-annotation</artifactId>
</dependency>
<!-- RuoYi Common Core--> <!-- RuoYi Common Core-->
<dependency> <dependency>
<groupId>com.wangxiaolu.sfa</groupId> <groupId>com.wangxiaolu.sfa</groupId>
......
src/main/java/com/sfa/system/api/domain/SysUser.java
浏览文件 @ eb0b496e
package com.sfa.system.api.domain; package com.sfa.system.api.domain;
import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType;
import java.util.List; import com.baomidou.mybatisplus.annotation.TableId;
import javax.validation.constraints.*; import com.baomidou.mybatisplus.annotation.TableName;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.sfa.common.core.annotation.Excel; import com.sfa.common.core.annotation.Excel;
import com.sfa.common.core.annotation.Excel.ColumnType; import com.sfa.common.core.annotation.Excel.ColumnType;
import com.sfa.common.core.annotation.Excel.Type; import com.sfa.common.core.annotation.Excel.Type;
import com.sfa.common.core.annotation.Excels; import com.sfa.common.core.annotation.Excels;
import com.sfa.common.core.web.domain.BaseEntity; import com.sfa.common.core.web.domain.BaseDo;
import com.sfa.common.core.xss.Xss; import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
import java.util.List;
/** /**
* 用户对象 sys_user * 用户对象 sys_user
* *
* @author ruoyi * @author ruoyi
*/ */
public class SysUser extends BaseEntity @NoArgsConstructor
@Data
@TableName(value = "sys_user")
public class SysUser extends BaseDo
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 用户ID */ /** 用户ID */
@Excel(name = "用户序号", type = Type.EXPORT, cellType = ColumnType.NUMERIC, prompt = "用户编号") @Excel(name = "用户序号", type = Type.EXPORT, cellType = ColumnType.NUMERIC, prompt = "用户编号")
@TableId(type = IdType.AUTO)
private Long userId; private Long userId;
/** 部门ID */ /** 部门ID */
...@@ -55,6 +61,18 @@ public class SysUser extends BaseEntity ...@@ -55,6 +61,18 @@ public class SysUser extends BaseEntity
/** 密码 */ /** 密码 */
private String password; private String password;
/** 岗位编码 */
private String postCode;
/** 岗位名称 */
private String postName;
/** 规则编号 */
private String ruleNum;
/** 规则名称 */
private String ruleName;
/** 帐号状态（0正常 1停用） */ /** 帐号状态（0正常 1停用） */
@Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用") @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
private String status; private String status;
...@@ -89,26 +107,6 @@ public class SysUser extends BaseEntity ...@@ -89,26 +107,6 @@ public class SysUser extends BaseEntity
/** 角色ID */ /** 角色ID */
private Long roleId; private Long roleId;
public SysUser()
{
}
public SysUser(Long userId)
{
this.userId = userId;
}
public Long getUserId()
{
return userId;
}
public void setUserId(Long userId)
{
this.userId = userId;
}
public boolean isAdmin() public boolean isAdmin()
{ {
return isAdmin(this.userId); return isAdmin(this.userId);
...@@ -119,205 +117,7 @@ public class SysUser extends BaseEntity ...@@ -119,205 +117,7 @@ public class SysUser extends BaseEntity
return userId != null && 1L == userId; return userId != null && 1L == userId;
} }
public Long getDeptId() public SysUser(Long userId) {
{ this.userId = userId;
return deptId;
}
public void setDeptId(Long deptId)
{
this.deptId = deptId;
}
@Xss(message = "用户昵称不能包含脚本字符")
@Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
public String getNickName()
{
return nickName;
}
public void setNickName(String nickName)
{
this.nickName = nickName;
}
@Xss(message = "用户账号不能包含脚本字符")
@NotBlank(message = "用户账号不能为空")
@Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
public String getUserName()
{
return userName;
}
public void setUserName(String userName)
{
this.userName = userName;
}
@Email(message = "邮箱格式不正确")
@Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
public String getEmail()
{
return email;
}
public void setEmail(String email)
{
this.email = email;
}
@Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符")
public String getPhonenumber()
{
return phonenumber;
}
public void setPhonenumber(String phonenumber)
{
this.phonenumber = phonenumber;
}
public String getSex()
{
return sex;
}
public void setSex(String sex)
{
this.sex = sex;
}
public String getAvatar()
{
return avatar;
}
public void setAvatar(String avatar)
{
this.avatar = avatar;
}
public String getPassword()
{
return password;
}
public void setPassword(String password)
{
this.password = password;
}
public String getStatus()
{
return status;
}
public void setStatus(String status)
{
this.status = status;
}
public String getDelFlag()
{
return delFlag;
}
public void setDelFlag(String delFlag)
{
this.delFlag = delFlag;
}
public String getLoginIp()
{
return loginIp;
}
public void setLoginIp(String loginIp)
{
this.loginIp = loginIp;
}
public Date getLoginDate()
{
return loginDate;
}
public void setLoginDate(Date loginDate)
{
this.loginDate = loginDate;
}
public SysDept getDept()
{
return dept;
}
public void setDept(SysDept dept)
{
this.dept = dept;
}
public List<SysRole> getRoles()
{
return roles;
}
public void setRoles(List<SysRole> roles)
{
this.roles = roles;
}
public Long[] getRoleIds()
{
return roleIds;
}
public void setRoleIds(Long[] roleIds)
{
this.roleIds = roleIds;
}
public Long[] getPostIds()
{
return postIds;
}
public void setPostIds(Long[] postIds)
{
this.postIds = postIds;
}
public Long getRoleId()
{
return 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();
} }
} }
src/main/java/com/sfa/system/api/pojo/request/UserVo.java 0 → 100644
浏览文件 @ eb0b496e
package com.sfa.system.api.pojo.request;
import com.sfa.common.core.annotation.Excel;
import com.sfa.common.core.annotation.Excels;
import com.sfa.common.core.xss.Xss;
import com.sfa.system.api.domain.SysDept;
import com.sfa.system.api.domain.SysRole;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
import java.util.Date;
import java.util.List;
/**
* @author : liqiulin
* @date : 2024-10-30 16
* @describe :
*/
@AllArgsConstructor
@NoArgsConstructor
@Accessors(chain = true)
@Data
public class UserVo {
/** 用户ID */
@Excel(name = "用户序号", type = Excel.Type.EXPORT, cellType = Excel.ColumnType.NUMERIC, prompt = "用户编号")
private Long userId;
/** 部门ID */
@Excel(name = "部门编号", type = Excel.Type.IMPORT)
private Long deptId;
/** 用户账号 */
@Excel(name = "登录名称")
@Xss(message = "用户账号不能包含脚本字符")
@NotBlank(message = "用户账号不能为空")
@Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
private String userName;
/** 用户昵称 */
@Excel(name = "用户名称")
@Xss(message = "用户昵称不能包含脚本字符")
@NotBlank(message = "用户昵称不能为空")
@Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
private String nickName;
/** 用户邮箱 */
@Excel(name = "用户邮箱")
@Email(message = "邮箱格式不正确")
@Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
private String email;
/** 手机号码 */
@Excel(name = "手机号码", cellType = Excel.ColumnType.TEXT)
@Size(min = 0, max = 11, message = "手机号码不能超过11个字符")
private String phonenumber;
/** 用户性别 */
@Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知")
private String sex;
/** 用户头像 */
private String avatar;
/** 密码 */
private String password;
/** 岗位编码 */
private String postCode;
/** 岗位名称 */
private String postName;
/** 规则编号 */
private String ruleNum;
/** 规则名称 */
private String ruleName;
/** 帐号状态（0正常 1停用） */
@Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
private String status;
/** 删除标志（0代表存在 2代表删除） */
private String delFlag;
/** 最后登录IP */
@Excel(name = "最后登录IP", type = Excel.Type.EXPORT)
private String loginIp;
/** 最后登录时间 */
@Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Excel.Type.EXPORT)
private Date loginDate;
/** 部门对象 */
@Excels({
@Excel(name = "部门名称", targetAttr = "deptName", type = Excel.Type.EXPORT),
@Excel(name = "部门负责人", targetAttr = "leader", type = Excel.Type.EXPORT)
})
private SysDept dept;
/** 角色对象 */
private List<SysRole> roles;
/** 角色组 */
private Long[] roleIds;
/** 岗位组 */
private Long[] postIds;
/** 角色ID */
private Long roleId;
/** 创建者 */
private String createBy;
/** 创建者 */
private Long createUserId;
/** 创建时间 */
private Date createTime;
/** 更新者 */
private String updateBy;
/** 更新者 */
private Long updateUserId;
/** 更新时间 */
private Date updateTime;
/** 备注 */
private String remark;
}
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论