From 320ebac43253d1662ce242a556712a2c29520700 Mon Sep 17 00:00:00 2001
From: cgb <cgb@sixeco>
Date: Mon, 19 Feb 2024 14:57:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0referenceBean=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD,=20=E8=83=BD=E5=8F=82=E8=80=83=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=94=9F=E6=88=90=E4=BB=A3=E7=A0=81.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/sjhy/plugin/dto/TableInfoDTO.java     |  11 ++
 .../com/sjhy/plugin/entity/TableInfo.java     |   9 ++
 .../service/impl/CodeGenerateServiceImpl.java |  67 +++++++--
 .../plugin/tool/ExtraCodeGenerateUtils.java   |   2 +-
 .../tool/FindRelevancyBeanFileVisitor.java    | 141 ++++++++++++++++++
 .../com/sjhy/plugin/ui/SelectSavePath.form    |  60 +++++---
 .../com/sjhy/plugin/ui/SelectSavePath.java    |   9 ++
 src/main/resources/string.properties          |   2 +
 8 files changed, 265 insertions(+), 36 deletions(-)
 create mode 100644 src/main/java/com/sjhy/plugin/tool/FindRelevancyBeanFileVisitor.java

diff --git a/src/main/java/com/sjhy/plugin/dto/TableInfoDTO.java b/src/main/java/com/sjhy/plugin/dto/TableInfoDTO.java
index ec77edeb..04131f85 100644
--- a/src/main/java/com/sjhy/plugin/dto/TableInfoDTO.java
+++ b/src/main/java/com/sjhy/plugin/dto/TableInfoDTO.java
@@ -47,6 +47,7 @@ private TableInfoDTO(PsiClass psiClass) {
         this.savePackageName = "";
         this.savePath = "";
         this.saveModelName = "";
+        this.referenceBean = "";
         this.fullColumn = new ArrayList<>();
         for (PsiField field : psiClass.getAllFields()) {
             this.fullColumn.add(new ColumnInfoDTO(field));
@@ -61,6 +62,7 @@ private TableInfoDTO(DbTable dbTable) {
         this.savePackageName = "";
         this.savePath = "";
         this.saveModelName = "";
+        this.referenceBean = "";
         this.fullColumn = new ArrayList<>();
         // 处理所有列
         JBIterable<? extends DasColumn> columns = DasUtil.getColumns(dbTable);
@@ -73,6 +75,9 @@ private static void merge(TableInfoDTO oldData, TableInfoDTO newData) {
         if (oldData == null || CollectionUtil.isEmpty(oldData.getFullColumn())) {
             return;
         }
+        if (!StringUtils.isEmpty(oldData.getReferenceBean())) {
+            newData.referenceBean = oldData.getReferenceBean();
+        }
         if (!StringUtils.isEmpty(oldData.getPreName())) {
             newData.preName = oldData.getPreName();
         }
@@ -187,6 +192,10 @@ private static void merge(TableInfoDTO oldData, TableInfoDTO newData) {
      * 保存的model名称
      */
     private String saveModelName;
+    /**
+     * 参考的bean名
+     */
+    private String referenceBean;
 
     public TableInfo toTableInfo(PsiClass psiClass) {
         TableInfo tableInfo = new TableInfo();
@@ -235,6 +244,7 @@ public TableInfo toTableInfo(DbTable dbTable) {
         tableInfo.setFullColumn(new ArrayList<>());
         tableInfo.setPkColumn(new ArrayList<>());
         tableInfo.setOtherColumn(new ArrayList<>());
+        tableInfo.setReferenceBean(this.getReferenceBean());
         // 列
         JBIterable<? extends DasColumn> columns = DasUtil.getColumns(dbTable);
         Map<String, DasColumn> nameToObj = new HashMap<>(columns.size());
@@ -271,6 +281,7 @@ public static TableInfoDTO valueOf(TableInfo tableInfo) {
         dto.setComment(tableInfo.getComment());
         dto.setSavePackageName(tableInfo.getSavePackageName());
         dto.setSaveModelName(tableInfo.getSaveModelName());
+        dto.setReferenceBean(tableInfo.getReferenceBean());
         dto.setFullColumn(new ArrayList<>());
         // 处理列
         for (ColumnInfo columnInfo : tableInfo.getFullColumn()) {
diff --git a/src/main/java/com/sjhy/plugin/entity/TableInfo.java b/src/main/java/com/sjhy/plugin/entity/TableInfo.java
index 169ad13c..ce2a1b5f 100644
--- a/src/main/java/com/sjhy/plugin/entity/TableInfo.java
+++ b/src/main/java/com/sjhy/plugin/entity/TableInfo.java
@@ -69,4 +69,13 @@ public class TableInfo {
      * 保存的model名称
      */
     private String saveModelName;
+    /**
+     * 参考的bean名
+     */
+    private String referenceBean;
+    /**
+     * 保存的包名称
+     */
+    private String saveFullPackageName;
+
 }
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 de41c397..3f641988 100644
--- a/src/main/java/com/sjhy/plugin/service/impl/CodeGenerateServiceImpl.java
+++ b/src/main/java/com/sjhy/plugin/service/impl/CodeGenerateServiceImpl.java
@@ -21,6 +21,9 @@
 import com.sjhy.plugin.service.TableInfoSettingsService;
 import com.sjhy.plugin.tool.*;
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -46,6 +49,10 @@ public class CodeGenerateServiceImpl implements CodeGenerateService {
      * 缓存数据工具
      */
     private CacheDataUtils cacheDataUtils;
+    /**
+     * 名称工具
+     */
+    private NameUtils nameUtils;
     /**
      * 导入包时过滤的包前缀
      */
@@ -54,6 +61,7 @@ public class CodeGenerateServiceImpl implements CodeGenerateService {
     public CodeGenerateServiceImpl(Project project) {
         this.project = project;
         this.moduleManager = ModuleManager.getInstance(project);
+        this.nameUtils = NameUtils.getInstance();
         this.tableInfoService = TableInfoSettingsService.getInstance();
         this.cacheDataUtils = CacheDataUtils.getInstance();
     }
@@ -76,6 +84,15 @@ public void generate(Collection<Template> templates, GenerateOptions generateOpt
             selectedTableInfo = tableInfoService.getTableInfo(cacheDataUtils.getSelectDbTable());
             tableInfoList = cacheDataUtils.getDbTableList().stream().map(item -> tableInfoService.getTableInfo(item)).collect(Collectors.toList());
         }
+        FindRelevancyBeanFileVisitor fileVisitor = null;
+        if (!StringUtils.isEmpty(selectedTableInfo.getReferenceBean())) {
+            fileVisitor = new FindRelevancyBeanFileVisitor(selectedTableInfo.getReferenceBean());
+            try {
+                Files.walkFileTree(Paths.get(project.getBasePath()), fileVisitor);
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
         // 校验选中表的保存路径是否正确
         if (StringUtils.isEmpty(selectedTableInfo.getSavePath())) {
             if (selectedTableInfo.getObj() != null) {
@@ -110,7 +127,7 @@ public void generate(Collection<Template> templates, GenerateOptions generateOpt
         }
 
         // 生成代码
-        generate(templates, tableInfoList, generateOptions, null);
+        generate(templates, tableInfoList, fileVisitor, generateOptions, null);
     }
 
     /**
@@ -118,13 +135,15 @@ public void generate(Collection<Template> templates, GenerateOptions generateOpt
      *
      * @param templates       模板
      * @param tableInfoList   表信息对象
+     * @param fileVisitor
      * @param generateOptions 生成配置
      * @param otherParam      其他参数
      */
-    public void generate(Collection<Template> templates, Collection<TableInfo> tableInfoList, GenerateOptions generateOptions, Map<String, Object> otherParam) {
+    public void generate(Collection<Template> templates, Collection<TableInfo> tableInfoList, FindRelevancyBeanFileVisitor fileVisitor, GenerateOptions generateOptions, Map<String, Object> otherParam) {
         if (CollectionUtil.isEmpty(templates) || CollectionUtil.isEmpty(tableInfoList)) {
             return;
         }
+        boolean isReferenceBean = fileVisitor != null;
         // 处理模板，注入全局变量（克隆一份，防止篡改）
         templates = CloneUtils.cloneByJson(templates, new TypeReference<ArrayList<Template>>() {
         });
@@ -151,25 +170,45 @@ public void generate(Collection<Template> templates, Collection<TableInfo> table
             // 设置额外代码生成服务
             param.put("generateService", new ExtraCodeGenerateUtils(this, tableInfo, generateOptions));
             for (Template template : templates) {
+                String templateName = template.getName().replace(".vm", "");
+                boolean hasReferenceBean = isReferenceBean && fileVisitor.isExist(templateName);
+
                 Callback callback = new Callback();
                 callback.setWriteFile(true);
                 callback.setReformat(generateOptions.getReFormat());
-                // 默认名称
-                callback.setFileName(tableInfo.getName() + "Default.java");
-                // 默认路径
-                callback.setSavePath(tableInfo.getSavePath());
-                // 设置回调对象
+                // 默认路径和默认名称
+                if (hasReferenceBean) {
+                    callback.setSavePath(fileVisitor.getPath(templateName));
+                    callback.setFileName(fileVisitor.getFileName(templateName).replace(fileVisitor.getReferenceBeanName(), tableInfo.getName()));
+                    if (!templateName.contains("xml")) {
+                        tableInfo.setSavePackageName(fileVisitor.getCutOffPackage(templateName));
+                        tableInfo.setSaveFullPackageName(fileVisitor.getPackage(templateName));
+                    }
+                }else {
+                    callback.setSavePath(tableInfo.getSavePath());
+                    callback.setFileName(tableInfo.getName() + "Default.java");
+                }
                 param.put("callback", callback);
+
+
                 // 开始生成
                 String code = VelocityUtils.generate(template.getCode(), param);
-                // 设置一个默认保存路径与默认文件名
-                String path = callback.getSavePath();
-                path = path.replace("\\", "/");
-                // 针对相对路径进行处理
-                if (path.startsWith(".")) {
-                    path = project.getBasePath() + path.substring(1);
+
+
+                // 重新填充callback. 有可能在生成代码的过程中，被模板方法修改
+                if (hasReferenceBean) {
+                    callback.setSavePath(fileVisitor.getPath(templateName));
+                }else {
+                    // 设置一个默认保存路径与默认文件名
+                    String path = callback.getSavePath();
+                    path = path.replace("\\", "/");
+                    // 针对相对路径进行处理
+                    if (path.startsWith(".")) {
+                        path = project.getBasePath() + path.substring(1);
+                    }
+                    callback.setSavePath(path);
                 }
-                callback.setSavePath(path);
+
                 new SaveFile(project, code, callback, generateOptions).write();
             }
         }
diff --git a/src/main/java/com/sjhy/plugin/tool/ExtraCodeGenerateUtils.java b/src/main/java/com/sjhy/plugin/tool/ExtraCodeGenerateUtils.java
index fea91477..df5be4ed 100644
--- a/src/main/java/com/sjhy/plugin/tool/ExtraCodeGenerateUtils.java
+++ b/src/main/java/com/sjhy/plugin/tool/ExtraCodeGenerateUtils.java
@@ -54,6 +54,6 @@ public void run(String templateName, Map<String, Object> param) {
             return;
         }
         // 生成代码
-        codeGenerateService.generate(Collections.singletonList(currTemplate), Collections.singletonList(this.tableInfo), this.generateOptions, param);
+        codeGenerateService.generate(Collections.singletonList(currTemplate), Collections.singletonList(this.tableInfo), null, this.generateOptions, param);
     }
 }
diff --git a/src/main/java/com/sjhy/plugin/tool/FindRelevancyBeanFileVisitor.java b/src/main/java/com/sjhy/plugin/tool/FindRelevancyBeanFileVisitor.java
new file mode 100644
index 00000000..c1290ee5
--- /dev/null
+++ b/src/main/java/com/sjhy/plugin/tool/FindRelevancyBeanFileVisitor.java
@@ -0,0 +1,141 @@
+package com.sjhy.plugin.tool;
+
+import com.intellij.util.ExceptionUtil;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.IOException;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+/**
+ * @author Created by cgb
+ */
+public class FindRelevancyBeanFileVisitor extends SimpleFileVisitor<Path> {
+    /**
+     * 文件路径
+     */
+    Map<String, String> rbNameAndPathMap = new HashMap<>();
+    /**
+     * 文件截断的packet 兼容旧模板
+     * 保存的是:com.sjhy.plugin
+     */
+    Map<String, String> rbNameAndCutOffPackageMap = new HashMap<>();
+    /**
+     * 文件全packet
+     * 保存的是:package com.sjhy.plugin.tool;
+     */
+    Map<String, String> rbNameAndPackageMap = new HashMap<>();
+    /**
+     * 文件名称
+     */
+    Map<String, String> rbNameAndFileNameMap = new HashMap<>();
+    String referenceBeanName;
+
+    NameUtils nameUtils = NameUtils.getInstance();
+
+    public FindRelevancyBeanFileVisitor(String referenceBeanName) {
+        // 转换为类名, 兼容下划线和首字母小写
+        if (referenceBeanName.contains("_")) {
+            this.referenceBeanName = nameUtils.getClassName(referenceBeanName);
+        } else {
+            this.referenceBeanName = referenceBeanName;
+        }
+
+        this.referenceBeanName = nameUtils.firstUpperCase(this.referenceBeanName);
+    }
+
+    @Override
+    public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
+        String fileSourceName = file.getFileName().toString();
+
+        // TODO 后续可以配置忽略的文件和文件夹
+        if (fileSourceName.contains(".class")) {
+            return FileVisitResult.SKIP_SUBTREE;
+        }
+
+        if (fileSourceName.contains(referenceBeanName)) {
+            // 去掉类名中的bean名称. 获取模板名称并小写 DefaultBeanDto.java => DefaultDto.java => defaultDto.java
+            String templateName = nameUtils.firstLowerCase(fileSourceName.replace(referenceBeanName, ""));
+
+            rbNameAndPathMap.put(templateName, file.getParent().toString());
+            rbNameAndPackageMap.put(templateName, readPackageLine(file));
+            rbNameAndCutOffPackageMap.put(templateName, cutOffPackage(rbNameAndPackageMap.get(templateName)));
+            rbNameAndFileNameMap.put(templateName, fileSourceName);
+        }
+        return FileVisitResult.SKIP_SUBTREE;
+    }
+
+    /**
+     * 读取文件的第一行
+     *
+     * @param file 文件
+     * @return 第一行
+     */
+    private String readPackageLine(Path file) {
+        try (Stream<String> lines = Files.lines(file)) {
+            Optional<String> first = lines
+                    .filter(StringUtils::isNotBlank)
+                    .findFirst();
+
+            return first.orElse(StringUtils.EMPTY);
+
+        } catch (IOException e) {
+            e.printStackTrace();
+            ExceptionUtil.rethrow(e);
+        }
+
+        return StringUtils.EMPTY;
+    }
+
+    /**
+     * 截断package
+     * 兼容以前的模板
+     *
+     * @param packageStr 完整package(package com.sjhy.plugin.tool;)
+     * @return 截断的package(com.sjhy.plugin)
+     */
+    private String cutOffPackage(String packageStr) {
+        // impl的要多截取一次
+        if (packageStr.endsWith(".impl;")) {
+            packageStr = packageStr.replace(".impl;", "").trim();
+        }
+
+        int lastIndex = packageStr.lastIndexOf(".");
+        if (lastIndex != -1) {
+            packageStr = packageStr.substring(0, lastIndex);
+        }
+        return packageStr.replace("package", "").trim();
+    }
+
+    public boolean isExist(String name) {
+        return rbNameAndPathMap.containsKey(name);
+    }
+
+
+    public String getPath(String name) {
+        return rbNameAndPathMap.get(name);
+    }
+
+    public String getCutOffPackage(String name) {
+        return rbNameAndCutOffPackageMap.get(name);
+    }
+
+    public String getPackage(String name) {
+        return rbNameAndPackageMap.get(name);
+    }
+
+    public String getFileName(String name) {
+        return rbNameAndFileNameMap.get(name);
+    }
+
+    public String getReferenceBeanName() {
+        return referenceBeanName;
+    }
+}
diff --git a/src/main/java/com/sjhy/plugin/ui/SelectSavePath.form b/src/main/java/com/sjhy/plugin/ui/SelectSavePath.form
index abb73e80..d0e6ae23 100644
--- a/src/main/java/com/sjhy/plugin/ui/SelectSavePath.form
+++ b/src/main/java/com/sjhy/plugin/ui/SelectSavePath.form
@@ -1,32 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.sjhy.plugin.ui.SelectSavePath">
-  <grid id="cbd77" binding="contentPane" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="cbd77" binding="contentPane" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="10" left="10" bottom="10" right="10"/>
     <constraints>
-      <xy x="48" y="54" width="436" height="336"/>
+      <xy x="48" y="54" width="466" height="346"/>
     </constraints>
     <properties/>
     <border type="none"/>
     <children>
-      <grid id="e3588" layout-manager="GridLayoutManager" row-count="9" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+      <grid id="e3588" layout-manager="GridLayoutManager" row-count="10" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
-          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <border type="none"/>
         <children>
           <component id="76436" class="com.intellij.openapi.ui.ComboBox" binding="moduleComboBox">
             <constraints>
-              <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
+              <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
+              <model/>
               <swingPopup value="false"/>
             </properties>
           </component>
           <component id="2dff5" class="javax.swing.JLabel">
             <constraints>
-              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+              <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <labelFor value="158fc"/>
@@ -35,7 +36,7 @@
           </component>
           <component id="158fc" class="javax.swing.JTextField" binding="packageField">
             <constraints>
-              <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+              <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
                 <preferred-size width="150" height="-1"/>
               </grid>
             </constraints>
@@ -43,7 +44,7 @@
           </component>
           <component id="d7b53" class="javax.swing.JLabel">
             <constraints>
-              <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+              <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <labelFor value="ab063"/>
@@ -52,7 +53,7 @@
           </component>
           <component id="ab063" class="javax.swing.JTextField" binding="pathField">
             <constraints>
-              <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+              <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
                 <preferred-size width="150" height="-1"/>
               </grid>
             </constraints>
@@ -60,7 +61,7 @@
           </component>
           <component id="7467f" class="javax.swing.JButton" binding="packageChooseButton">
             <constraints>
-              <grid row="1" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+              <grid row="2" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <text resource-bundle="string" key="label.choose"/>
@@ -68,7 +69,7 @@
           </component>
           <component id="fba1b" class="javax.swing.JButton" binding="pathChooseButton">
             <constraints>
-              <grid row="2" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+              <grid row="3" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <text resource-bundle="string" key="label.choose"/>
@@ -76,7 +77,7 @@
           </component>
           <grid id="7831c" binding="templatePanel" layout-manager="BorderLayout" hgap="0" vgap="0">
             <constraints>
-              <grid row="4" column="1" row-span="5" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+              <grid row="5" column="1" row-span="5" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties/>
             <border type="none"/>
@@ -84,7 +85,7 @@
           </grid>
           <component id="91ae2" class="javax.swing.JLabel">
             <constraints>
-              <grid row="4" column="0" row-span="5" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+              <grid row="5" column="0" row-span="5" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <text resource-bundle="string" key="label.template"/>
@@ -92,12 +93,12 @@
           </component>
           <vspacer id="98aa7">
             <constraints>
-              <grid row="8" column="2" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+              <grid row="9" column="2" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
             </constraints>
           </vspacer>
           <component id="caddc" class="javax.swing.JLabel">
             <constraints>
-              <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+              <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <labelFor value="81a34"/>
@@ -106,7 +107,7 @@
           </component>
           <component id="81a34" class="javax.swing.JTextField" binding="preField">
             <constraints>
-              <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+              <grid row="4" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
                 <preferred-size width="150" height="-1"/>
               </grid>
             </constraints>
@@ -114,7 +115,7 @@
           </component>
           <component id="a9ca" class="javax.swing.JLabel">
             <constraints>
-              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <labelFor value="76436"/>
@@ -123,7 +124,7 @@
           </component>
           <component id="5e5a1" class="javax.swing.JCheckBox" binding="unifiedConfigCheckBox">
             <constraints>
-              <grid row="4" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+              <grid row="5" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <text resource-bundle="string" key="label.unified.config"/>
@@ -132,7 +133,7 @@
           </component>
           <component id="af94e" class="javax.swing.JCheckBox" binding="titleSureCheckBox">
             <constraints>
-              <grid row="5" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+              <grid row="6" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <text value="弹框选是"/>
@@ -141,7 +142,7 @@
           </component>
           <component id="53e7" class="javax.swing.JCheckBox" binding="reFormatCheckBox">
             <constraints>
-              <grid row="7" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+              <grid row="8" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <text value="格式化代码"/>
@@ -150,13 +151,30 @@
           </component>
           <component id="846f2" class="javax.swing.JCheckBox" binding="titleRefuseCheckBox">
             <constraints>
-              <grid row="6" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+              <grid row="7" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <text value="弹框选否"/>
               <toolTipText value="后续弹出的所有代码覆盖弹框全部选否"/>
             </properties>
           </component>
+          <component id="4fd0a" class="javax.swing.JTextField" binding="referenceBean">
+            <constraints>
+              <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+                <preferred-size width="150" height="-1"/>
+              </grid>
+            </constraints>
+            <properties/>
+          </component>
+          <component id="b8131" class="javax.swing.JLabel">
+            <constraints>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <labelFor value="4fd0a"/>
+              <text resource-bundle="string" key="label.referenceBean"/>
+            </properties>
+          </component>
         </children>
       </grid>
     </children>
diff --git a/src/main/java/com/sjhy/plugin/ui/SelectSavePath.java b/src/main/java/com/sjhy/plugin/ui/SelectSavePath.java
index 04802373..07a58ad1 100644
--- a/src/main/java/com/sjhy/plugin/ui/SelectSavePath.java
+++ b/src/main/java/com/sjhy/plugin/ui/SelectSavePath.java
@@ -91,6 +91,11 @@ public class SelectSavePath extends DialogWrapper {
      * 弹框全否复选框
      */
     private JCheckBox titleRefuseCheckBox;
+
+    /**
+     * 参考的bean输入框
+     */
+    private JTextField referenceBean;
     /**
      * 数据缓存工具类
      */
@@ -242,6 +247,9 @@ private void refreshData() {
         if (!StringUtils.isEmpty(tableInfo.getPreName())) {
             preField.setText(tableInfo.getPreName());
         }
+        if (!StringUtils.isEmpty(tableInfo.getReferenceBean())) {
+            referenceBean.setText(tableInfo.getReferenceBean());
+        }
         SettingsStorageDTO settings = SettingsStorageService.getSettingsStorage();
         String groupName = settings.getCurrTemplateGroupName();
         if (!StringUtils.isEmpty(tableInfo.getTemplateGroupName())) {
@@ -302,6 +310,7 @@ private void onOK() {
         } else {
             tableInfo = tableInfoService.getTableInfo(cacheDataUtils.getSelectPsiClass());
         }
+        tableInfo.setReferenceBean(referenceBean.getText());
         tableInfo.setSavePath(savePath);
         tableInfo.setSavePackageName(packageField.getText());
         tableInfo.setPreName(preField.getText());
diff --git a/src/main/resources/string.properties b/src/main/resources/string.properties
index 153879c7..28573070 100644
--- a/src/main/resources/string.properties
+++ b/src/main/resources/string.properties
@@ -12,3 +12,5 @@ label.path=&Path:
 label.removePre=&RemovePre:
 label.template=Template:
 label.unified.config=\u7EDF\u4E00\u914D\u7F6E
+label.referenceBean\ =&ReferenceBean 
+label.referenceBean=&ReferenceBean:

From a911ff8e286cf89c6668ca4d528e854826d44cce Mon Sep 17 00:00:00 2001
From: cgb <cgb@sixeco>
Date: Mon, 19 Feb 2024 15:24:32 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E9=80=82=E9=85=8D`referenceBean=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD`=20&=20=E5=A2=9E=E5=8A=A0referenceBean=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 .../resources/globalConfig/Default/define.vm  |  4 +
 .../Default/{entity.java.vm => .java.vm}      |  0
 .../Default/{mapper.xml.vm => dao.xml.vm}     |  0
 .../{entity.java.vm => .java.vm}              |  0
 .../{mapper.xml.vm => dao.xml.vm}             |  0
 .../MybatisPlus/{entity.java.vm => .java.vm}  |  0
 .../resources/template/ReferenceBean/.java.vm | 38 ++++++++
 .../template/ReferenceBean/controller.java.vm | 97 +++++++++++++++++++
 .../template/ReferenceBean/dao.java.vm        | 40 ++++++++
 .../template/ReferenceBean/dao.xml.vm         | 42 ++++++++
 .../template/ReferenceBean/service.java.vm    | 20 ++++
 .../ReferenceBean/serviceImpl.java.vm         | 24 +++++
 .../{entity.java.vm => .java.vm}              |  0
 14 files changed, 266 insertions(+), 1 deletion(-)
 rename src/main/resources/template/Default/{entity.java.vm => .java.vm} (100%)
 rename src/main/resources/template/Default/{mapper.xml.vm => dao.xml.vm} (100%)
 rename src/main/resources/template/MybatisPlus-Mixed/{entity.java.vm => .java.vm} (100%)
 rename src/main/resources/template/MybatisPlus-Mixed/{mapper.xml.vm => dao.xml.vm} (100%)
 rename src/main/resources/template/MybatisPlus/{entity.java.vm => .java.vm} (100%)
 create mode 100644 src/main/resources/template/ReferenceBean/.java.vm
 create mode 100644 src/main/resources/template/ReferenceBean/controller.java.vm
 create mode 100644 src/main/resources/template/ReferenceBean/dao.java.vm
 create mode 100644 src/main/resources/template/ReferenceBean/dao.xml.vm
 create mode 100644 src/main/resources/template/ReferenceBean/service.java.vm
 create mode 100644 src/main/resources/template/ReferenceBean/serviceImpl.java.vm
 rename src/main/resources/template/spring-data-mongodb/{entity.java.vm => .java.vm} (100%)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0a949120..ea02b561 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://downloads.gradle-dn.com/distributions/gradle-6.9-bin.zip
+distributionUrl=./gradle-6.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/resources/globalConfig/Default/define.vm b/src/main/resources/globalConfig/Default/define.vm
index 4460b105..417205df 100644
--- a/src/main/resources/globalConfig/Default/define.vm
+++ b/src/main/resources/globalConfig/Default/define.vm
@@ -10,6 +10,10 @@
 #if($suffix!="")package #end#if($tableInfo.savePackageName!="")$!{tableInfo.savePackageName}.#{end}$!suffix;
 #end
 
+#macro(setPackage)
+    $!tableInfo.saveFullPackageName
+#end
+
 ##定义直接保存路径与文件名简化的宏定义，调用方式：#save("/entity", ".java")
 #macro(save $path $fileName)
     $!callback.setSavePath($tool.append($tableInfo.savePath, $path))
diff --git a/src/main/resources/template/Default/entity.java.vm b/src/main/resources/template/Default/.java.vm
similarity index 100%
rename from src/main/resources/template/Default/entity.java.vm
rename to src/main/resources/template/Default/.java.vm
diff --git a/src/main/resources/template/Default/mapper.xml.vm b/src/main/resources/template/Default/dao.xml.vm
similarity index 100%
rename from src/main/resources/template/Default/mapper.xml.vm
rename to src/main/resources/template/Default/dao.xml.vm
diff --git a/src/main/resources/template/MybatisPlus-Mixed/entity.java.vm b/src/main/resources/template/MybatisPlus-Mixed/.java.vm
similarity index 100%
rename from src/main/resources/template/MybatisPlus-Mixed/entity.java.vm
rename to src/main/resources/template/MybatisPlus-Mixed/.java.vm
diff --git a/src/main/resources/template/MybatisPlus-Mixed/mapper.xml.vm b/src/main/resources/template/MybatisPlus-Mixed/dao.xml.vm
similarity index 100%
rename from src/main/resources/template/MybatisPlus-Mixed/mapper.xml.vm
rename to src/main/resources/template/MybatisPlus-Mixed/dao.xml.vm
diff --git a/src/main/resources/template/MybatisPlus/entity.java.vm b/src/main/resources/template/MybatisPlus/.java.vm
similarity index 100%
rename from src/main/resources/template/MybatisPlus/entity.java.vm
rename to src/main/resources/template/MybatisPlus/.java.vm
diff --git a/src/main/resources/template/ReferenceBean/.java.vm b/src/main/resources/template/ReferenceBean/.java.vm
new file mode 100644
index 00000000..639dbee5
--- /dev/null
+++ b/src/main/resources/template/ReferenceBean/.java.vm
@@ -0,0 +1,38 @@
+##导入宏定义
+$!{define.vm}
+
+##包路径（宏定义）
+#setPackage()
+
+##自动导入包（全局变量）
+$!autoImport
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+
+##表注释（宏定义）
+#tableComment("表实体类")
+@SuppressWarnings("serial")
+public class $!{tableInfo.name} extends Model<$!{tableInfo.name}> {
+#foreach($column in $tableInfo.fullColumn)
+    #if(${column.comment})//${column.comment}#end
+
+    private $!{tool.getClsNameByFullName($column.type)} $!{column.name};
+#end
+
+#foreach($column in $tableInfo.fullColumn)
+#getSetMethod($column)
+#end
+
+#foreach($column in $tableInfo.pkColumn)
+    /**
+     * 获取主键值
+     *
+     * @return 主键值
+     */
+    @Override
+    protected Serializable pkVal() {
+        return this.$!column.name;
+    }
+    #break
+#end
+}
diff --git a/src/main/resources/template/ReferenceBean/controller.java.vm b/src/main/resources/template/ReferenceBean/controller.java.vm
new file mode 100644
index 00000000..2cabde37
--- /dev/null
+++ b/src/main/resources/template/ReferenceBean/controller.java.vm
@@ -0,0 +1,97 @@
+##导入宏定义
+$!{define.vm}
+
+##设置表后缀（宏定义）
+#setTableSuffix("Controller")
+
+##保存文件（宏定义）
+##save("/controller", "Controller.java")
+
+##包路径（宏定义）
+#setPackage()
+
+##定义服务名
+#set($serviceName = $!tool.append($!tool.firstLowerCase($!tableInfo.name), "Service"))
+
+##定义实体对象名
+#set($entityName = $!tool.firstLowerCase($!tableInfo.name))
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.api.ApiController;
+import com.baomidou.mybatisplus.extension.api.R;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import $!{tableInfo.savePackageName}.entity.$!tableInfo.name;
+import $!{tableInfo.savePackageName}.service.$!{tableInfo.name}Service;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.io.Serializable;
+import java.util.List;
+
+##表注释（宏定义）
+#tableComment("表控制层")
+@RestController
+@RequestMapping("$!tool.firstLowerCase($!tableInfo.name)")
+public class $!{tableName} extends ApiController {
+    /**
+     * 服务对象
+     */
+    @Resource
+    private $!{tableInfo.name}Service $!{serviceName};
+
+    /**
+     * 分页查询所有数据
+     *
+     * @param page 分页对象
+     * @param $!entityName 查询实体
+     * @return 所有数据
+     */
+    @GetMapping
+    public R selectAll(Page<$!tableInfo.name> page, $!tableInfo.name $!entityName) {
+        return success(this.$!{serviceName}.page(page, new QueryWrapper<>($!entityName)));
+    }
+
+    /**
+     * 通过主键查询单条数据
+     *
+     * @param id 主键
+     * @return 单条数据
+     */
+    @GetMapping("{id}")
+    public R selectOne(@PathVariable Serializable id) {
+        return success(this.$!{serviceName}.getById(id));
+    }
+
+    /**
+     * 新增数据
+     *
+     * @param $!entityName 实体对象
+     * @return 新增结果
+     */
+    @PostMapping
+    public R insert(@RequestBody $!tableInfo.name $!entityName) {
+        return success(this.$!{serviceName}.save($!entityName));
+    }
+
+    /**
+     * 修改数据
+     *
+     * @param $!entityName 实体对象
+     * @return 修改结果
+     */
+    @PutMapping
+    public R update(@RequestBody $!tableInfo.name $!entityName) {
+        return success(this.$!{serviceName}.updateById($!entityName));
+    }
+
+    /**
+     * 删除数据
+     *
+     * @param idList 主键结合
+     * @return 删除结果
+     */
+    @DeleteMapping
+    public R delete(@RequestParam("idList") List<Long> idList) {
+        return success(this.$!{serviceName}.removeByIds(idList));
+    }
+}
diff --git a/src/main/resources/template/ReferenceBean/dao.java.vm b/src/main/resources/template/ReferenceBean/dao.java.vm
new file mode 100644
index 00000000..a4b18cfd
--- /dev/null
+++ b/src/main/resources/template/ReferenceBean/dao.java.vm
@@ -0,0 +1,40 @@
+##导入宏定义
+$!{define.vm}
+
+##设置表后缀（宏定义）
+#setTableSuffix("Dao")
+
+##保存文件（宏定义）
+##save("/dao", "Dao.java")
+
+##包路径（宏定义）
+#setPackage()
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import $!{tableInfo.savePackageName}.entity.$!tableInfo.name;
+
+##表注释（宏定义）
+#tableComment("表数据库访问层")
+public interface $!{tableName} extends BaseMapper<$!tableInfo.name> {
+
+/**
+* 批量新增数据（MyBatis原生foreach方法）
+*
+* @param entities List<$!{tableInfo.name}> 实例对象列表
+* @return 影响行数
+*/
+int insertBatch(@Param("entities") List<$!{tableInfo.name}> entities);
+
+/**
+* 批量新增或按主键更新数据（MyBatis原生foreach方法）
+*
+* @param entities List<$!{tableInfo.name}> 实例对象列表
+* @return 影响行数
+* @throws org.springframework.jdbc.BadSqlGrammarException 入参是空List的时候会抛SQL语句错误的异常，请自行校验入参
+*/
+int insertOrUpdateBatch(@Param("entities") List<$!{tableInfo.name}> entities);
+
+}
diff --git a/src/main/resources/template/ReferenceBean/dao.xml.vm b/src/main/resources/template/ReferenceBean/dao.xml.vm
new file mode 100644
index 00000000..f3e145aa
--- /dev/null
+++ b/src/main/resources/template/ReferenceBean/dao.xml.vm
@@ -0,0 +1,42 @@
+##引入mybatis支持
+$!{mybatisSupport.vm}
+
+##设置保存名称与保存位置
+$!callback.setFileName($tool.append($!{tableInfo.name}, "Dao.xml"))
+$!callback.setSavePath($tool.append($modulePath, "/src/main/resources/mapper"))
+
+##拿到主键
+#if(!$tableInfo.pkColumn.isEmpty())
+    #set($pk = $tableInfo.pkColumn.get(0))
+#end
+
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="$!{tableInfo.savePackageName}.dao.$!{tableInfo.name}Dao">
+
+    <resultMap type="$!{tableInfo.savePackageName}.entity.$!{tableInfo.name}" id="$!{tableInfo.name}Map">
+#foreach($column in $tableInfo.fullColumn)
+        <result property="$!column.name" column="$!column.obj.name" jdbcType="$!column.ext.jdbcType"/>
+#end
+    </resultMap>
+
+    <!-- 批量插入 -->
+    <insert id="insertBatch" keyProperty="$!pk.name" useGeneratedKeys="true">
+        insert into $!{tableInfo.obj.parent.name}.$!{tableInfo.obj.name}(#foreach($column in $tableInfo.otherColumn)$!column.obj.name#if($velocityHasNext), #end#end)
+        values
+        <foreach collection="entities" item="entity" separator=",">
+        (#foreach($column in $tableInfo.otherColumn)#{entity.$!{column.name}}#if($velocityHasNext), #end#end)
+        </foreach>
+    </insert>
+    <!-- 批量插入或按主键更新 -->
+    <insert id="insertOrUpdateBatch" keyProperty="$!pk.name" useGeneratedKeys="true">
+        insert into $!{tableInfo.obj.parent.name}.$!{tableInfo.obj.name}(#foreach($column in $tableInfo.otherColumn)$!column.obj.name#if($velocityHasNext), #end#end)
+        values
+        <foreach collection="entities" item="entity" separator=",">
+            (#foreach($column in $tableInfo.otherColumn)#{entity.$!{column.name}}#if($velocityHasNext), #end#end)
+        </foreach>
+        on duplicate key update
+         #foreach($column in $tableInfo.otherColumn)$!column.obj.name = values($!column.obj.name) #if($velocityHasNext), #end#end
+    </insert>
+
+</mapper>
diff --git a/src/main/resources/template/ReferenceBean/service.java.vm b/src/main/resources/template/ReferenceBean/service.java.vm
new file mode 100644
index 00000000..7fae904d
--- /dev/null
+++ b/src/main/resources/template/ReferenceBean/service.java.vm
@@ -0,0 +1,20 @@
+##导入宏定义
+$!{define.vm}
+
+##设置表后缀（宏定义）
+#setTableSuffix("Service")
+
+##保存文件（宏定义）
+##save("/service", "Service.java")
+
+##包路径（宏定义）
+#setPackage()
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import $!{tableInfo.savePackageName}.entity.$!tableInfo.name;
+
+##表注释（宏定义）
+#tableComment("表服务接口")
+public interface $!{tableName} extends IService<$!tableInfo.name> {
+
+}
diff --git a/src/main/resources/template/ReferenceBean/serviceImpl.java.vm b/src/main/resources/template/ReferenceBean/serviceImpl.java.vm
new file mode 100644
index 00000000..bee21ba9
--- /dev/null
+++ b/src/main/resources/template/ReferenceBean/serviceImpl.java.vm
@@ -0,0 +1,24 @@
+##导入宏定义
+$!{define.vm}
+
+##设置表后缀（宏定义）
+#setTableSuffix("ServiceImpl")
+
+##保存文件（宏定义）
+##save("/service/impl", "ServiceImpl.java")
+
+##包路径（宏定义）
+#setPackage()
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import $!{tableInfo.savePackageName}.dao.$!{tableInfo.name}Dao;
+import $!{tableInfo.savePackageName}.entity.$!{tableInfo.name};
+import $!{tableInfo.savePackageName}.service.$!{tableInfo.name}Service;
+import org.springframework.stereotype.Service;
+
+##表注释（宏定义）
+#tableComment("表服务实现类")
+@Service("$!tool.firstLowerCase($tableInfo.name)Service")
+public class $!{tableName} extends ServiceImpl<$!{tableInfo.name}Dao, $!{tableInfo.name}> implements $!{tableInfo.name}Service {
+
+}
diff --git a/src/main/resources/template/spring-data-mongodb/entity.java.vm b/src/main/resources/template/spring-data-mongodb/.java.vm
similarity index 100%
rename from src/main/resources/template/spring-data-mongodb/entity.java.vm
rename to src/main/resources/template/spring-data-mongodb/.java.vm