From 28aaf2ffa1dbb860a292ba330a7e9362e60e7832 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: Fri, 12 Jul 2024 16:41:03 +0800
Subject: [PATCH] update
---
assess-system/src/main/java/com/gkhy/assess/system/domain/SysUser.java | 79 +++++++++++++++++++++++++++++----------
1 files changed, 58 insertions(+), 21 deletions(-)
diff --git a/assess-system/src/main/java/com/gkhy/assess/system/domain/SysUser.java b/assess-system/src/main/java/com/gkhy/assess/system/domain/SysUser.java
index 5368b5b..128ec62 100644
--- a/assess-system/src/main/java/com/gkhy/assess/system/domain/SysUser.java
+++ b/assess-system/src/main/java/com/gkhy/assess/system/domain/SysUser.java
@@ -1,13 +1,12 @@
package com.gkhy.assess.system.domain;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.gkhy.assess.common.domain.BaseEntity;
import com.gkhy.assess.common.validate.AgencyGroup;
import com.gkhy.assess.common.validate.ExpertGroup;
+import com.gkhy.assess.common.validate.MonitorGroup;
+import com.gkhy.assess.system.domain.vo.PersonProjectVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@@ -15,6 +14,8 @@
import lombok.experimental.Accessors;
import org.hibernate.validator.constraints.Length;
+import javax.validation.Valid;
+import javax.validation.constraints.Max;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
@@ -44,11 +45,14 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @NotBlank(message = "登录账号不能为空")
- @ApiModelProperty(value = "登录账号",required = true)
+ @NotBlank(message = "用户名不能为空")
+ @ApiModelProperty(value = "用户名",required = true)
+ @Length(min=5,max=16,message = "用户名长度需要在{min}和{max}之间")
+ @Pattern(regexp = "^[A-Za-z0-9]+$",message = "用户名只能由英文字母或者数字组成！")
@TableField("username")
private String username;
+ @Length(min = 0, max = 20, message = "用户昵称/姓名不能超过20个字符")
@ApiModelProperty("用户昵称/姓名")
@TableField("name")
private String name;
@@ -57,7 +61,8 @@
@TableField("identity")
private Integer identity;
- @ApiModelProperty("用户类型(0代表工作人员，1代表领导，默认0)")
+ @NotNull(message = "用户类型不能为空",groups ={MonitorGroup.class} )
+ @ApiModelProperty("用户类型(0代表工作人员，1代表领导，默认0)监管用户")
@TableField("user_type")
private Integer userType;
@@ -67,7 +72,7 @@
@NotBlank(message = "手机号码不能为空")
@Length(min = 11, max = 11, message = "手机号只能为11位")
- @Pattern(regexp = "^1[345678]\\\\d{9}$",message = "手机号码有误！")
+ @Pattern(regexp = "^[1][3,4,5,6,7,8,9][0-9]{9}$",message = "手机号码有误！")
@ApiModelProperty(value = "手机号码",required = true)
@TableField("phone")
private String phone;
@@ -80,8 +85,11 @@
@TableField("avatar")
private String avatar;
+ /**
+ * 密码生成规则:md5(用户名+密码+盐)
+ */
@NotBlank(message = "密码不能为空")
- @ApiModelProperty(value = "密码",required = true)
+ @ApiModelProperty(value = "密码(base64)",required = true)
@TableField("password")
private String password;
@@ -97,6 +105,7 @@
@TableField("del_flag")
private Integer delFlag;
+ @NotBlank(message = "管辖区域不能为空",groups ={MonitorGroup.class} )
@ApiModelProperty("管辖区域")
@TableField("manage_region")
private String manageRegion;
@@ -106,7 +115,7 @@
private Long agencyId;
@NotNull(message = "专家类型不能为空",groups ={ExpertGroup.class} )
- @ApiModelProperty("专家类型")
+ @ApiModelProperty("专家类型(专家用户)(1安全评价，2检验检测)")
@TableField("expert_type")
private Integer expertType;
@@ -126,13 +135,13 @@
private String jobTitle;
@NotBlank(message = "专业方向不能为空",groups ={ExpertGroup.class} )
- @ApiModelProperty("专业方向")
+ @ApiModelProperty("专业方向,新增时传(json字符串{'专业id':'证书编号1','专业id':'证书编号2'}),查询时传字典id")
@TableField("major")
private String major;
- @ApiModelProperty("审批状态(0审批通过，1待审批，2未通过 默认1)")
- @TableField("approve")
- private Integer approve;
+ @ApiModelProperty("审批状态(0暂存，1审核中，2审批通过，3审批驳回，4已作废 默认1)")
+ @TableField("state")
+ private Integer state;
@ApiModelProperty("最后登录ip")
@TableField("login_ip")
@@ -146,24 +155,52 @@
@TableField("pwd_update_date")
private LocalDateTime pwdUpdateDate;
+ @Version
+ @ApiModelProperty("乐观锁")
+ @TableField("version")
+ private Integer version;
+
+ @ApiModelProperty("证书编号,多个证书，逗号隔开")
+ @TableField("certificate_no")
+ private String certificateNo;
+
+ @ApiModelProperty("近期证件照路径")
+ @TableField("id_photo")
+ private String idPhoto;
+
+ @ApiModelProperty("评价师等级")
+ @TableField("level")
+ private String level;
+
+ @Valid
@NotNull(message = "机构不能为空",groups ={AgencyGroup.class} )
- @ApiModelProperty("机构对象")
+ @ApiModelProperty("机构对象，只限创建机构用户传参")
@TableField(exist = false)
private SysAgency agency;
- @NotNull(message = "社保照片不能为空",groups ={ExpertGroup.class} )
- @ApiModelProperty("社保照片路径列表")
+
+ @ApiModelProperty("社保照片路径列表,创建专家传参")
@TableField(exist = false)
private List<SysAttach> socialAttach;
- @NotNull(message = "医保照片不能为空",groups ={ExpertGroup.class} )
- @ApiModelProperty("医保照片路径列表")
+ @ApiModelProperty("医保照片路径列表,创建专家传参")
@TableField(exist = false)
private List<SysAttach> medicalAttach;
- @NotNull(message = "工资照片不能为空",groups ={ExpertGroup.class} )
- @ApiModelProperty("工资照片路径列表")
+ @ApiModelProperty("工资照片路径列表,创建专家传参")
@TableField(exist = false)
private List<SysAttach> salaryAttach;
+ @ApiModelProperty("专业列表")
+ @TableField(exist = false)
+ List<String> majorNames;
+
+ @ApiModelProperty("汇总项目信息")
+ @TableField(exist = false)
+ private PersonProjectVO personProjectVO;
+
+ @ApiModelProperty("机构名称")
+ @TableField(exist = false)
+ private String agencyName;
+
}
--
Gitblit v1.9.2