feat: 2.06 Bean to table | Bean 对应表

LinWanCen · LinWanCen · commit f0e71019f758 · 2025-01-02T20:11:09.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ## [1.0.0]
 
+- 2.06 Bean to table
 - 2.05 ignore id in ignore.sql-list.txt
 - 2.04 MyBatis *.xml SQL inspection
 - 2.02 ★ Column Relationships PlantUML
@@ -13,6 +14,7 @@
 
 # 中文更新日志
 
+- 2.06 Bean 对应表
 - 2.05 忽略 ignore.sql-list.txt 中的 id
 - 2.04 MyBatis *.xml SQL 实时检查
 - 2.03 增加 sql-list.err.md 文件
diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ pluginGroup = com.github.linwancen.plugin.sql
 pluginName = sql-list
 pluginRepositoryUrl = https://github.com/LinWanCen/sql-list
 # SemVer format -> https://semver.org
-pluginVersion = 2.05
+pluginVersion = 2.06
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild = 201
diff --git a/src/main/java/io/github/linwancen/sql/DiffGit.java b/src/main/java/io/github/linwancen/sql/DiffGit.java
@@ -3,26 +3,23 @@
 import io.github.linwancen.sql.bean.GitRootInfo;
 import io.github.linwancen.sql.bean.SqlInfo;
 import io.github.linwancen.sql.parser.AllParser;
-import io.github.linwancen.sql.parser.GitParser;
 import io.github.linwancen.util.git.GitUtils;
