diff --git a/src/main/java/com/youlai/system/model/entity/GenFieldConfig.java b/src/main/java/com/youlai/system/model/entity/GenFieldConfig.java index 93e1b2e1..75a3d542 100644 --- a/src/main/java/com/youlai/system/model/entity/GenFieldConfig.java +++ b/src/main/java/com/youlai/system/model/entity/GenFieldConfig.java @@ -40,7 +40,7 @@ public class GenFieldConfig extends BaseEntity { /** * 字段长度 */ - private String columnLength; + private Integer maxLength; /** * 字段名称 diff --git a/src/main/java/com/youlai/system/model/form/GenConfigForm.java b/src/main/java/com/youlai/system/model/form/GenConfigForm.java index b761005d..98bd07bf 100644 --- a/src/main/java/com/youlai/system/model/form/GenConfigForm.java +++ b/src/main/java/com/youlai/system/model/form/GenConfigForm.java @@ -75,6 +75,9 @@ public class GenConfigForm { @Schema(description = "是否必填") private Integer isRequired; + @Schema(description = "最大长度") + private Integer maxLength; + @Schema(description = "表单类型") private FormTypeEnum formType; diff --git a/src/main/resources/templates/generator/form.java.vm b/src/main/resources/templates/generator/form.java.vm index aa4767f0..1787e941 100644 --- a/src/main/resources/templates/generator/form.java.vm +++ b/src/main/resources/templates/generator/form.java.vm @@ -33,6 +33,9 @@ public class ${entityName}Form implements Serializable { #if($fieldConfigs) #foreach($fieldConfig in ${fieldConfigs}) #if($fieldConfig.isShowInForm) + #if("$!fieldConfig.fieldComment" != "") + @Schema(description = "${fieldConfig.fieldComment}") + #end #if($fieldConfig.isRequired) #if($fieldConfig.fieldType == 'String') @NotBlank(message = "$fieldConfig.fieldComment不能为空") @@ -40,10 +43,11 @@ public class ${entityName}Form implements Serializable { @NotNull(message = "$fieldConfig.fieldComment不能为空") #end #end - #if("$!fieldConfig.fieldComment" != "") - @Schema(description = "${fieldConfig.fieldComment}") - #end + #if($fieldConfig.maxLength) + @Size(max=$fieldConfig.maxLength, message="$fieldConfig.fieldComment长度不能超过${fieldConfig.maxLength}个字符") + #end private ${fieldConfig.fieldType} ${fieldConfig.fieldName}; + #end #end #end