1

mybatis-plus/src/main/java/com/alvin/Generator.java

@@ -12,8 +12,6 @@ import java.util.Collections;
 public class Generator {
 
 
-
-
     public static void main(String[] args) {
         String db_url = "jdbc:mysql://mysql.aimpdev.svc.k5.bigtree.zone:3306/aimp_model";
         String db_username = "test_user";
@@ -21,18 +19,20 @@ public class Generator {
 
         String javaDir = "/Users/alvin/bigtree/aimp-manager/aimp-manager-service/src/main/java";
         String parentPackage = "com.bigtreefinance.aimp.manager";
+
         //String javaDir = "/Users/alvin/bigtree/aimp-actuator/aimp-actuator-service/src/main/java";
         //String parentPackage = "com.bigtreefinance.aimp.actuator";
-        //String tableName = "aimp_list,aimp_model,aimp_model_log,aimp_model_version,aimp_node_config,aimp_operation_log,aimp_process,aimp_process_node,aimp_sample,";
-        String tableName = "aimp_model_version";
+
+        String tableName = "aimp_list,aimp_model,aimp_model_log,aimp_model_version,aimp_node_config,aimp_operation_log,aimp_process,aimp_process_node,aimp_sample,";
+        //String tableName = "aimp_sample";
 
         String author = "bigtree";
         String tablePrefix = "";
 
-
         generatorToFile(db_url, db_username, db_password, author, javaDir, parentPackage, tableName, tablePrefix);
     }
 
+
     private static void generatorToFile(String db_url, String db_username, String db_password, String author,
                                         String javaDir, String parentPackage, String tableName, String tablePrefix) {
         FastAutoGenerator.create(db_url, db_username, db_password)
@@ -59,9 +59,14 @@ public class Generator {
                     //实体类
                     builder.entityBuilder()
                             .enableLombok()
+                            .logicDeleteColumnName("use_status")
                             .addTableFills(
                                     new Column("create_time", FieldFill.INSERT),
-                                    new Column("update_time", FieldFill.INSERT_UPDATE)
+                                    new Column("create_id", FieldFill.INSERT),
+                                    new Column("create_name", FieldFill.INSERT),
+                                    new Column("edit_id", FieldFill.INSERT_UPDATE),
+                                    new Column("edit_time", FieldFill.INSERT_UPDATE),
+                                    new Column("edit_name", FieldFill.INSERT_UPDATE)
                             );
                     // 设置需要生成的表名
                     for (String s : tableName.split(",")) {
@@ -73,6 +78,7 @@ public class Generator {
 
                 })
                 .templateEngine(new FreemarkerTemplateEngine()) // 使用Freemarker引擎模板，默认的是Velocity引擎模板
+                .templateConfig(builder -> builder.entity("templates/entity1.java"))
                 //.templateConfig(builder -> builder.controller("templates/controller1.java"))  // 设置为空则不会生成该文件
                 //.templateConfig(builder -> builder.service("templates/service1.java"))
                 //.templateConfig(builder -> builder.serviceImpl("templates/serviceImpl1.java"))

mybatis-plus/src/main/resources/templates/entity1.java.ftl

@@ -0,0 +1,152 @@
+package ${package.Entity};
+
+<#list table.importPackages as pkg>
+import ${pkg};
+</#list>
+<#if swagger>
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+</#if>
+<#if entityLombokModel>
+import lombok.Getter;
+import lombok.Setter;
+    <#if chainModel>
+import lombok.experimental.Accessors;
+    </#if>
+</#if>
+
+/**
+ * ${table.comment!}
+ *
+ * @author ${author}
+ * @since ${date}
+ */
+<#if entityLombokModel>
+@Getter
+@Setter
+    <#if chainModel>
+@Accessors(chain = true)
+    </#if>
+</#if>
+<#if table.convert>
+@TableName("${schemaName}${table.name}")
+</#if>
+<#if swagger>
+@ApiModel(description = "${table.comment!}")
+</#if>
+<#if superEntityClass??>
+public class ${entity} extends ${superEntityClass}<#if activeRecord><${entity}></#if> {
+<#elseif activeRecord>
+public class ${entity} extends Model<${entity}> {
+<#elseif entitySerialVersionUID>
+public class ${entity} implements Serializable {
+<#else>
+public class ${entity} {
+</#if>
+<#if entitySerialVersionUID>
+
+    private static final long serialVersionUID = 1L;
+</#if>
+<#-- ----------  BEGIN 字段循环遍历  ---------->
+<#list table.fields as field>
+    <#if field.keyFlag>
+        <#assign keyPropertyName="${field.propertyName}"/>
+    </#if>
+
+    <#if field.comment!?length gt 0>
+        <#if swagger>
+    @ApiModelProperty("${field.comment}")
+        <#else>
+    /**
+     * ${field.comment}
+     */
+        </#if>
+    </#if>
+    <#if field.keyFlag>
+        <#-- 主键 -->
+        <#if field.keyIdentityFlag>
+    @TableId(value = "${field.annotationColumnName}", type = IdType.AUTO)
+        <#elseif idType??>
+    @TableId(value = "${field.annotationColumnName}", type = IdType.${idType})
+        <#elseif field.convert>
+    @TableId("${field.annotationColumnName}")
+        </#if>
+        <#-- 普通字段 -->
+    <#elseif field.fill??>
+    <#-- -----   存在字段填充设置   ----->
+        <#if field.convert>
+    @TableField(value = "${field.annotationColumnName}", fill = FieldFill.${field.fill})
+        <#else>
+    @TableField(fill = FieldFill.${field.fill})
+        </#if>
+    <#elseif field.convert>
+    @TableField("${field.annotationColumnName}")
+    </#if>
+    <#-- 乐观锁注解 -->
+    <#if field.versionField>
+    @Version
+    </#if>
+    <#-- 逻辑删除注解 -->
+    <#if field.logicDeleteField>
+    @TableLogic
+    </#if>
+    private ${field.propertyType} ${field.propertyName};
+</#list>
+<#------------  END 字段循环遍历  ---------->
+
+<#if !entityLombokModel>
+    <#list table.fields as field>
+        <#if field.propertyType == "boolean">
+            <#assign getprefix="is"/>
+        <#else>
+            <#assign getprefix="get"/>
+        </#if>
+    public ${field.propertyType} ${getprefix}${field.capitalName}() {
+        return ${field.propertyName};
+    }
+
+    <#if chainModel>
+    public ${entity} set${field.capitalName}(${field.propertyType} ${field.propertyName}) {
+    <#else>
+    public void set${field.capitalName}(${field.propertyType} ${field.propertyName}) {
+    </#if>
+        this.${field.propertyName} = ${field.propertyName};
+        <#if chainModel>
+        return this;
+        </#if>
+    }
+    </#list>
+</#if>
+
+<#if entityColumnConstant>
+    <#list table.fields as field>
+    public static final String ${field.name?upper_case} = "${field.name}";
+
+    </#list>
+</#if>
+<#if activeRecord>
+    @Override
+    public Serializable pkVal() {
+    <#if keyPropertyName??>
+        return this.${keyPropertyName};
+    <#else>
+        return null;
+    </#if>
+    }
+
+</#if>
+<#if !entityLombokModel>
+    @Override
+    public String toString() {
+        return "${entity}{" +
+    <#list table.fields as field>
+        <#if field_index==0>
+            "${field.propertyName}=" + ${field.propertyName} +
+        <#else>
+            ", ${field.propertyName}=" + ${field.propertyName} +
+        </#if>
+    </#list>
+        "}";
+    }
+</#if>
+}

springboot-main/src/main/java/com/alvin/util/StringUtil.java

@@ -1,5 +1,8 @@
 package com.alvin.util;
 
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 /**
  * 字符串工具类
  *
@@ -27,6 +30,21 @@ public class StringUtil {
         return true;
     }
 
+    public static Boolean isNotBlank(String s) {
+        return !isBlank(s);
+    }
+
+    public static Boolean isNotEmpty(String s) {
+        return !isEmpty(s);
+    }
+
+    private static Pattern pattern = Pattern.compile("-?[0-9]+.?[0-9]*");
+    public static boolean isNumber(String str) {
+        // 通过Matcher进行字符串匹配
+        Matcher m = pattern.matcher(str);
+        // 如果正则匹配通过 m.matches() 方法返回 true ，反之 false
+        return m.matches();
+    }
     public static void main(String[] args) {
         System.out.println(isBlank(null));
         System.out.println(isBlank("           "));