From b1501d64f9b86cf7dc410ccf6fc0a613e99094ab Mon Sep 17 00:00:00 2001
From: makejava <1353036300@qq.com>
Date: Thu, 1 Nov 2018 13:45:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=AD=90=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EasyCodeGlobalVariableProvider.java       |  1 +
 .../service/impl/CodeGenerateServiceImpl.java | 21 +++++-
 .../plugin/tool/ExtraCodeGenerateUtils.java   | 65 +++++++++++++++++++
 src/main/java/velocity_implicit.vm            |  1 +
 .../description/templateDescription.html      |  2 +
 5 files changed, 89 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/com/sjhy/plugin/tool/ExtraCodeGenerateUtils.java

diff --git a/src/main/java/com/sjhy/plugin/provider/EasyCodeGlobalVariableProvider.java b/src/main/java/com/sjhy/plugin/provider/EasyCodeGlobalVariableProvider.java
index d68ae5f..d22f1cf 100644
--- a/src/main/java/com/sjhy/plugin/provider/EasyCodeGlobalVariableProvider.java
+++ b/src/main/java/com/sjhy/plugin/provider/EasyCodeGlobalVariableProvider.java
@@ -38,6 +38,7 @@ public class EasyCodeGlobalVariableProvider extends VtlGlobalVariableProvider {
         result.add(new VtlLightVariable("time", file, "com.sjhy.plugin.tool.TimeUtils"));
         result.add(new VtlLightVariable("tableInfo", file, "com.sjhy.plugin.entity.TableInfo"));
         result.add(new VtlLightVariable("tableInfoList", file, "java.util.List<com.sjhy.plugin.entity.TableInfo>"));
+        result.add(new VtlLightVariable("generateService", file, "com.sjhy.plugin.tool.ExtraCodeGenerateUtils"));
         return result;
     }
 
