生成器代码优化.

Author: nieqiurong

mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/AutoGenerator.java

@@ -68,23 +68,23 @@ public class AutoGenerator {
     /**
      * 数据库表配置
      */
-    private StrategyConfig strategy;
+    private StrategyConfig strategy = new StrategyConfig();
     /**
      * 包 相关配置
      */
-    private PackageConfig packageInfo;
+    private PackageConfig packageInfo = new PackageConfig();
     /**
      * 模板 相关配置
      */
-    private TemplateConfig template;
+    private TemplateConfig template = new TemplateConfig();
     /**
      * 全局 相关配置
      */
-    private GlobalConfig globalConfig;
+    private GlobalConfig globalConfig = new GlobalConfig();
     /**
      * 模板引擎
      */
-    private AbstractTemplateEngine templateEngine;
+    private AbstractTemplateEngine templateEngine = new VelocityTemplateEngine(); // 为了兼容之前逻辑，采用 Velocity 引擎 【 默认 】
 
     /**
      * 生成代码
@@ -98,10 +98,6 @@ public void execute() {
                 injectionConfig.setConfig(config);
             }
         }
-        if (null == templateEngine) {
-            // 为了兼容之前逻辑，采用 Velocity 引擎 【 默认 】
-            templateEngine = new VelocityTemplateEngine();
-        }
         // 模板引擎初始化执行文件输出
         templateEngine.init(this.pretreatmentConfigBuilder(config)).mkdirs().batchOutput().open();
         logger.debug("==========================文件生成完成！！！==========================");

mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/PackageConfig.java

@@ -16,6 +16,7 @@
 package com.baomidou.mybatisplus.generator.config;
 
 
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import lombok.Data;
@@ -90,4 +91,18 @@ public String getParent() {
     public String joinPackage(String subPackage) {
         return StringUtils.isBlank(parent) ? subPackage : (parent + StringPool.DOT + subPackage);
     }
+
+    public Map<String, String> initPackageInfo() {
+        Map<String, String> initMap = CollectionUtils.newHashMapWithExpectedSize(7);
+        initMap.put(ConstVal.MODULE_NAME, this.getModuleName());
+        initMap.put(ConstVal.ENTITY, this.joinPackage(this.getEntity()));
+        initMap.put(ConstVal.MAPPER, this.joinPackage(this.getMapper()));
+        initMap.put(ConstVal.XML, this.joinPackage(this.getXml()));
+        initMap.put(ConstVal.SERVICE, this.joinPackage(this.getService()));
+        initMap.put(ConstVal.SERVICE_IMPL, this.joinPackage(this.getServiceImpl()));
+        initMap.put(ConstVal.CONTROLLER, this.joinPackage(this.getController()));
+        return initMap;
+    }
+
+
 }

mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/StrategyConfig.java

@@ -419,4 +419,40 @@ public Set<String> getSuperEntityColumns() {
         }
         return this.superEntityColumns;
     }
+
+    public void validate(){
+        boolean isInclude = this.getInclude().size() > 0;
+        boolean isExclude = this.getExclude().size() > 0;
+        if (isInclude && isExclude) {
+            throw new IllegalArgumentException("<strategy> 标签中 <include> 与 <exclude> 只能配置一项！");
+        }
+        if (this.getNotLikeTable() != null && this.getLikeTable() != null) {
+            throw new IllegalArgumentException("<strategy> 标签中 <likeTable> 与 <notLikeTable> 只能配置一项！");
+        }
+    }
+
+    public boolean matchIncludeTable(String tableName) {
+        return matchTable(tableName, this.getInclude());
+    }
+
+    public boolean matchExcludeTable(String tableName) {
+        return matchTable(tableName, this.getExclude());
+    }
+
+    private boolean matchTable(String tableName, Set<String> matchTables) {
+        return matchTables.stream().anyMatch(t -> tableNameMatches(t, tableName));
+    }
+
+    /**
+     * 表名匹配
+     *
+     * @param setTableName 设置表名
+     * @param dbTableName  数据库表单
+     * @return ignore
+     */
+    private boolean tableNameMatches(String setTableName, String dbTableName) {
+        return setTableName.equalsIgnoreCase(dbTableName)
+            || StringUtils.matches(setTableName, dbTableName);
+    }
+
 }

mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/TemplateConfig.java

@@ -15,11 +15,17 @@
  */
 package com.baomidou.mybatisplus.generator.config;
 
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import lombok.AccessLevel;
 import lombok.Data;
 import lombok.Getter;
 import lombok.experimental.Accessors;
 
+import java.io.File;
+import java.util.Map;
+
 /**
  * 模板路径配置项
  *
@@ -48,7 +54,7 @@ public class TemplateConfig {
     public String getEntity(boolean kotlin) {
         return kotlin ? entityKt : entity;
     }
-    
+
     /**
      * 禁用模板
      *
@@ -80,5 +86,41 @@ public TemplateConfig disable(TemplateType... templateTypes) {
         }
         return this;
     }
-    
+
+    public Map<String, String> initTemplate(GlobalConfig globalConfig, Map<String, String> packageInfo) {
+        Map<String, String> initMap = CollectionUtils.newHashMapWithExpectedSize(6);
+        String outputDir = globalConfig.getOutputDir();
+        setPathInfo(initMap, packageInfo, this.getEntity(globalConfig.isKotlin()), outputDir, ConstVal.ENTITY_PATH, ConstVal.ENTITY);
+        setPathInfo(initMap, packageInfo, this.getMapper(), outputDir, ConstVal.MAPPER_PATH, ConstVal.MAPPER);
+        setPathInfo(initMap, packageInfo, this.getXml(), outputDir, ConstVal.XML_PATH, ConstVal.XML);
+        setPathInfo(initMap, packageInfo, this.getService(), outputDir, ConstVal.SERVICE_PATH, ConstVal.SERVICE);
+        setPathInfo(initMap, packageInfo, this.getServiceImpl(), outputDir, ConstVal.SERVICE_IMPL_PATH, ConstVal.SERVICE_IMPL);
+        setPathInfo(initMap, packageInfo, this.getController(), outputDir, ConstVal.CONTROLLER_PATH, ConstVal.CONTROLLER);
+        return initMap;
+    }
+
+    private void setPathInfo(Map<String, String> pathInfo, Map<String, String> packageInfo, String template, String outputDir, String path, String module) {
+        if (StringUtils.isNotBlank(template)) {
+            pathInfo.put(path, joinPath(outputDir, packageInfo.get(module)));
+        }
+    }
+
+    /**
+     * 连接路径字符串
+     *
+     * @param parentDir   路径常量字符串
+     * @param packageName 包名
+     * @return 连接后的路径
+     */
+    private String joinPath(String parentDir, String packageName) {
+        if (StringUtils.isBlank(parentDir)) {
+            parentDir = System.getProperty(ConstVal.JAVA_TMPDIR);
+        }
+        if (!StringUtils.endsWith(parentDir, File.separator)) {
+            parentDir += File.separator;
+        }
+        packageName = packageName.replaceAll("\\.", StringPool.BACK_SLASH + File.separator);
+        return parentDir + packageName;
+    }
+
 }