1、Enum 改 Dict

src/main/java/xyz/wbsite/dbtool/javafx/JavaFxApplication.java

@@ -911,7 +911,13 @@ public class JavaFxApplication extends Application {
                     public void handle(TableColumn.CellEditEvent event) {
                         int row = event.getTablePosition().getRow();
                         Field field = currentTable.getFields().get(row);
-                        field.setFieldType((FieldType) event.getNewValue());
+
+                        FieldType oldFieldType = field.getFieldType();
+
+                        FieldType newValue = (FieldType) event.getNewValue();
+                        field.setFieldLength(newValue.getDefaultLength());
+                        field.setFieldType(newValue);
+                        feilds.refresh();
                     }
                 });
                 return choiceBoxTableCell;

src/main/java/xyz/wbsite/dbtool/javafx/ctrl/OptionApiController.java

@@ -282,7 +282,7 @@ public class OptionApiController {
                 for (String s : api.getDepEnum()) {
                     File en = new File(moduleFile.getAbsolutePath() + File.separator + "enums" + File.separator + s + ".java");
                     if (!en.exists()) {
-                        api.setError("依赖的" + s + "(Enum)不存在、");
+                        api.setError("依赖的" + s + "(Dict)不存在、");
                         api.setCheck(false);
                     }
                 }

src/main/java/xyz/wbsite/dbtool/javafx/enums/FieldType.java

@@ -2,7 +2,7 @@ package xyz.wbsite.dbtool.javafx.enums;
 
 public enum FieldType {
     Boolean(0),
-    Enum(0),
+    Dict(0),
     Byte(0),
     Bytes(0),
     Short(0),
@@ -97,8 +97,8 @@ public enum FieldType {
     public String toString() {
         if (Boolean.name().equals(this.name())) {
             return "Boolean";
-        } else if (Enum.name().equals(this.name())) {
+        } else if (Dict.name().equals(this.name())) {
-            return "Enum";
+            return "Dict";
         } else if (Byte.name().equals(this.name())) {
             return "Byte";
         } else if (Short.name().equals(this.name())) {
@@ -147,8 +147,8 @@ public enum FieldType {
     public String javaType() {
         if (Boolean.name().equals(this.name())) {
             return "Boolean";
-        } else if (Enum.name().equals(this.name())) {
+        } else if (Dict.name().equals(this.name())) {
-            return "Enum";
+            return "String";
         } else if (Byte.name().equals(this.name())) {
             return "Byte";
         } else if (Short.name().equals(this.name())) {
@@ -221,7 +221,7 @@ public enum FieldType {
             return "CHAR";
         } else if (String_10.name().equals(this.name())) {
             return "CHAR";
-        } else if (Enum.name().equals(this.name())) {
+        } else if (Dict.name().equals(this.name())) {
             return "VARCHAR";
         }  else if (String_var.name().equals(this.name())) {
             return "VARCHAR";

src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootCallable.java

@@ -60,7 +60,7 @@ public class SpringBootCallable implements Callable {
         if (!src.exists()) {
             src.mkdirs();
         }
-        File moduleDir = new File(src,"module");
+        File moduleDir = new File(src, "module");
         if (!moduleDir.exists()) {
             moduleDir.mkdirs();
         }
@@ -115,8 +115,6 @@ public class SpringBootCallable implements Callable {
 
                     System.out.println("生成模块:Entity");
                     generateEntity(new File(api.getAbsolutePath(), "ent"), module, dataBase, option);
-                    System.out.println("生成模块:Enums");
-                    generateEnums(new File(api.getAbsolutePath(), "enums"), module, dataBase, option);
                     System.out.println("生成模块:Mapper");
                     generateMapper(new File(api.getAbsolutePath(), "mpr"), module, dataBase, option);
                     System.out.println("生成模块:Manager");
@@ -136,8 +134,6 @@ public class SpringBootCallable implements Callable {
 
                     System.out.println("生成模块:Entity");
                     generateEntity(new File(modulePath.getAbsolutePath(), "ent"), module, dataBase, option);
-                    System.out.println("生成模块:Enums");
-                    generateEnums(new File(modulePath.getAbsolutePath(), "enums"), module, dataBase, option);
                     System.out.println("生成模块:Mapper");
                     generateMapper(new File(modulePath.getAbsolutePath(), "mpr"), module, dataBase, option);
                     System.out.println("生成模块:Manager");
@@ -274,42 +270,6 @@ public class SpringBootCallable implements Callable {
         }
     }
 
-    /**
-     * 生成Enums
-     *
-     * @param root
-     * @param md
-     */
-    public void generateEnums(File root, Module md, DataBase dataBase, String option) {
-        if (!root.exists()) {
-            root.mkdirs();
-        } else {
-            Tool.clear(root);
-        }
-
-        HashMap<String, Object> ctx = new HashMap<String, Object>();
-        ctx.put("tool", Tool.class);
-        ctx.put("basePackage", md.getProjectBasePackage());
-        ctx.put("moduleName", md.getModuleName());
-        ctx.put("author", md.getProjectAuthor());
-        ctx.put("date", new Date());
-
-//        {
-//            ctx.put("Type", "Type");
-//            ctx.put("FieldComment", "Type");
-//            freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), "Type.java"), option + "/java/enums/Type.ftl", ctx);
-//        }
-        for (Table table : md.getTables()) {
-            for (Field field : table.getFields()) {
-                if ("Enum".equals(field.getFieldType().javaType())) {
-                    ctx.put("Type", field.getCName());
-                    ctx.put("FieldComment", field.getFieldComment());
-                    freeMarkerManager.outputTemp(new File(root.getAbsolutePath(), field.getCName() + ".java"), option + "/java/module/enums/Type.ftl", ctx);
-                }
-            }
-        }
-    }
-
     /**
      * 生成Mapper
      *
@@ -508,6 +468,8 @@ public class SpringBootCallable implements Callable {
         freemarker.mkdirs();
         File utils = new File(root.getAbsolutePath(), "utils");
         utils.mkdirs();
+        File validation = new File(root.getAbsolutePath(), "validation");
+        validation.mkdirs();
 
         //base
         freeMarkerManager.outputTemp(new File(base.getAbsolutePath(), "BaseEntity.java"), option + "/java/frame/base/BaseEntity.java", ctx);
@@ -545,6 +507,10 @@ public class SpringBootCallable implements Callable {
         freeMarkerManager.outputTemp(new File(utils.getAbsolutePath(), "LocalData.java"), option + "/java/frame/utils/LocalData.java", ctx);
         freeMarkerManager.outputTemp(new File(utils.getAbsolutePath(), "IDgenerator.java"), option + "/java/frame/utils/IDgenerator.java", ctx);
         freeMarkerManager.outputTemp(new File(utils.getAbsolutePath(), "Message.java"), option + "/java/frame/utils/Message.java", ctx);
+
+        //validation
+        freeMarkerManager.outputTemp(new File(validation.getAbsolutePath(), "Dict.java"), option + "/java/frame/validation/Dict.java", ctx);
+        freeMarkerManager.outputTemp(new File(validation.getAbsolutePath(), "DictValidator.java"), option + "/java/frame/validation/DictValidator.java", ctx);
     }
 
     /**
@@ -588,9 +554,11 @@ public class SpringBootCallable implements Callable {
         Tool.outputResource(option + "/resources/banner.txt", new File(root.getAbsolutePath(), "banner.txt"));
         Tool.outputResource(option + "/resources/logback-config.xml", new File(root.getAbsolutePath(), "logback-config.xml"));
 
-        File lib = new File(root.getAbsolutePath(), "lib");
+        if (DataBase.ORACLE == dataBase) {
-        lib.mkdirs();
+            File lib = new File(root.getAbsolutePath(), "lib");
-        Tool.outputResource(option + "/resources/lib/ojdbc7-12.1.0.2.jar", new File(lib.getAbsolutePath(), "ojdbc7-12.1.0.2.jar"));
+            lib.mkdirs();
+            Tool.outputResource(option + "/resources/lib/ojdbc7-12.1.0.2.jar", new File(lib.getAbsolutePath(), "ojdbc7-12.1.0.2.jar"));
+        }
 
         File dbtool = new File(root.getAbsolutePath(), "dbtool");
         dbtool.mkdirs();

src/main/java/xyz/wbsite/dbtool/javafx/po/Field.java

@@ -112,9 +112,11 @@ public class Field extends Table {
 
         } else if (fieldType.name().matches("Boolean")) {
             value = "true";
+        } else if (fieldType.name().matches("Dict")) {
+            value = "\"code\"";
         } else if (fieldType.name().matches("Byte|Short|Integer")) {
             value = "1";
-        } else if (fieldType.name().matches("Bytes|Enum")) {
+        } else if (fieldType.name().matches("Bytes")) {
             value = "null";
         } else if (fieldType.name().matches("Long")) {
             value = "1L";

src/main/java/xyz/wbsite/dbtool/javafx/po/MySqlDBmapper.java

@@ -63,7 +63,7 @@ public class MySqlDBmapper extends AbstractDBmapper {
 
         if (FieldType.Boolean.name().equals(type.name())) {
             sb.append("TINYINT(1)");
-        } else if (FieldType.Enum.name().equals(type.name())) {
+        } else if (FieldType.Dict.name().equals(type.name())) {
             sb.append("VARCHAR(50)");
         } else if (FieldType.Byte.name().equals(type.name())) {
             sb.append("TINYINT(3)");

src/main/java/xyz/wbsite/dbtool/javafx/po/OracleDBmapper.java

@@ -14,7 +14,7 @@ public class OracleDBmapper extends AbstractDBmapper {
 
         if (FieldType.Boolean.name().equals(type.name())) {
             sb.append("CHAR(1)");
-        } else if (FieldType.Enum.name().equals(type.name())) {
+        } else if (FieldType.Dict.name().equals(type.name())) {
             sb.append("VARCHAR(50)");
         } else if (FieldType.Byte.name().equals(type.name())) {
             sb.append("NUMBER(3)");

src/main/resources/modules/SpringBoot/java/frame/validation/Dict.java

@@ -0,0 +1,18 @@
+package ${basePackage}.frame.validation;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+import java.lang.annotation.*;
+
+@Target({ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@Constraint(validatedBy = DictValidator.class)
+public @interface Dict {
+    String message() default "字典项错误";
+
+    String name() default "";
+
+    Class<?>[] groups() default {};
+
+    Class<? extends Payload>[] payload() default {};
+}

src/main/resources/modules/SpringBoot/java/frame/validation/DictValidator.java

@@ -0,0 +1,36 @@
+package ${basePackage}.frame.validation;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+import java.util.HashSet;
+
+public class DictValidator implements ConstraintValidator<Dict, String> {
+
+    private String name;
+
+    @Override
+    public void initialize(Dict constraint) {
+        name = constraint.name();
+    }
+
+    @Override
+    public boolean isValid(String o, ConstraintValidatorContext constraintValidatorContext) {
+        if (null == o) {
+            return true;
+        } else if (name == null) {
+            constraintValidatorContext.disableDefaultConstraintViolation();
+            constraintValidatorContext.buildConstraintViolationWithTemplate("字典名称为空").addConstraintViolation();
+            return false;
+        } else {
+            // name 字典名称
+            HashSet<String> codeSet = new HashSet<>();
+            if (codeSet.contains(o)) {
+                return true;
+            } else {
+                constraintValidatorContext.disableDefaultConstraintViolation();
+                constraintValidatorContext.buildConstraintViolationWithTemplate("非法的字典[" + name + "]值").addConstraintViolation();
+                return false;
+            }
+        }
+    }
+}

src/main/resources/modules/SpringBoot/java/module/ent/entity.ftl

@@ -3,11 +3,6 @@ package ${basePackage}.module.${moduleName}.ent;
 <#if table.has('Date')>
 import java.util.Date;
 </#if>
-<#list table.fields as field>
-<#if field.fieldType.javaType() == "Enum">
-import ${basePackage}.module.${moduleName}.enums.${field.getCName()};
-</#if>
-</#list>
 import ${basePackage}.frame.base.BaseEntity;
 
 /**
@@ -20,13 +15,7 @@ import ${basePackage}.frame.base.BaseEntity;
 public class ${table.getCName()} extends BaseEntity {
 
 <#list table.fields as field>
-<#if field.fieldType.javaType() == "Enum">
+<#if !field.isSystem || field.fieldName == 'ID'>
-    /**
-     * ${field.fieldName} - ${field.fieldComment?default("")}
-     */
-    private ${field.getCName()} ${field.getFName()};
-
-<#elseif !field.isSystem || field.fieldName == 'ID'>
     /**
      * ${field.fieldName} - ${field.fieldComment?default("")}
      */
@@ -34,16 +23,7 @@ public class ${table.getCName()} extends BaseEntity {
 </#if>
 </#list>
 <#list table.fields as field>
-<#if field.fieldType.javaType() == "Enum">
+<#if !field.isSystem || field.fieldName == 'ID' >
-
-    public ${field.getCName()} ${field.getterName()}() {
-        return this.${field.getFName()};
-    }
-
-    public void ${field.setterName()}(${field.getCName()} ${field.getFName()}) {
-        this.${field.getFName()} = ${field.getFName()};
-    }
-<#elseif !field.isSystem || field.fieldName == 'ID' >
 
     public ${field.fieldType.javaType()} ${field.getterName()}() {
         return this.${field.getFName()};

src/main/resources/modules/SpringBoot/java/module/enums/Type.ftl

@@ -1,13 +0,0 @@
-package ${basePackage}.module.${moduleName}.enums;
-
-
-/**
- * ${Type} - ${FieldComment}
- *
- * @author ${author?default("")}
- * @version 0.0.1
- * @since ${date?string("yyyy-MM-dd")}
- */
-public enum ${Type} {
-
-}

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

@@ -1,17 +1,15 @@
 package ${basePackage}.module.${moduleName}.req;
 
 import ${basePackage}.frame.base.BaseRequest;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotEmpty;
+import org.hibernate.validator.constraints.Length;
 <#if table.has('Date')>
 import java.util.Date;
 </#if>
-<#list table.fields as field>
+<#if table.has('Dict')>
-<#if field.fieldType.javaType() == "Enum">
+import ${basePackage}.frame.validation.Dict;
-import ${basePackage}.module.${moduleName}.enums.${field.getCName()};
 </#if>
-</#list>
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotEmpty;
-import org.hibernate.validator.constraints.Length;
 
 /**
  * ${table.getCName()}CreateRequest - ${table.tableComment}新增
@@ -21,44 +19,29 @@ import org.hibernate.validator.constraints.Length;
  * @since ${date?string("yyyy-MM-dd")}
  */
 public class ${table.getCName()}CreateRequest extends BaseRequest {
-
 <#list table.fields as field>
 <#if !field.isSystem>
+
     /**
      * ${field.fieldComment?default("")}
      */
-<#if field.fieldType?contains("String")>
+    <#if field.isMust && !field.fieldType?contains("String")>
-<#if field.fieldType != 'String_super'>
-    @Length(min = 0, max = ${field.fieldLength}, message = "${field.fieldComment?default("")}长度不合法(0-${field.fieldLength})")
-</#if>
-<#if field.isMust>
-    @NotEmpty(message = "${field.fieldComment?default("")}不能为空")
-</#if>
-<#else>
-<#if field.isMust>
     @NotNull(message = "${field.fieldComment?default("")}不能为NULL")
-</#if>
+    </#if>
-</#if>
+    <#if field.isMust && field.fieldType?contains("String_")>
-<#if field.fieldType.javaType() == "Enum">
+    @NotEmpty(message = "${field.fieldComment?default("")}不能为空")
-    private ${field.getCName()} ${field.getFName()};
+    </#if>
-<#else >
+    <#if field.fieldType?contains("String_") && field.fieldType != 'String_super'>
+    @Length(min = 0, max = ${field.fieldLength}, message = "${field.fieldComment?default("")}长度不合法(0-${field.fieldLength})")
+    </#if>
+    <#if field.fieldType?contains("Dict")>
+    @Dict(name = "${field.getFName()}")
+    </#if>
     private ${field.fieldType.javaType()} ${field.getFName()};
 </#if>
-
-</#if>
 </#list>
 <#list table.fields as field>
 <#if !field.isSystem>
-<#if field.fieldType.javaType() == "Enum">
-
-    public ${field.getCName()} ${field.getterName()}() {
-        return this.${field.getFName()};
-    }
-
-    public void ${field.setterName()}(${field.getCName()} ${field.getFName()}) {
-        this.${field.getFName()} = ${field.getFName()};
-    }
-<#else>
 
     public ${field.fieldType.javaType()} ${field.getterName()}() {
         return this.${field.getFName()};
@@ -68,6 +51,5 @@ public class ${table.getCName()}CreateRequest extends BaseRequest {
         this.${field.getFName()} = ${field.getFName()};
     }
 </#if>
-</#if>
 </#list>
 }

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

@@ -32,25 +32,10 @@ public class ${table.getCName()}DeleteRequest extends BaseUpdateRequest {
     /**
      * ${field.fieldComment?default("")}
      */
-        <#if field.fieldType.javaType() == "Enum">
-    private ${field.getCName()} ${field.getFName()};
-        <#else >
     private ${field.fieldType.javaType()} ${field.getFName()};
-        </#if>
     </#list>
     <#list table.fields as field>
     <#if !field.isSystem>
-    <#if field.fieldType.javaType() == "Enum">
-
-    public ${field.getCName()} ${field.getterName()}() {
-        return this.${field.getFName()};
-    }
-
-    public void ${field.setterName()}(${field.getCName()} ${field.getFName()}) {
-        this.${field.getFName()} = ${field.getFName()};
-    }
-    <#else>
-
     public ${field.fieldType.javaType()} ${field.getterName()}() {
         return this.${field.getFName()};
     }
@@ -59,7 +44,6 @@ public class ${table.getCName()}DeleteRequest extends BaseUpdateRequest {
         this.${field.getFName()} = ${field.getFName()};
     }
     </#if>
-    </#if>
     </#list>
 </#if>
 }

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

@@ -4,11 +4,9 @@ import ${basePackage}.frame.base.BaseFindRequest;
 <#if table.has('Date')>
 import java.util.Date;
 </#if>
-<#list table.fields as field>
+<#if table.has('Dict')>
-<#if field.fieldType.javaType() == "Enum">
+import ${basePackage}.frame.validation.Dict;
-import ${basePackage}.module.${moduleName}.enums.${field.getCName()};
 </#if>
-</#list>
 
 /**
  * ${table.getCName()}Request -  ${table.tableComment}查询
@@ -18,35 +16,17 @@ import ${basePackage}.module.${moduleName}.enums.${field.getCName()};
  * @since ${date?string("yyyy-MM-dd")}
  */
 public class ${table.getCName()}FindRequest extends BaseFindRequest {
-
 <#list table.fields as field>
 <#if field.isQuery>
-<#if field.fieldType.javaType() == "Enum">
+
-    /**
-     * ${field.fieldComment?default("")}
-     */
-    private ${field.getCName()} ${field.getFName()};
-<#else>
     /**
      * ${field.fieldComment?default("")}
      */
     private ${field.fieldType.javaType()} ${field.getFName()};
 </#if>
-
-</#if>
 </#list>
 <#list table.fields as field>
 <#if field.isQuery>
-<#if field.fieldType.javaType() == "Enum">
-
-    public ${field.getCName()} ${field.getterName()}() {
-        return this.${field.getFName()};
-    }
-
-    public void ${field.setterName()}(${field.getCName()} ${field.getFName()}) {
-        this.${field.getFName()} = ${field.getFName()};
-    }
-<#else>
 
     public ${field.fieldType.javaType()} ${field.getterName()}() {
         return this.${field.getFName()};
@@ -56,6 +36,5 @@ public class ${table.getCName()}FindRequest extends BaseFindRequest {
         this.${field.getFName()} = ${field.getFName()};
     }
 </#if>
-</#if>
 </#list>
 }

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

@@ -7,11 +7,9 @@ import javax.validation.constraints.NotEmpty;
 <#if table.has('Date')>
 import java.util.Date;
 </#if>
-<#list table.fields as field>
+<#if table.has('Dict')>
-<#if field.fieldType.javaType() == "Enum">
+import ${basePackage}.frame.validation.Dict;
-import ${basePackage}.module.${moduleName}.enums.${field.getCName()};
 </#if>
-</#list>
 
 /**
  * ${table.getCName()}UpdateRequest - ${table.tableComment}更新
@@ -21,44 +19,29 @@ import ${basePackage}.module.${moduleName}.enums.${field.getCName()};
  * @since ${date?string("yyyy-MM-dd")}
  */
 public class  ${table.getCName()}UpdateRequest extends BaseUpdateRequest {
-
 <#list table.fields as field>
 <#if !field.isSystem || field.fieldName == 'ID'>
+
     /**
      * ${field.fieldComment?default("")}
      */
-<#if field.fieldType.javaType() == "String">
+    <#if field.isMust && !field.fieldType?contains("String")>
-<#if field.fieldType != 'String_super'>
-    @Length(min = 0, max = ${field.fieldLength}, message = "${field.fieldComment?default("")}长度不合法(0-${field.fieldLength})")
-</#if>
-<#if field.isMust>
-    @NotEmpty(message = "${field.fieldComment?default("")}不能为空")
-</#if>
-<#else>
-<#if field.isMust>
     @NotNull(message = "${field.fieldComment?default("")}不能为NULL")
-</#if>
+    </#if>
-</#if>
+    <#if field.isMust && field.fieldType?contains("String_")>
-<#if field.fieldType.javaType() == "Enum">
+    @NotEmpty(message = "${field.fieldComment?default("")}不能为空")
-    private ${field.getCName()} ${field.getFName()};
+    </#if>
-<#else >
+    <#if field.fieldType?contains("String_") && field.fieldType != 'String_super'>
+    @Length(min = 0, max = ${field.fieldLength}, message = "${field.fieldComment?default("")}长度不合法(0-${field.fieldLength})")
+    </#if>
+    <#if field.fieldType?contains("Dict")>
+    @Dict(name = "${field.getFName()}")
+    </#if>
     private ${field.fieldType.javaType()} ${field.getFName()};
 </#if>
-
-</#if>
 </#list>
 <#list table.fields as field>
 <#if !field.isSystem || field.fieldName == 'ID'>
-<#if field.fieldType.javaType() == "Enum">
-
-    public ${field.getCName()} ${field.getterName()}() {
-        return this.${field.getFName()};
-    }
-
-    public void ${field.setterName()}(${field.getCName()} ${field.getFName()}) {
-        this.${field.getFName()} = ${field.getFName()};
-    }
-<#else>
 
     public ${field.fieldType.javaType()} ${field.getterName()}() {
         return this.${field.getFName()};
@@ -68,6 +51,5 @@ public class  ${table.getCName()}UpdateRequest extends BaseUpdateRequest {
         this.${field.getFName()} = ${field.getFName()};
     }
 </#if>
-</#if>
 </#list>
 }