diff --git a/src/main/java/com/sjhy/plugin/service/impl/CodeGenerateServiceImpl.java b/src/main/java/com/sjhy/plugin/service/impl/CodeGenerateServiceImpl.java
index d64e9d7..ed4cee0 100644
--- a/src/main/java/com/sjhy/plugin/service/impl/CodeGenerateServiceImpl.java
+++ b/src/main/java/com/sjhy/plugin/service/impl/CodeGenerateServiceImpl.java
@@ -102,22 +102,41 @@ public class CodeGenerateServiceImpl implements CodeGenerateService {
      * @param title         是否显示提示
      */
     private void generate(Collection<Template> templates, Collection<TableInfo> tableInfoList, boolean title) {
+        generate(templates, tableInfoList, title, null);
+    }
+
+    /**
+     * 生成代码，并自动保存到对应位置
+     *
+     * @param templates     模板
+     * @param tableInfoList 表信息对象
+     * @param title         是否显示提示
+     * @param otherParam    其他参数
+     */
+    public void generate(Collection<Template> templates, Collection<TableInfo> tableInfoList, boolean title, Map<String, Object> otherParam) {
         if (CollectionUtil.isEmpty(templates) || CollectionUtil.isEmpty(tableInfoList)) {
             return;
         }
         // 处理模板，注入全局变量（克隆一份，防止篡改）
-        templates = CloneUtils.cloneByJson(templates, new TypeReference<ArrayList<Template>>() {});
+        templates = CloneUtils.cloneByJson(templates, new TypeReference<ArrayList<Template>>() {
+        });
         TemplateUtils.addGlobalConfig(templates);
         // 生成代码
         for (TableInfo tableInfo : tableInfoList) {
             // 构建参数
             Map<String, Object> param = getDefaultParam();
+            // 其他参数
+            if (otherParam != null) {
+                param.putAll(otherParam);
+            }
             // 所有表信息对象
             param.put("tableInfoList", tableInfoList);
             // 表信息对象
             param.put("tableInfo", tableInfo);
             // 设置模型路径与导包列表
             setModulePathAndImportList(param, tableInfo);
+            // 设置额外代码生成服务
+            param.put("generateService", new ExtraCodeGenerateUtils(this, tableInfo, title));
 
             for (Template template : templates) {
                 Callback callback = new Callback();
diff --git a/src/main/java/com/sjhy/plugin/tool/ExtraCodeGenerateUtils.java b/src/main/java/com/sjhy/plugin/tool/ExtraCodeGenerateUtils.java
new file mode 100644
index 0000000..ad785a6
--- /dev/null
+++ b/src/main/java/com/sjhy/plugin/tool/ExtraCodeGenerateUtils.java
@@ -0,0 +1,65 @@
+package com.sjhy.plugin.tool;
+
+import com.sjhy.plugin.config.Settings;
+import com.sjhy.plugin.entity.TableInfo;
+import com.sjhy.plugin.entity.Template;
+import com.sjhy.plugin.service.impl.CodeGenerateServiceImpl;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * 额外的代码生成工具
+ *
+ * @author makejava
+ * @version 1.0.0
+ * @since 2018/11/01 10:11
+ */
+public class ExtraCodeGenerateUtils {
+    /**
+     * 代码生成服务
+     */
+    private CodeGenerateServiceImpl codeGenerateService;
+    /**
+     * 表信息对象
+     */
+    private TableInfo tableInfo;
+    /**
+     * 文件覆盖提示
+     */
+    private Boolean title;
+
+    /**
+     * 设置实例对象
+     */
+    private Settings settings = Settings.getInstance();
+
+
+    public ExtraCodeGenerateUtils(CodeGenerateServiceImpl codeGenerateService, TableInfo tableInfo, Boolean title) {
+        this.codeGenerateService = codeGenerateService;
+        this.tableInfo = tableInfo;
+        this.title = title;
+    }
+
+    /**
+     * 生成代码
+     *
+     * @param templateName 模板名称
+     * @param param        附加参数
+     */
+    public void run(String templateName, Map<String, Object> param) {
+        // 获取到模板
+        Template currTemplate = null;
+        for (Template template : settings.getTemplateGroupMap().get(settings.getCurrTemplateGroupName()).getElementList()) {
+            if (Objects.equals(template.getName(), templateName)) {
+                currTemplate = template;
+            }
+        }
+        if (currTemplate == null) {
+            return;
+        }
+        // 生成代码
+        codeGenerateService.generate(Collections.singletonList(currTemplate), Collections.singletonList(this.tableInfo), this.title, param);
+    }
+}
diff --git a/src/main/java/velocity_implicit.vm b/src/main/java/velocity_implicit.vm
index dec6c57..26a181b 100644
--- a/src/main/java/velocity_implicit.vm
+++ b/src/main/java/velocity_implicit.vm
@@ -8,3 +8,4 @@
 #* @vtlvariable name="time" type="com.sjhy.plugin.tool.TimeUtils" *#
 #* @vtlvariable name="tableInfo" type="com.sjhy.plugin.entity.TableInfo" *#
 #* @vtlvariable name="tableInfoList" type="java.util.List<com.sjhy.plugin.entity.TableInfo>" *#
+#* @vtlvariable name="generateService" type="com.sjhy.plugin.tool.ExtraCodeGenerateUtils" *#
diff --git a/src/main/resources/description/templateDescription.html b/src/main/resources/description/templateDescription.html
index 639d216..1821840 100644
--- a/src/main/resources/description/templateDescription.html
+++ b/src/main/resources/description/templateDescription.html
@@ -59,6 +59,8 @@
         toJson(Object, Boolean) 将对象转json对象，Boolean：是否格式化json，不填时为不格式化。
     $time
         currTime(String format) 获取当前时间，指定时间格式（默认：yyyy-MM-dd HH:mm:ss）
+    $generateService
+        run(String, Map&lt;String,Object&gt;) 代码生成服务，参数1：模板名称，参数2：附加参数。
 </pre>
 </body>
 </html>
\ No newline at end of file