From 789a6e952067f74d828c7b1cc0e5ceaa50c566b6 Mon Sep 17 00:00:00 2001
From: 克 刘 <4345453@qq.com>
Date: Fri, 03 Apr 2020 13:33:44 +0800
Subject: [PATCH] 1、扩展日期数据校验注解 2、扩展kidgrow-code-generator 中Controller.java.vm 保存修改数据校验、Model.java.vm 校验依赖包扩展

---
 kidgrow-demo/kidgrow-demo-order/src/main/java/com/kidgrow/order/model/OrderTest.java |   37 ++++++++++++++++++++++++++++++++++---
 1 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/kidgrow-demo/kidgrow-demo-order/src/main/java/com/kidgrow/order/model/OrderTest.java b/kidgrow-demo/kidgrow-demo-order/src/main/java/com/kidgrow/order/model/OrderTest.java
index 2b0d278..7c4a2ef 100644
--- a/kidgrow-demo/kidgrow-demo-order/src/main/java/com/kidgrow/order/model/OrderTest.java
+++ b/kidgrow-demo/kidgrow-demo-order/src/main/java/com/kidgrow/order/model/OrderTest.java
@@ -1,10 +1,19 @@
 package com.kidgrow.order.model;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.kidgrow.common.annotation.DateValidator;
 import com.kidgrow.common.model.SuperModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.hibernate.validator.constraints.*;
+import org.hibernate.validator.constraints.Email;
+import org.hibernate.validator.constraints.Length;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
 
 
 
@@ -24,11 +33,33 @@
     private static final long serialVersionUID = 1L;
 
     //
-    @NotBlank(message = "订单名不能为空")
+    @NotEmpty(message = "订单名不能为空")
     private String name;
     //
 
     @Length(min=5, max=10,message = "用户名长度为5-10")
-    @NotBlank(message = "用户名不能为空")
+    @NotEmpty(message = "用户名不能为空")
     private String namecn;
+
+    @DateValidator(minDate = "2019-01-01",message = "有效期限不能早于2019-01-01")
+    private Date addDate;
+
+
+    @NotEmpty(message = "邮箱不能为空")
+    @Email(message = "邮箱格式不正确")
+    private String mail;
+
+    @NotEmpty(message = "手机号不能为空")
+//    @Pattern(regexp= BaseConstants.PHONE_REGEXP,message = "手机号格式不正确")
+    private String phone;
+
+    @NotNull(message = "年龄不能为空")
+    @Min(value = 0,message = "年龄必须大于等于0")
+    @Max(value = 200,message = "年龄不能大于200")
+    private Integer age;
+
+    @NotNull(message = "性别不能为空")
+    @Min(value = 0,message = "性别,1-男,2-女,0-未知")
+    @Max(value = 2,message = "性别,1-男,2-女,0-未知")
+    private Integer sex;
 }

--
Gitblit v1.8.0