diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDTO.java index 71c1e8322..d02e14e46 100644 --- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDTO.java +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysUserDTO.java @@ -1,8 +1,8 @@ /** * Copyright (c) 2018 人人开源 All rights reserved. - * + *

* https://www.renren.io - * + *

* 版权所有，侵权必究！ */ @@ -36,63 +36,68 @@ import java.util.List; public class SysUserDTO implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "id") - @Null(message="{id.null}", groups = AddGroup.class) - @NotNull(message="{id.require}", groups = UpdateGroup.class) - private Long id; + @ApiModelProperty(value = "id") + @Null(message = "{id.null}", groups = AddGroup.class) + @NotNull(message = "{id.require}", groups = UpdateGroup.class) + private Long id; + + @ApiModelProperty(value = "用户名", required = true) + @NotBlank(message = "{sysuser.username.require}", groups = DefaultGroup.class) + private String username; - @ApiModelProperty(value = "用户名", required = true) - @NotBlank(message="{sysuser.username.require}", groups = DefaultGroup.class) - private String username; + @ApiModelProperty(value = "密码") + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + @NotBlank(message = "{sysuser.password.require}", groups = AddGroup.class) + private String password; - @ApiModelProperty(value = "密码") - @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) - @NotBlank(message="{sysuser.password.require}", groups = AddGroup.class) - private String password; + @ApiModelProperty(value = "姓名", required = true) + @NotBlank(message = "{sysuser.realname.require}", groups = DefaultGroup.class) + private String realName; - @ApiModelProperty(value = "姓名", required = true) - @NotBlank(message="{sysuser.realname.require}", groups = DefaultGroup.class) - private String realName; + @ApiModelProperty(value = "头像") + private String headUrl; - @ApiModelProperty(value = "头像") - private String headUrl; + @ApiModelProperty(value = "性别 0：男 1：女 2：保密", required = true) + @Range(min = 0, max = 2, message = "{sysuser.gender.range}", groups = DefaultGroup.class) + private Integer gender; - @ApiModelProperty(value = "性别 0：男 1：女 2：保密", required = true) - @Range(min=0, max=2, message = "{sysuser.gender.range}", groups = DefaultGroup.class) - private Integer gender; + @ApiModelProperty(value = "邮箱", required = true) + @NotBlank(message = "{sysuser.email.require}", groups = DefaultGroup.class) + @Email(message = "{sysuser.email.error}", groups = DefaultGroup.class) + private String email; - @ApiModelProperty(value = "邮箱", required = true) - @NotBlank(message="{sysuser.email.require}", groups = DefaultGroup.class) - @Email(message="{sysuser.email.error}", groups = DefaultGroup.class) - private String email; + @ApiModelProperty(value = "手机号", required = true) + @NotBlank(message = "{sysuser.mobile.require}", groups = DefaultGroup.class) + private String mobile; - @ApiModelProperty(value = "手机号", required = true) - @NotBlank(message="{sysuser.mobile.require}", groups = DefaultGroup.class) - private String mobile; + @ApiModelProperty(value = "部门ID", required = true) + @NotNull(message = "{sysuser.deptId.require}", groups = DefaultGroup.class) + private Long deptId; - @ApiModelProperty(value = "部门ID", required = true) - @NotNull(message="{sysuser.deptId.require}", groups = DefaultGroup.class) - private Long deptId; + @ApiModelProperty(value = "超级管理员 0：否 1：是") + @Range(min = 0, max = 1, message = "{sysuser.superadmin.range}", groups = DefaultGroup.class) + private Integer superAdmin; - @ApiModelProperty(value = "超级管理员 0：否 1：是") - @Range(min=0, max=1, message = "{sysuser.superadmin.range}", groups = DefaultGroup.class) - private Integer superAdmin; + @ApiModelProperty(value = "状态 0：停用 1：正常", required = true) + @Range(min = 0, max = 1, message = "{sysuser.status.range}", groups = DefaultGroup.class) + private Integer status; - @ApiModelProperty(value = "状态 0：停用 1：正常", required = true) - @Range(min=0, max=1, message = "{sysuser.status.range}", groups = DefaultGroup.class) - private Integer status; + @ApiModelProperty(value = "备注") + private String remark; - @ApiModelProperty(value = "备注") - private String remark; + @ApiModelProperty(value = "创建时间") + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + private Date createDate; - @ApiModelProperty(value = "创建时间") - @JsonProperty(access = JsonProperty.Access.READ_ONLY) - private Date createDate; + @ApiModelProperty(value = "角色ID列表") + private List roleIdList; - @ApiModelProperty(value = "角色ID列表") - private List roleIdList; + @ApiModelProperty(value = "部门名称") + private String deptName; - @ApiModelProperty(value = "部门名称") - private String deptName; + /** + * 用户标签key + */ + private String userTagKey; } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysUserEntity.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysUserEntity.java index 1bd8adc08..8dd6a7662 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysUserEntity.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysUserEntity.java @@ -1,8 +1,8 @@ /** * Copyright (c) 2018 人人开源 All rights reserved. - * + *

* https://www.renren.io - * + *

* 版权所有，侵权必究！ */ @@ -24,75 +24,80 @@ import java.util.Date; * @since 1.0.0 */ @Data -@EqualsAndHashCode(callSuper=false) +@EqualsAndHashCode(callSuper = false) @TableName("sys_user") public class SysUserEntity extends BaseEntity { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; + + /** + * 用户名 + */ + private String username; + /** + * 密码 + */ + private String password; + /** + * 姓名 + */ + private String realName; + /** + * 头像 + */ + private String headUrl; + /** + * 性别 0：男 1：女 2：保密 + */ + private Integer gender; + /** + * 邮箱 + */ + private String email; + /** + * 手机号 + */ + private String mobile; + /** + * 超级管理员 0：否 1：是 + */ + private Integer superAdmin; + /** + * 状态 0：停用 1：正常 + */ + private Integer status; + /** + * 备注 + */ + private String remark; + /** + * 部门ID + */ + private Long deptId; + /** + * 删除标识 0：未删除 1：删除 + */ + @TableField(fill = FieldFill.INSERT) + private Integer delFlag; + /** + * 更新者 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Long updater; + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updateDate; - /** - * 用户名 - */ - private String username; - /** - * 密码 - */ - private String password; - /** - * 姓名 - */ - private String realName; - /** - * 头像 - */ - private String headUrl; - /** - * 性别 0：男 1：女 2：保密 - */ - private Integer gender; - /** - * 邮箱 - */ - private String email; - /** - * 手机号 - */ - private String mobile; - /** - * 超级管理员 0：否 1：是 - */ - private Integer superAdmin; - /** - * 状态 0：停用 1：正常 - */ - private Integer status; - /** - * 备注 - */ - private String remark; - /** - * 部门ID - */ - private Long deptId; - /** - * 删除标识 0：未删除 1：删除 - */ - @TableField(fill = FieldFill.INSERT) - private Integer delFlag; - /** - * 更新者 - */ - @TableField(fill = FieldFill.INSERT_UPDATE) - private Long updater; - /** - * 更新时间 - */ - @TableField(fill = FieldFill.INSERT_UPDATE) - private Date updateDate; + /** + * 部门名称 + */ + @TableField(exist = false) + private String deptName; - /** - * 部门名称 - */ - @TableField(exist = false) - private String deptName; + /** + * 用户标签键值 + */ + private String userTagKey; } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml index dc3fcb2cf..e1dd9aaaf 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml @@ -18,8 +18,26 @@