1、NotBlank

Former-commit-id: 4bb8def536b8b970637d3b0d0711909b600fa72d

src/main/resources/modules/SpringBoot/java/module/req/createRequestClass.ftl

@@ -2,7 +2,7 @@ package ${basePackage}.module.${moduleName}.req;
 
 import ${basePackage}.frame.base.BaseRequest;
 import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotBlank;
 import org.hibernate.validator.constraints.Length;
 <#if table.has('Date')>
 import java.util.Date;
@@ -29,7 +29,7 @@ public class ${table.getCName()}CreateRequest extends BaseRequest {
     @NotNull(message = "[${field.getFName()}]${field.fieldComment?default("")}不能为NULL")
     </#if>
     <#if field.isMust && field.fieldType?contains("String_")>
-    @NotEmpty(message = "[${field.getFName()}]${field.fieldComment?default("")}不能为空")
+    @NotBlank(message = "[${field.getFName()}]${field.fieldComment?default("")}不能为空")
     </#if>
     <#if field.fieldType?contains("String_") && field.fieldType != 'String_super'>
     @Length(min = 0, max = ${field.fieldLength}, message = "[${field.getFName()}]${field.fieldComment?default("")}长度不合法(0-${field.fieldLength})")

src/main/resources/modules/SpringBoot/java/module/req/updateRequestClass.ftl

@@ -29,7 +29,7 @@ public class  ${table.getCName()}UpdateRequest extends BaseUpdateRequest {
     @NotNull(message = "[${field.getFName()}]${field.fieldComment?default("")}不能为NULL")
     </#if>
     <#if field.isMust && field.fieldType?contains("String_")>
-    @NotEmpty(message = "[${field.getFName()}]${field.fieldComment?default("")}不能为空")
+    @NotBlank(message = "[${field.getFName()}]${field.fieldComment?default("")}不能为空")
     </#if>
     <#if field.fieldType?contains("String_") && field.fieldType != 'String_super'>
     @Length(min = 0, max = ${field.fieldLength}, message = "[${field.getFName()}]${field.fieldComment?default("")}长度不合法(0-${field.fieldLength})")

src/main/resources/modules/SpringBoot/java/module/system/req/DeptCreateRequest.java

@@ -2,7 +2,7 @@ package ${basePackage}.module.system.req;
 
 import ${basePackage}.frame.base.BaseRequest;
 import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotBlank;
 import org.hibernate.validator.constraints.Length;
 
 /**
@@ -17,15 +17,15 @@ public class DeptCreateRequest extends BaseRequest {
     /**
      * 部门代码
      */
-    @NotEmpty(message = "[deptCode]部门代码不能为空")
-    @Length(min = 0, max = 50, message = "[deptCode]部门代码长度不合法(0-50)")
+    @NotBlank(message = "[deptCode]部门代码不能为空")
+    @Length(min = 1, max = 50, message = "[deptCode]部门代码长度不合法(1-50)")
     private String deptCode;
 
     /**
      * 部门名称
      */
-    @NotEmpty(message = "[deptName]部门名称不能为空")
-    @Length(min = 0, max = 100, message = "[deptName]部门名称长度不合法(0-100)")
+    @NotBlank(message = "[deptName]部门名称不能为空")
+    @Length(min = 1, max = 100, message = "[deptName]部门名称长度不合法(1-100)")
     private String deptName;
 
     /**

src/main/resources/modules/SpringBoot/java/module/system/req/DeptUpdateRequest.java

@@ -3,7 +3,7 @@ package ${basePackage}.module.system.req;
 import ${basePackage}.frame.base.BaseUpdateRequest;
 import javax.validation.constraints.NotNull;
 import org.hibernate.validator.constraints.Length;
-import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotBlank;
 
 /**
  * DeptUpdateRequest - 部门更新
@@ -23,15 +23,15 @@ public class  DeptUpdateRequest extends BaseUpdateRequest {
     /**
      * 部门代码
      */
-    @NotEmpty(message = "[deptCode]部门代码不能为空")
-    @Length(min = 0, max = 50, message = "[deptCode]部门代码长度不合法(0-50)")
+    @NotBlank(message = "[deptCode]部门代码不能为空")
+    @Length(min = 1, max = 50, message = "[deptCode]部门代码长度不合法(1-50)")
     private String deptCode;
 
     /**
      * 部门名称
      */
-    @NotEmpty(message = "[deptName]部门名称不能为空")
-    @Length(min = 0, max = 100, message = "[deptName]部门名称长度不合法(0-100)")
+    @NotBlank(message = "[deptName]部门名称不能为空")
+    @Length(min = 1, max = 100, message = "[deptName]部门名称长度不合法(1-100)")
     private String deptName;
 
     /**

src/main/resources/modules/SpringBoot/java/module/system/req/LogErrCreateRequest.java

@@ -4,7 +4,7 @@ import org.hibernate.validator.constraints.Length;
 import ${basePackage}.frame.base.BaseRequest;
 import ${basePackage}.frame.validation.Dict;
 
-import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -25,7 +25,7 @@ public class LogErrCreateRequest extends BaseRequest {
     /**
      * 错误标题
      */
-    @NotEmpty(message = "[title]错误标题不能为空")
+    @NotBlank(message = "[title]错误标题不能为空")
     @Length(min = 0, max = 50, message = "[title]错误标题长度不合法(0-50)")
     private String title;
 

src/main/resources/modules/SpringBoot/java/module/system/req/LogErrUpdateRequest.java

@@ -4,7 +4,7 @@ import org.hibernate.validator.constraints.Length;
 import ${basePackage}.frame.base.BaseUpdateRequest;
 import ${basePackage}.frame.validation.Dict;
 
-import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -31,7 +31,7 @@ public class  LogErrUpdateRequest extends BaseUpdateRequest {
     /**
      * 错误标题
      */
-    @NotEmpty(message = "[title]错误标题不能为空")
+    @NotBlank(message = "[title]错误标题不能为空")
     @Length(min = 0, max = 50, message = "[title]错误标题长度不合法(0-50)")
     private String title;
 

src/main/resources/modules/SpringBoot/java/module/system/req/ResCreateRequest.java

@@ -2,7 +2,7 @@ package ${basePackage}.module.system.req;
 
 import ${basePackage}.frame.base.BaseRequest;
 import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotBlank;
 import org.hibernate.validator.constraints.Length;
 import ${basePackage}.frame.validation.Dict;
 
@@ -18,14 +18,14 @@ public class ResCreateRequest extends BaseRequest {
     /**
      * 资源代码
      */
-    @NotEmpty(message = "[resCode]资源代码不能为空")
+    @NotBlank(message = "[resCode]资源代码不能为空")
     @Length(min = 0, max = 50, message = "[resCode]资源代码长度不合法(0-50)")
     private String resCode;
 
     /**
      * 资源名称
      */
-    @NotEmpty(message = "[resName]资源名称不能为空")
+    @NotBlank(message = "[resName]资源名称不能为空")
     @Length(min = 0, max = 50, message = "[resName]资源名称长度不合法(0-50)")
     private String resName;
 

src/main/resources/modules/SpringBoot/java/module/system/req/ResUpdateRequest.java

@@ -3,7 +3,7 @@ package ${basePackage}.module.system.req;
 import ${basePackage}.frame.base.BaseUpdateRequest;
 import javax.validation.constraints.NotNull;
 import org.hibernate.validator.constraints.Length;
-import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotBlank;
 import ${basePackage}.frame.validation.Dict;
 
 /**
@@ -24,14 +24,14 @@ public class  ResUpdateRequest extends BaseUpdateRequest {
     /**
      * 资源代码
      */
-    @NotEmpty(message = "[resCode]资源代码不能为空")
+    @NotBlank(message = "[resCode]资源代码不能为空")
     @Length(min = 0, max = 50, message = "[resCode]资源代码长度不合法(0-50)")
     private String resCode;
 
     /**
      * 资源名称
      */
-    @NotEmpty(message = "[resName]资源名称不能为空")
+    @NotBlank(message = "[resName]资源名称不能为空")
     @Length(min = 0, max = 50, message = "[resName]资源名称长度不合法(0-50)")
     private String resName;
 

src/main/resources/modules/SpringBoot/java/module/system/req/RoleCreateRequest.java

@@ -2,7 +2,7 @@ package ${basePackage}.module.system.req;
 
 import ${basePackage}.frame.base.BaseRequest;
 import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotBlank;
 import org.hibernate.validator.constraints.Length;
 
 /**
@@ -17,14 +17,14 @@ public class RoleCreateRequest extends BaseRequest {
     /**
      * 角色代码
      */
-    @NotEmpty(message = "[code]角色代码不能为空")
+    @NotBlank(message = "[code]角色代码不能为空")
     @Length(min = 0, max = 50, message = "[code]角色代码长度不合法(0-50)")
     private String code;
 
     /**
      * 角色名称
      */
-    @NotEmpty(message = "[name]角色名称不能为空")
+    @NotBlank(message = "[name]角色名称不能为空")
     @Length(min = 0, max = 50, message = "[name]角色名称长度不合法(0-50)")
     private String name;
 

src/main/resources/modules/SpringBoot/java/module/system/req/RoleResCreateRequest.java

@@ -2,7 +2,7 @@ package ${basePackage}.module.system.req;
 
 import ${basePackage}.frame.base.BaseRequest;
 import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotBlank;
 import org.hibernate.validator.constraints.Length;
 
 /**
@@ -23,7 +23,7 @@ public class RoleResCreateRequest extends BaseRequest {
     /**
      * 角色代码
      */
-    @NotEmpty(message = "[roleCode]角色代码不能为空")
+    @NotBlank(message = "[roleCode]角色代码不能为空")
     @Length(min = 0, max = 50, message = "[roleCode]角色代码长度不合法(0-50)")
     private String roleCode;
 
@@ -36,7 +36,7 @@ public class RoleResCreateRequest extends BaseRequest {
     /**
      * 资源代码
      */
-    @NotEmpty(message = "[resCode]资源代码不能为空")
+    @NotBlank(message = "[resCode]资源代码不能为空")
     @Length(min = 0, max = 50, message = "[resCode]资源代码长度不合法(0-50)")
     private String resCode;
 

src/main/resources/modules/SpringBoot/java/module/system/req/RoleResUpdateRequest.java

@@ -3,7 +3,7 @@ package ${basePackage}.module.system.req;
 import ${basePackage}.frame.base.BaseUpdateRequest;
 import javax.validation.constraints.NotNull;
 import org.hibernate.validator.constraints.Length;
-import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotBlank;
 
 /**
  * RoleResUpdateRequest - 角色资源关系更新
@@ -29,7 +29,7 @@ public class  RoleResUpdateRequest extends BaseUpdateRequest {
     /**
      * 角色代码
      */
-    @NotEmpty(message = "[roleCode]角色代码不能为空")
+    @NotBlank(message = "[roleCode]角色代码不能为空")
     @Length(min = 0, max = 50, message = "[roleCode]角色代码长度不合法(0-50)")
     private String roleCode;
 
@@ -42,7 +42,7 @@ public class  RoleResUpdateRequest extends BaseUpdateRequest {
     /**
      * 资源代码
      */
-    @NotEmpty(message = "[resCode]资源代码不能为空")
+    @NotBlank(message = "[resCode]资源代码不能为空")
     @Length(min = 0, max = 50, message = "[resCode]资源代码长度不合法(0-50)")
     private String resCode;
 

src/main/resources/modules/SpringBoot/java/module/system/req/RoleUpdateRequest.java

@@ -3,7 +3,7 @@ package ${basePackage}.module.system.req;
 import ${basePackage}.frame.base.BaseUpdateRequest;
 import javax.validation.constraints.NotNull;
 import org.hibernate.validator.constraints.Length;
-import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotBlank;
 
 /**
  * RoleUpdateRequest - 角色更新
@@ -23,14 +23,14 @@ public class  RoleUpdateRequest extends BaseUpdateRequest {
     /**
      * 角色代码
      */
-    @NotEmpty(message = "[code]角色代码不能为空")
+    @NotBlank(message = "[code]角色代码不能为空")
     @Length(min = 0, max = 50, message = "[code]角色代码长度不合法(0-50)")
     private String code;
 
     /**
      * 角色名称
      */
-    @NotEmpty(message = "[name]角色名称不能为空")
+    @NotBlank(message = "[name]角色名称不能为空")
     @Length(min = 0, max = 50, message = "[name]角色名称长度不合法(0-50)")
     private String name;
 

src/main/resources/modules/SpringBoot/java/module/system/req/UserCreateRequest.java

@@ -4,6 +4,7 @@ import org.hibernate.validator.constraints.Length;
 import ${basePackage}.frame.base.BaseRequest;
 import ${basePackage}.frame.validation.Dict;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.util.List;
@@ -20,14 +21,14 @@ public class UserCreateRequest extends BaseRequest {
     /**
      * 用户账户
      */
-    @NotEmpty(message = "[userName]用户账户不能为空")
+    @NotBlank(message = "[userName]用户账户不能为空")
     @Length(min = 0, max = 100, message = "[userName]用户账户长度不合法(0-100)")
     private String userName;
 
     /**
      * 用户代码
      */
-    @NotEmpty(message = "[userCode]用户代码不能为空")
+    @NotBlank(message = "[userCode]用户代码不能为空")
     @Length(min = 0, max = 50, message = "[userCode]用户代码长度不合法(0-50)")
     private String userCode;
 
@@ -40,7 +41,7 @@ public class UserCreateRequest extends BaseRequest {
     /**
      * 用户密码
      */
-    @NotEmpty(message = "[userPwd]用户密码不能为空")
+    @NotBlank(message = "[userPwd]用户密码不能为空")
     @Length(min = 0, max = 50, message = "[userPwd]用户密码长度不合法(0-50)")
     private String userPwd;
 
@@ -54,7 +55,7 @@ public class UserCreateRequest extends BaseRequest {
     /**
      * 部门代码
      */
-    @NotEmpty(message = "[deptCode]部门代码不能为空")
+    @NotBlank(message = "[deptCode]部门代码不能为空")
     @Length(min = 0, max = 50, message = "[deptCode]部门代码长度不合法(0-50)")
     private String deptCode;
 

src/main/resources/modules/SpringBoot/java/module/system/req/UserRoleCreateRequest.java

@@ -3,7 +3,7 @@ package ${basePackage}.module.system.req;
 import org.hibernate.validator.constraints.Length;
 import ${basePackage}.frame.base.BaseRequest;
 
-import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -24,7 +24,7 @@ public class UserRoleCreateRequest extends BaseRequest {
     /**
      * 用户代码
      */
-//    @NotEmpty(message = "[userCode]用户代码不能为空")
+//    @NotBlank(message = "[userCode]用户代码不能为空")
 //    @Length(min = 0, max = 50, message = "[userCode]用户代码长度不合法(0-50)")
     private String userCode;
 
@@ -37,7 +37,7 @@ public class UserRoleCreateRequest extends BaseRequest {
     /**
      * 角色代码
      */
-//    @NotEmpty(message = "[roleCode]角色代码不能为空")
+//    @NotBlank(message = "[roleCode]角色代码不能为空")
 //    @Length(min = 0, max = 50, message = "[roleCode]角色代码长度不合法(0-50)")
     private String roleCode;
 

src/main/resources/modules/SpringBoot/java/module/system/req/UserRoleUpdateRequest.java

@@ -3,6 +3,7 @@ package ${basePackage}.module.system.req;
 import org.hibernate.validator.constraints.Length;
 import ${basePackage}.frame.base.BaseUpdateRequest;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 
@@ -30,7 +31,7 @@ public class  UserRoleUpdateRequest extends BaseUpdateRequest {
     /**
      * 用户代码
      */
-    @NotEmpty(message = "[userCode]用户代码不能为空")
+    @NotBlank(message = "[userCode]用户代码不能为空")
     @Length(min = 0, max = 50, message = "[userCode]用户代码长度不合法(0-50)")
     private String userCode;
 

src/main/resources/modules/SpringBoot/java/module/system/req/UserUpdateRequest.java

@@ -4,7 +4,7 @@ import org.hibernate.validator.constraints.Length;
 import ${basePackage}.frame.base.BaseUpdateRequest;
 import ${basePackage}.frame.validation.Dict;
 
-import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 /**