🐛 修复模糊文本的聚合搜索结果为空(相似度过低被忽略)

Author: freeok

src/main/java/com/pcdd/sonovel/action/AggregatedSearchAction.java

@@ -12,6 +12,7 @@
 import lombok.SneakyThrows;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Scanner;
 import java.util.concurrent.CountDownLatch;
@@ -49,29 +50,31 @@ public void execute() {
 
     @SneakyThrows
     public static List<SearchResult> getSearchResults(String kw) {
-        List<List<SearchResult>> results = new ArrayList<>();
+        List<SearchResult> results = Collections.synchronizedList(new ArrayList<>());
         List<Source> searchableSources = SourceUtils.getSearchableSources();
         ExecutorService threadPool = Executors.newFixedThreadPool(searchableSources.size());
         CountDownLatch latch = new CountDownLatch(searchableSources.size());
 
         for (Source source : searchableSources) {
             threadPool.execute(() -> {
-                List<SearchResult> res = new SearchParser(source.config).parse(kw);
-
-                if (CollUtil.isNotEmpty(res)) {
-                    Rule rule = source.rule;
-                    Console.log("<== 书源 {} ({})\t搜索到 {} 条记录", rule.getId(), rule.getName(), res.size());
-                    results.add(res);
+                try {
+                    List<SearchResult> res = new SearchParser(source.config).parse(kw);
+                    if (CollUtil.isNotEmpty(res)) {
+                        Rule rule = source.rule;
+                        Console.log("<== 书源 {} ({})\t搜索到 {} 条记录", rule.getId(), rule.getName(), res.size());
+                        results.addAll(res);
+                    }
+                } catch (Exception e) {
+                    Console.error("搜索源 {} 异常：{}", source.rule.getName(), e.getMessage());
+                } finally {
+                    latch.countDown();
                 }
-
-                latch.countDown();
             });
         }
 
         latch.await();
-        List<SearchResult> flatList = new ArrayList<>();
-        results.forEach(flatList::addAll);
-        return SearchResultsHandler.aggregateSort(flatList, kw);
+        threadPool.shutdown();
+        return SearchResultsHandler.aggregateSort(results, kw);
     }
 
 }

src/main/java/com/pcdd/sonovel/handle/SearchResultsHandler.java

@@ -42,22 +42,36 @@ public static List<SearchResult> aggregateSort(List<SearchResult> data, String k
         double authorScore = getSimilarity(data, kw, "author");
         boolean isAuthorSearch = bookNameScore < authorScore;
 
-        return data.stream()
-                // 筛选相似度大于 0.3 的记录
-                .filter(sr -> StrUtil.similar(kw, isAuthorSearch ? sr.getAuthor() : sr.getBookName()) > 0.3)
-                .sorted((o1, o2) -> {
-                    double score1 = StrUtil.similar(kw, isAuthorSearch ? o1.getAuthor() : o1.getBookName());
-                    double score2 = StrUtil.similar(kw, isAuthorSearch ? o2.getAuthor() : o2.getBookName());
-
-                    if (score1 != score2) {
-                        return Double.compare(score2, score1); // 按相似度降序
-                    }
-
-                    return isAuthorSearch
-                            ? o1.getBookName().compareTo(o2.getBookName()) // 按书名升序
-                            : o1.getAuthor().compareTo(o2.getAuthor());  // 按作者升序
-                })
+        // 缓存相似度
+        Map<SearchResult, Double> similarityMap = new HashMap<>();
+        for (SearchResult sr : data) {
+            String target = isAuthorSearch ? sr.getAuthor() : sr.getBookName();
+            double score = StrUtil.similar(kw, target);
+            similarityMap.put(sr, score);
+        }
+
+        // 排序器统一封装，复用
+        Comparator<SearchResult> comparator = (o1, o2) -> {
+            double score1 = similarityMap.get(o1);
+            double score2 = similarityMap.get(o2);
+            if (score1 != score2) {
+                return Double.compare(score2, score1); // 按相似度降序
+            }
+            return isAuthorSearch
+                    ? o1.getBookName().compareTo(o2.getBookName())
+                    : o1.getAuthor().compareTo(o2.getAuthor());
+        };
+
+        // 筛选相似度高的
+        List<SearchResult> filtered = data.stream()
+                .filter(sr -> similarityMap.get(sr) > 0.3)
+                .sorted(comparator)
                 .toList();
+
+        // 如果筛选后为空，则排序原始 data 返回
+        return filtered.isEmpty()
+                ? data.stream().filter(sr -> similarityMap.get(sr) > 0).sorted(comparator).toList()
+                : filtered;
     }
 
     // 计算权重，用于判断关键字是书名还是作者