feat: 2.05 ignore id in ignore.sql-list.txt | 忽略 ignore.sql-list.txt 中的 id

LinWanCen · LinWanCen · commit 6666d3b02091 · 2024-12-23T22:16:27.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ## [1.0.0]
 
+- 2.05 ignore id in ignore.sql-list.txt
 - 2.04 MyBatis *.xml SQL inspection
 - 2.02 ★ Column Relationships PlantUML
 - 2.01 Copy MyBatis *.xml SQL
@@ -12,6 +13,7 @@
 
 # 中文更新日志
 
+- 2.05 忽略 ignore.sql-list.txt 中的 id
 - 2.04 MyBatis *.xml SQL 实时检查
 - 2.03 增加 sql-list.err.md 文件
 - 2.02 ★ 列关系 PlantUML 图
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.04
+pluginVersion = 2.05
 
 # 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/excel/SqlInfoWriter.java b/src/main/java/io/github/linwancen/sql/excel/SqlInfoWriter.java
@@ -46,8 +46,10 @@ public void write(List<SqlInfo> sqlInfo) {
         StringBuilder err = new StringBuilder();
         for (SqlInfo info : sqlInfo) {
             String sqlStr = info.getSql();
-            sqlStr = LineFormat.itemsOneLine(sqlStr);
-            sqlStr = LineFormat.deleteSpaceLine(sqlStr);
+            if (sqlStr != null) {
+                sqlStr = LineFormat.itemsOneLine(sqlStr);
+                sqlStr = LineFormat.deleteSpaceLine(sqlStr);
+            }
             info.setSql(sqlStr);
 
             for (TreeMap<String, TableColumn> map : info.getColumnList()) {
@@ -136,7 +138,7 @@ private static void write(String pathPrefix, String ext, StringBuilder err, Stri
         File errFile = new File(pathPrefix + ext);
         try {
             Files.write(errFile.toPath(), err.toString().getBytes(StandardCharsets.UTF_8));
-            LOG.info("{}:\tfile:///{}{}", tip, pathPrefix.replace('\\', '/'), ext);
+            LOG.info("{}:\tfile:///{}{}\n", tip, pathPrefix.replace('\\', '/'), ext);
         } catch (IOException e) {
             LOG.error("{} write fail: ", tip, e);
         }
diff --git a/src/main/java/io/github/linwancen/sql/parser/AllParser.java b/src/main/java/io/github/linwancen/sql/parser/AllParser.java
@@ -3,6 +3,7 @@
 import io.github.linwancen.sql.bean.GitRootInfo;
 import io.github.linwancen.sql.bean.SqlInfo;
 import io.github.linwancen.sql.parser.jsqlparser.JSqlParser;
+import io.github.linwancen.sql.parser.log.SqlInfoLog;
 import io.github.linwancen.sql.parser.mybatis.MapperFileFinder;
 import io.github.linwancen.sql.parser.mybatis.MyBatisParser;
 import io.github.linwancen.util.java.TimeUtils;
@@ -21,21 +22,25 @@ public static List<SqlInfo> parse(Collection<File> files, GitRootInfo gitRootInf
         List<SqlInfo> sqlInfoList = new ArrayList<>();
         long t1 = System.currentTimeMillis();
 
-        List<File> mapperFileList = MapperFileFinder.findMapperFileList(files);
-        LOG.info("mapperList size {}", mapperFileList.size());
+        List<File> ignoreFileList = new ArrayList<>();
+        List<File> mapperFileList = new ArrayList<>();
+        MapperFileFinder.findMapperFileList(files, mapperFileList, ignoreFileList);
+        LOG.info("ignoreFileList size {}\n", ignoreFileList.size());
+        SqlInfoLog.loadAndAddIgnore(ignoreFileList);
+        LOG.info("mapperFileList size {}\n", mapperFileList.size());
         new MyBatisParser().parser(mapperFileList, gitRootInfo, sqlInfoList::add);
         long t2 = System.currentTimeMillis();
-        LOG.info("sql size {}", sqlInfoList.size());
-        LOG.info("MyBatisParser use {}", TimeUtils.useTime(t2 - t1));
+        LOG.info("sql size {}\n", sqlInfoList.size());
+        LOG.info("MyBatisParser use {}\n", TimeUtils.useTime(t2 - t1));
 
         sqlInfoList.parallelStream().forEach(JSqlParser::parseSQL);
         long t3 = System.currentTimeMillis();
-        LOG.info("SqlParser use {}", TimeUtils.useTime(t3 - t2));
+        LOG.info("SqlParser use {}\n", TimeUtils.useTime(t3 - t2));
 
         if (git) {
             sqlInfoList.parallelStream().forEach(GitParser::parseLast);
             long t4 = System.currentTimeMillis();
-            LOG.info("GitParser use {}", TimeUtils.useTime(t4 - t3));
+            LOG.info("GitParser use {}\n", TimeUtils.useTime(t4 - t3));
         }
 
         return sqlInfoList;
diff --git a/src/main/java/io/github/linwancen/sql/parser/log/SqlInfoLog.java b/src/main/java/io/github/linwancen/sql/parser/log/SqlInfoLog.java
@@ -7,11 +7,31 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.File;
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.nio.file.Files;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 public class SqlInfoLog {
     private static final Logger LOG = LoggerFactory.getLogger(SqlInfoLog.class);
+    private static final Map<String, String> ignoreIdMap = new ConcurrentHashMap<>();
+
+    public static void loadAndAddIgnore(List<File> files) {
+        ignoreIdMap.clear();
+        files.parallelStream().forEach(file -> {
+            try {
+                List<String> list = Files.readAllLines(file.toPath());
+                for (String s : list) {
+                    ignoreIdMap.put(s, "");
+                }
+            } catch (Exception e) {
+                LOG.error("loadAndAddIgnore fail: ", e);
+            }
+        });
+    }
 
     /**
      * gitAuthor name fail: ExceptionClassSimpleName: LocalizedMessage.delete("Was expecting..."）
@@ -20,6 +40,9 @@ public class SqlInfoLog {
      * <br>^
      */
     public static String msg(String name, SqlInfo sqlInfo, Exception e, boolean inXml) {
+        if (ignoreIdMap.containsKey(sqlInfo.getFullId())) {
+            return name + " ignore fail: " + sqlInfo.getFullId() + "\n";
+        }
         StringWriter sw = new StringWriter();
         e.printStackTrace(new PrintWriter(sw));
         String stackTrace = sw.toString();
@@ -33,35 +56,40 @@ public static String msg(String name, SqlInfo sqlInfo, Exception e, boolean inXm
             if (msg == null) {
                 return stackTrace;
             }
-            StringBuilder sb = new StringBuilder(name).append(" fail: ");
-            sb.append(e.getClass().getSimpleName()).append(": ");
-            int i = msg.indexOf("\nWas expecting");
-            if (i > 0) {
-                msg = msg.substring(0, i).replace("\n", "");
-            }
-            if (inXml) {
-                sqlInfo.setXmlErr(msg);
-            } else {
-                sqlInfo.setSqlErr(msg);
-            }
-            sb.append(msg).append('\n');
+            StringBuilder sb = new StringBuilder(name).append(" fail:\n");
+            msg = addExceptionMsg(sqlInfo, e, inXml, sb, msg);
             GitParser.parseLast(sqlInfo);
             sb.append(sqlInfo.getLastAuthor()).append(' ');
             sb.append(".(").append(sqlInfo.getFile().getName()).append(':').append(sqlInfo.getStartLine()).append(") ");
-            sb.append(sqlInfo.getId());
-            sb.append(" file:///").append(PathUtils.canonicalPath(sqlInfo.getFile()));
+            sb.append(sqlInfo.getId()).append("\n");
+            sb.append("file:///").append(PathUtils.canonicalPath(sqlInfo.getFile())).append("\n");
 
             String sql = sqlInfo.getSql();
             if (sql == null) {
                 return sb.toString();
             }
             sql = LineColumnTip.parseMsg(sql, msg);
             sqlInfo.setSql(sql);
-            sb.append('\n').append(sql);
+            sb.append('\n').append(sql).append("\n");
             return sb.toString();
         } catch (RuntimeException re) {
             LOG.warn("SqlInfoLog.msg() Exception: ", re);
             return stackTrace;
         }
     }
+
+    private static String addExceptionMsg(SqlInfo sqlInfo, Exception e, boolean inXml, StringBuilder sb, String msg) {
+        sb.append(e.getClass().getSimpleName()).append(": ");
+        int i = msg.indexOf("\nWas expecting");
+        if (i > 0) {
+            msg = msg.substring(0, i).replace("\n", "");
+        }
+        if (inXml) {
+            sqlInfo.setXmlErr(msg);
+        } else {
+            sqlInfo.setSqlErr(msg);
+        }
+        sb.append(msg).append('\n');
+        return msg;
+    }
 }
diff --git a/src/main/java/io/github/linwancen/sql/parser/mybatis/MapperFileFinder.java b/src/main/java/io/github/linwancen/sql/parser/mybatis/MapperFileFinder.java
@@ -4,25 +4,27 @@
 import io.github.linwancen.util.java.MultiFileUtils;
 
 import java.io.File;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
 public class MapperFileFinder {
 
-    public static List<File> findMapperFileList(Collection<File> files) {
-        List<File> mapperList = new ArrayList<>();
+    public static void findMapperFileList(Collection<File> files,
+                                                List<File> mapperFileList,
+                                                List<File> ignoreFileList) {
         files.parallelStream().forEach(file -> {
             MultiFileUtils.walk(file, f -> {
                 String path = PathUtils.canonicalPath(f);
                 if (path.contains("/target/") || path.contains("/build/")) {
                     return;
                 }
                 if (path.endsWith(".xml")) {
-                    mapperList.add(f);
+                    mapperFileList.add(f);
+                }
+                if (path.endsWith("ignore.sql-list.txt")) {
+                    ignoreFileList.add(f);
                 }
             });
         });
-        return mapperList;
     }
 }
