From 983bdb5b89932b38d08a11ad1eed6ea89d1597e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 29 一月 2024 10:07:31 +0800
Subject: [PATCH] 更新
---
assess-system/src/main/java/com/gkhy/assess/system/domain/SysAgency.java | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/assess-system/src/main/java/com/gkhy/assess/system/domain/SysAgency.java b/assess-system/src/main/java/com/gkhy/assess/system/domain/SysAgency.java
index 51943af..ed2f452 100644
--- a/assess-system/src/main/java/com/gkhy/assess/system/domain/SysAgency.java
+++ b/assess-system/src/main/java/com/gkhy/assess/system/domain/SysAgency.java
@@ -1,16 +1,16 @@
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 java.io.Serializable;
import java.time.LocalDateTime;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;
+import com.gkhy.assess.common.annotation.DataDesensitizationType;
import com.gkhy.assess.common.domain.BaseEntity;
+import com.gkhy.assess.common.enums.SensitiveTypeEnum;
import com.gkhy.assess.common.validate.AgencyGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -23,6 +23,7 @@
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL;
@@ -49,6 +50,7 @@
@NotBlank(message = "机构名称不能为空")
+ @Length(min = 1, max = 50, message = "机构名称不能超过50个字符")
@ApiModelProperty("机构名称")
@TableField("name")
private String name;
@@ -83,6 +85,7 @@
@NotBlank(message = "经营地址不能为空")
+ @Length(min = 1, max = 100, message = "经营地址不能超过100个字符")
@ApiModelProperty(value = "经营地址",required = true)
@TableField("address")
private String address;
@@ -98,8 +101,10 @@
private String legalPerson;
+ @DataDesensitizationType(type = SensitiveTypeEnum.MOBILE_PHONE)
@NotBlank(message = "法人电话不能为空")
@Length(min = 11, max = 11, message = "手机号只能为11位")
+ @Pattern(regexp = "^[1][3,4,5,6,7,8,9][0-9]{9}$",message = "手机号码有误！")
@ApiModelProperty(value = "法人电话",required = true)
@TableField("legal_phone")
private String legalPhone;
@@ -110,9 +115,10 @@
@TableField("manager")
private String manager;
-
+ @DataDesensitizationType(type = SensitiveTypeEnum.MOBILE_PHONE)
@NotBlank(message = "负责人电话不能为空")
@Length(min = 11, max = 11, message = "手机号只能为11位")
+ @Pattern(regexp = "^[1][3,4,5,6,7,8,9][0-9]{9}$",message = "手机号码有误！")
@ApiModelProperty(value = "负责人电话",required = true)
@TableField("manager_phone")
private String managerPhone;
@@ -127,16 +133,16 @@
@NotNull(message = "发证日期不能为空")
@ApiModelProperty(value = "发证日期",required = true)
@TableField("issue_date")
- @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+// @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime issueDate;
@NotNull(message = "有效日期不能为空")
@ApiModelProperty(value = "有效日期",required = true)
@TableField("valid_date")
- @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+// @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime validDate;
@@ -159,6 +165,7 @@
@NotBlank(message = "注册地址不能为空")
+ @Length(min = 1, max = 100, message = "注册地址不能超过100个字符")
@ApiModelProperty(value = "注册地址",required = true)
@TableField("reg_address")
private String regAddress;
@@ -191,4 +198,9 @@
@TableField(exist = false)
private SysUser user;
+ @Version
+ @ApiModelProperty("乐观锁")
+ @TableField("version")
+ private Integer version;
+
}
--
Gitblit v1.9.2