update: 减少FieldInfo所需字段 优化生成

Author: devcxl

.gitignore

@@ -11,6 +11,7 @@ target/
 *.iws
 *.iml
 *.ipr
+.idea
 
 ### Eclipse ###
 .apt_generated

src/main/java/cn/devcxl/generator/CodeGenerator.java

@@ -29,20 +29,43 @@ public static void main(String[] args) {
         Configuration configuration = new Configuration();
         configuration.setAuthor("devcxl");
         configuration.setPackageName("cn.devcxl.code");
+        configuration.setPrimaryKeyFieldType(FieldType.BIGINT);
         configuration.setTablePrefix("cms_");
         configuration.setProjectSrcPath("/home/devcxl/IdeaProjects/code-gen-template/src/");
 
         List<FieldInfo> fieldInfos = new ArrayList<>();
 
-        FieldInfo idField = new FieldInfo("id", "用户ID", FieldType.INTEGER, 11, "", true, true, true, false, false, false, true, EQ, "input", "");
-        FieldInfo usernameField = new FieldInfo("userName", "用户名", FieldType.VARCHAR, 30, "", false, false, true, true, true, true, true, LIKE, "input", "");
-        FieldInfo passwordField = new FieldInfo("password", "密码", FieldType.VARCHAR, 64, "", false, false, true, false, true, false, false, NONE, "input", "");
-        FieldInfo emailField = new FieldInfo("email", "邮箱", FieldType.VARCHAR, 30, "", false, false, false, true, true, true, true, LIKE, "input", "");
-        FieldInfo ageField = new FieldInfo("age", "年龄", FieldType.INTEGER, 3, "", false, false, false, true, true, true, true, EQ, "input", "");
-        FieldInfo genderField = new FieldInfo("gender", "性别", FieldType.TINYINT, 1, "", false, false, false, true, true, true, true, EQ, "select", "genderDict");
-        FieldInfo birthdayField = new FieldInfo("birthday", "生日", FieldType.DATE, 0, "", false, false, false, true, true, true, true, BETWEEN, "datetime", "");
-        FieldInfo createAt = new FieldInfo("createAt", "创建时间", FieldType.TIMESTAMP, 0, "CURRENT_TIMESTAMP", false, false, true, false, false, false, true, BETWEEN, "datetime", "");
-        FieldInfo updateAt = new FieldInfo("updateAt", "更新时间", FieldType.TIMESTAMP, 0, "CURRENT_TIMESTAMP", false, false, true, false, false, false, false, BETWEEN, "datetime", "");
+        FieldInfo idField = new FieldInfo("id", "用户ID", FieldType.BIGINT, 11,
+                true, "", "auto_increment primary key",
+                true, true, true, EQ);
+
+        FieldInfo createAt = new FieldInfo("createTime", "创建时间", FieldType.LOCALDATETIME, 0,
+                true, "CURRENT_TIMESTAMP", "",
+                false, false, false, BETWEEN);
+
+        FieldInfo updateAt = new FieldInfo("updateTime", "更新时间", FieldType.LOCALDATETIME, 0,
+                true, "CURRENT_TIMESTAMP", "on update CURRENT_TIMESTAMP",
+                true, false, false, BETWEEN);
+
+
+        FieldInfo usernameField = new FieldInfo("username", "用户名", FieldType.VARCHAR, 30,
+                true, "", "", true, true, true, LIKE);
+
+        FieldInfo passwordField = new FieldInfo("password", "密码", FieldType.VARCHAR, 64,
+                true, "", "", true, true, false, NONE);
+
+        FieldInfo emailField = new FieldInfo("email", "邮箱", FieldType.VARCHAR, 30,
+                true, "", "",
+                true, true, true, LIKE);
+
+        FieldInfo ageField = new FieldInfo("age", "年龄", FieldType.INTEGER, 3,
+                false, "", "", true, true, true, EQ);
+        FieldInfo genderField = new FieldInfo("gender", "性别", FieldType.TINYINT, 1,
+                false, "", "", true, true, true, EQ);
+
+        FieldInfo birthdayField = new FieldInfo("birthday", "生日", FieldType.LOCALDATETIME, 0,
+                false, "", "", true, true, true, BETWEEN);
+
 
         fieldInfos.add(idField);
         fieldInfos.add(usernameField);

src/main/java/cn/devcxl/generator/domain/Configuration.java

@@ -1,5 +1,6 @@
 package cn.devcxl.generator.domain;
 
+import cn.devcxl.generator.enums.FieldType;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -22,6 +23,10 @@ public class Configuration {
      */
     private String projectSrcPath;
 
+    /**
+     * 主键类型
+     */
+    private FieldType primaryKeyFieldType;
     /**
      * 包名
      **/

src/main/java/cn/devcxl/generator/domain/EntityInfo.java

@@ -5,7 +5,6 @@
 import lombok.Getter;
 import lombok.Setter;
 
-import java.text.MessageFormat;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -75,7 +74,9 @@ public EntityInfo(Configuration configuration, String name, String className, St
      * @return
      */
     public List<FieldInfo> requiredFields() {
-        return this.fields.stream().filter(FieldInfo::isRequired).collect(Collectors.toList());
+        return this.fields.stream().filter(fieldInfo -> {
+            return fieldInfo.isRequired() && !GeneratorUtils.containsString(GeneratorConstant.INSERT_EXCLUDE_FIELDS, fieldInfo.getName());
+        }).collect(Collectors.toList());
     }
 
     /**
@@ -117,40 +118,4 @@ public List<FieldInfo> queryFields() {
         return this.fields.stream().filter(FieldInfo::isQuery).collect(Collectors.toList());
     }
 
-
-    /**
-     * 获取主键字段
-     *
-     * @return
-     */
-    public List<FieldInfo> primaryKeyFields() {
-        return this.fields.stream().filter(FieldInfo::isPrimaryKey).collect(Collectors.toList());
-    }
-
-    /**
-     * 获取非主键字段
-     *
-     * @return
-     */
-    public List<FieldInfo> noPrimaryKeyFields() {
-        return this.fields.stream().filter(fieldInfo -> !fieldInfo.isPrimaryKey()).collect(Collectors.toList());
-    }
-
-
-    /**
-     * 获取主键字段
-     *
-     * @return
-     */
-    public FieldInfo primaryKeyField() {
-        List<FieldInfo> fieldInfos = this.primaryKeyFields();
-        int size = fieldInfos.size();
-        if (fieldInfos.size() == 1) {
-            return fieldInfos.get(0);
-        } else {
-            throw new RuntimeException(MessageFormat.format("primaryKeyFields count {0}", size));
-        }
-    }
-
-
 }

src/main/java/cn/devcxl/generator/domain/FieldInfo.java

@@ -48,22 +48,18 @@ public class FieldInfo {
     /**
      * sql默认值
      */
-    private String defaultValue="";
+    private String defaultValue = "";
 
     /**
-     * 是否主键
+     * sql扩展
      */
-    private boolean isPrimaryKey;
+    private String extra = "";
 
-    /**
-     * 是否自增
-     */
-    private boolean isIncrement;
 
     /**
      * 是否必填
      */
-    private boolean isRequired;
+    private boolean required;
 
 
     /**
@@ -91,18 +87,10 @@ public class FieldInfo {
      */
     private QueryType queryType;
 
-    /**
-     * 显示类型（input文本框、textarea文本域、select下拉框、checkbox复选框、radio单选框、datetime日期控件、upload上传控件）
-     */
-    private String htmlType;
-
-    /**
-     * 字典类型
-     */
-    private String dictType;
-
 
-    public FieldInfo(String name, String comment, FieldType fieldType, Integer fieldLength, String defaultValue, boolean isPk, boolean isIncrement, boolean isRequired, boolean isInsert, boolean isEdit, boolean isList, boolean isQuery, QueryType queryType, String htmlType, String dictType) {
+    public FieldInfo(String name, String comment, FieldType fieldType, Integer fieldLength,
+                     boolean required, String defaultValue, String extra,
+                     boolean isInsert, boolean isEdit, boolean isList, QueryType queryType) {
         this.name = name;
         this.javaField = GeneratorUtils.toLowerCaseCamelCase(this.name);
         this.sqlField = GeneratorUtils.toSnakeCase(this.name);
@@ -111,16 +99,13 @@ public FieldInfo(String name, String comment, FieldType fieldType, Integer field
         this.fieldType = fieldType;
         this.fieldLength = fieldLength;
         this.defaultValue = defaultValue;
+        this.extra = extra;
 
-        this.isPrimaryKey = isPk;
-        this.isIncrement = isIncrement;
-        this.isRequired = isRequired;
+        this.required = required;
         this.isInsert = isInsert;
         this.isEdit = isEdit;
         this.isList = isList;
-        this.isQuery = isQuery;
+        this.isQuery = queryType != QueryType.NONE;
         this.queryType = queryType;
-        this.htmlType = htmlType;
-        this.dictType = dictType;
     }
 }

src/main/java/cn/devcxl/generator/enums/FieldType.java

@@ -1,5 +1,6 @@
 package cn.devcxl.generator.enums;
 
+
 /**
  * 字段类型
  *
@@ -18,6 +19,7 @@ public enum FieldType {
     VARCHAR("java.lang.String", "varchar", "string"),
     TEXT("java.lang.String", "text", "string"),
     DATE("java.util.Date", "date", "Date"),
+    LOCALDATETIME("java.time.LocalDateTime", "datetime", "Date"),
     TIME("java.sql.Time", "time", "Date"),
     TIMESTAMP("java.util.Date", "timestamp", "Date");
     /**

src/main/java/cn/devcxl/generator/utils/VelocityUtils.java

@@ -26,6 +26,7 @@ public static VelocityContext prepareContext(Configuration configuration, Entity
         VelocityContext velocityContext = new VelocityContext();
 
         velocityContext.put("deletedFlag", configuration.isDeletedFlag());
+        velocityContext.put("primaryKeyFieldType", configuration.getPrimaryKeyFieldType());
 
         // base
         velocityContext.put("entity", entityInfo);
@@ -39,12 +40,6 @@ public static VelocityContext prepareContext(Configuration configuration, Entity
         velocityContext.put("importList", getImportList(entityInfo));
         velocityContext.put("fields", entityInfo.getFields());
 
-
-        velocityContext.put("primaryKeyField",entityInfo.primaryKeyField());
-
-        // other fields
-        velocityContext.put("primaryKeyFields",entityInfo.primaryKeyFields());
-        velocityContext.put("noPrimaryKeyFields",entityInfo.noPrimaryKeyFields());
         velocityContext.put("showListFields", entityInfo.showListFields());
         velocityContext.put("requiredFields", entityInfo.requiredFields());
         velocityContext.put("noDefaultValueFields", entityInfo.noDefaultValueFields());
@@ -62,6 +57,7 @@ public static VelocityContext prepareContext(Configuration configuration, Entity
     public static List<String> getTemplateList() {
         List<String> templates = new ArrayList<String>();
         templates.add("templates/java/domain.java.vm");
+        templates.add("templates/java/create.java.vm");
         templates.add("templates/java/projection.java.vm");
         templates.add("templates/java/query.java.vm");
         templates.add("templates/java/service.java.vm");
@@ -84,6 +80,8 @@ public static String getFileName(String template, Configuration configuration, E
         String javaPath =   GeneratorConstant.JAVA_CODE_PATH + packageName.replace(".", "/");
         if (template.contains("domain.java.vm")) {
             fileName = String.format("%s/domain/%s.java", javaPath, className);
+        } else if (template.contains("create.java.vm")) {
+            fileName = String.format("%s/domain/param/Create%s.java", javaPath, className);
         } else if (template.contains("query.java.vm")) {
             fileName = String.format("%s/domain/param/Query%s.java", javaPath, className);
         } else if (template.contains("projection.java.vm")) {
@@ -99,7 +97,7 @@ public static String getFileName(String template, Configuration configuration, E
         } else if (template.contains("mapper.xml.vm")) {
             fileName = String.format("%s/mapper/%sMapper.xml", GeneratorConstant.RESOURCES_PATH, className);
         } else if (template.contains("sql.vm")) {
-            fileName = String.format("%s/sql/%s.sql",  GeneratorConstant.RESOURCES_PATH, tableName);
+            fileName = String.format("%s/schemas/%s.sql", GeneratorConstant.RESOURCES_PATH, tableName);
         }
         return fileName;
     }