-import io.github.linwancen.util.java.TimeUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.util.Arrays;
 import java.util.List;
 import java.util.function.Consumer;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 /**
  *
  */
 public class DiffGit {
-    private static final Logger LOG = LoggerFactory.getLogger(DiffGit.class);
+    private static final Pattern SPLIT_PATTERN = Pattern.compile("\\.\\.");
 
     public static void gitBetween(String[] args, Consumer<List<SqlInfo>> fun) {
-        String[] split = args[0].split("\\.\\.");
+        String[] split = SPLIT_PATTERN.split(args[0]);
         if (split.length != 2) {
             return;
         }
diff --git a/src/main/java/io/github/linwancen/sql/bean/Dto.java b/src/main/java/io/github/linwancen/sql/bean/Dto.java
@@ -0,0 +1,38 @@
+package io.github.linwancen.sql.bean;
+
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.HeadFontStyle;
+import com.alibaba.excel.annotation.write.style.HeadStyle;
+import com.alibaba.excel.enums.BooleanEnum;
+import com.alibaba.excel.enums.poi.HorizontalAlignmentEnum;
+
+@SuppressWarnings("unused")
+@HeadStyle(wrapped = BooleanEnum.FALSE, horizontalAlignment = HorizontalAlignmentEnum.LEFT)
+@HeadFontStyle(fontHeightInPoints = 11, bold = BooleanEnum.FALSE, fontName = "宋体")
+public class Dto {
+    public Dto(String className, String tableName) {
+        this.className = className;
+        this.tableName = tableName;
+    }
+
+    @ColumnWidth(50)
+    private String className;
+    @ColumnWidth(50)
+    private String tableName;
+
+    public String getClassName() {
+        return className;
+    }
+
+    public void setClassName(String className) {
+        this.className = className;
+    }
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName;
+    }
+}
diff --git a/src/main/java/io/github/linwancen/sql/bean/SqlInfo.java b/src/main/java/io/github/linwancen/sql/bean/SqlInfo.java
@@ -16,6 +16,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 @SuppressWarnings("unused")
@@ -29,6 +30,7 @@ public class SqlInfo {
     private String type;
     private String parameterType;
     private String resultMap;
+    private String resultType;
     @ColumnWidth(40)
     private String sql;
     /** TableName, TableExcelLine */
@@ -113,6 +115,31 @@ public void setResultMap(String resultMap) {
         this.resultMap = resultMap;
     }
 
+    public String getResultType() {
+        return resultType;
+    }
+
+    public void setResultType(String resultType) {
+        this.resultType = resultType;
+    }
+
+    Pattern BASE_PATTERN = Pattern.compile("^java\\.|^(int|long|short|double|float|boolean|char|byte" +
+            "|String|map|integer|Integer|Long|Short|Double|Float|Boolean|Char|Byte)$");
+
+    public String getResultClass() {
+        if (resultType == null || BASE_PATTERN.matcher(resultType).find()) {
+            return null;
+        }
+        return resultType;
+    }
+
+    public String getParameterClass() {
+        if (parameterType == null || BASE_PATTERN.matcher(parameterType).find()) {
+            return null;
+        }
+        return parameterType;
+    }
+
     public String getSql() {
         return sql;
     }
diff --git a/src/main/java/io/github/linwancen/sql/excel/SqlInfoWriter.java b/src/main/java/io/github/linwancen/sql/excel/SqlInfoWriter.java
@@ -2,6 +2,7 @@
 
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.write.metadata.WriteSheet;
+import io.github.linwancen.sql.bean.Dto;
 import io.github.linwancen.sql.bean.Rel;
 import io.github.linwancen.sql.bean.SqlInfo;
 import io.github.linwancen.sql.bean.TableColumn;
@@ -18,7 +19,9 @@
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
 
@@ -32,14 +35,17 @@ public class SqlInfoWriter {
     private final WriteSheet table;
     private final WriteSheet column;
     private final WriteSheet rel;
+    private final WriteSheet dto;
     private final Set<List<String>> columnRel = new HashSet<>();
+    private final Map<String, String> dtoMap = new LinkedHashMap<>();
 
     public SqlInfoWriter(ExcelWriter excelWriter) {
         this.excelWriter = excelWriter;
         sql = ExcelUtils.sheet(this.excelWriter, "sql", SqlInfo.class);
         table = ExcelUtils.sheet(excelWriter, "table", TableColumn.class);
         column = ExcelUtils.sheet(excelWriter, "column", TableColumn.class);
         rel = ExcelUtils.sheet(excelWriter, "rel", Rel.class);
+        dto = ExcelUtils.sheet(excelWriter, "dto", Dto.class);
     }
 
     public void write(List<SqlInfo> sqlInfo) {
@@ -52,12 +58,23 @@ public void write(List<SqlInfo> sqlInfo) {
             }
             info.setSql(sqlStr);
 
+            String oneTableName = null;
+            if (info.getTableMap().size() == 1) {
+                oneTableName = info.getTableMap().keySet().iterator().next();
+                String parameterClass = info.getParameterClass();
+                if (parameterClass != null) {
+                    dtoMap.putIfAbsent(parameterClass, oneTableName);
+                }
+                String resultClass = info.getResultClass();
+                if (resultClass != null) {
+                    dtoMap.put(resultClass, oneTableName);
+                }
+            }
             for (TreeMap<String, TableColumn> map : info.getColumnList()) {
                 for (TableColumn v : map.values()) {
                     // column table null and one table use it
-                    if (v.getTable() == null && info.getTableMap().size() == 1) {
-                        String tableName = info.getTableMap().keySet().iterator().next();
-                        v.setTable(tableName);
+                    if (v.getTable() == null && oneTableName != null) {
+                        v.setTable(oneTableName);
                     }
                     excelWriter.write(Collections.singleton(v), column);
 
@@ -78,6 +95,7 @@ public void write(List<SqlInfo> sqlInfo) {
 
             appendErr(info, err);
         }
+        dtoMap.forEach((clazz, table) -> excelWriter.write(Collections.singleton(new Dto(clazz, table)), dto));
         excelWriter.write(sqlInfo, sql);
 
         File file = excelWriter.writeContext().writeWorkbookHolder().getFile();
diff --git a/src/main/java/io/github/linwancen/sql/parser/jsqlparser/AddUtils.java b/src/main/java/io/github/linwancen/sql/parser/jsqlparser/AddUtils.java
@@ -86,8 +86,11 @@ private static String tableName(SqlInfo sqlInfo, Column column) {
             return null;
         } else {
             String aliasName = table.getName();
-            String mapName = aliasName == null ? null : sqlInfo.getAliasMap().get(aliasName);
-            return mapName == null ? aliasName : mapName;
+            if (aliasName == null) {
+                return null;
+            }
+            String mapName = sqlInfo.getAliasMap().get(aliasName);
+            return mapName != null ? mapName : aliasName.replace("`", "");
         }
     }
 }
diff --git a/src/main/java/io/github/linwancen/sql/parser/mybatis/file/XmlFileParser.java b/src/main/java/io/github/linwancen/sql/parser/mybatis/file/XmlFileParser.java
@@ -46,7 +46,9 @@ public class XmlFileParser {
     public final MapperBuilderAssistant assistant;
     public final XNode mapper;
     public final String namespace;
-    public final Map<String , LineNumberElement> lineMap = new HashMap<>();
+    public final Map<String, LineNumberElement> lineMap = new HashMap<>();
+    public final Map<String, String> resultMapMap = new HashMap<>();
+    public final Map<String, String> typeAliasMap = new HashMap<>();
 
     public static XmlFileParser build(Configuration configuration, File file, GitRootInfo gitRootInfo) {
         try (FileInputStream fis = new FileInputStream(file)) {
@@ -100,8 +102,16 @@ public XmlFileParser(InputStream fis, Configuration configuration, File file, Gi
         Element rootElement = document.getRootElement();
         List<Element> children = rootElement.getChildren();
         for (Element child : children) {
-            String type = child.getName();
-            if (!SQL_TYPE_PATTERN.matcher(type).find()) {
+            String name = child.getName();
+            switch (name) {
+                case "resultMap":
+                    resultMapMap.put(child.getAttributeValue("id"), child.getAttributeValue("type"));
+                    continue;
+                case "typeAlias":
+                    typeAliasMap.put(child.getAttributeValue("alias"), child.getAttributeValue("type"));
+                    continue;
+            }
+            if (!SQL_TYPE_PATTERN.matcher(name).find()) {
                 continue;
             }
             String id = child.getAttributeValue("id");
@@ -169,7 +179,18 @@ public void parserSql(Function<SqlInfo, Boolean> fun) {
                 sqlInfo.setNamespace(namespace);
                 sqlInfo.setType(xmlSQL.getName());
                 sqlInfo.setParameterType(xmlSQL.getStringAttribute("parameterType"));
-                sqlInfo.setResultMap(xmlSQL.getStringAttribute("resultMap"));
+
+                String resultMap = xmlSQL.getStringAttribute("resultMap");
+                if (resultMap != null) {
+                    sqlInfo.setResultMap(resultMap);
+                    sqlInfo.setResultType(resultMapMap.get(resultMap));
+                } else {
+                    sqlInfo.setResultType(xmlSQL.getStringAttribute("resultType"));
+                }
+                String type = typeAliasMap.get(sqlInfo.getResultType());
+                if (type != null) {
+                    sqlInfo.setResultType(type);
+                }
 
                 XMLIncludeTransformer transformer = new XMLIncludeTransformer(configuration, assistant);
                 Node node = xmlSQL.getNode();
diff --git a/src/main/java/io/github/linwancen/util/java/JFileUtils.java b/src/main/java/io/github/linwancen/util/java/JFileUtils.java
@@ -3,8 +3,10 @@
 import javax.swing.*;
 import java.io.File;
 import java.util.ArrayList;
+import java.util.regex.Pattern;
 
 public class JFileUtils {
+    private static final Pattern SPLIT_PATTERN = Pattern.compile("\n");
 
     private JFileUtils() {}
 
@@ -14,7 +16,7 @@ public static File[] chooser() {
         jFileChooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);
         File lastSelectFile = new File("lastSelectFile.txt");
         if (lastSelectFile.exists()) {
-            String[] split = FileUtils.read(lastSelectFile).split("\n");
+            String[] split = SPLIT_PATTERN.split(FileUtils.read(lastSelectFile));
             if (split.length >= 2) {
                 jFileChooser.setCurrentDirectory(new File(split[0]));
                 ArrayList<File> files = new ArrayList<>();

Original file line number	Diff line number	Diff line change
`@@ -86,8 +86,11 @@ private static String tableName(SqlInfo sqlInfo, Column column) {`
`86`	`86`	`return null;`
`87`	`87`	`} else {`
`88`	`88`	`String aliasName = table.getName();`
`89`		`- String mapName = aliasName == null ? null : sqlInfo.getAliasMap().get(aliasName);`
`90`		`- return mapName == null ? aliasName : mapName;`
	`89`	`+ if (aliasName == null) {`
	`90`	`+ return null;`
	`91`	`+ }`
	`92`	`+ String mapName = sqlInfo.getAliasMap().get(aliasName);`
	`93`	+ return mapName != null ? mapName : aliasName.replace("`", "");
`91`	`94`	`}`
`92`	`95`	`}`
`93`	`96`	`}`