From 28cf0afe5cb951bf34a60a1ee0f36d38c592a8c0 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 09 十二月 2025 11:10:29 +0800
Subject: [PATCH] 新增搜索 不选模块进行全局搜索 获取每个模块
---
zhang-content/src/main/java/com/ruoyi/service/impl/InterfaceBasedSearchRouter.java | 151 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 135 insertions(+), 16 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/InterfaceBasedSearchRouter.java b/zhang-content/src/main/java/com/ruoyi/service/impl/InterfaceBasedSearchRouter.java
index b4ffc53..91509a9 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/InterfaceBasedSearchRouter.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/InterfaceBasedSearchRouter.java
@@ -2,16 +2,19 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysMenu;
+import com.ruoyi.domain.ModuleSearchResult;
import com.ruoyi.service.ModuleSearchable;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.logging.Log;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -20,6 +23,7 @@
public class InterfaceBasedSearchRouter {
private final Map<String, ModuleSearchable> moduleSearchMap;
+
/**
* 鑷姩鏀堕泦鎵�鏈夊疄鐜癕oduleSearchable鎺ュ彛鐨凚ean
@@ -39,6 +43,21 @@
log.info("宸叉敞鍐屾悳绱㈡ā鍧�: {}", moduleSearchMap.keySet());
}
+ @Async // 澹版槑姝ゆ柟娉曞紓姝ユ墽琛岋紝灏嗕娇鐢ㄦ垜浠笂闈㈤厤缃殑Executor
+ public CompletableFuture<ModuleSearchResult> searchModuleAsync(String moduleCode, ModuleSearchable service, String companion, Date startTime, Date endTime) {
+ // 灏嗗師鏉ュ湪lambda琛ㄨ揪寮忎腑鐨勬悳绱㈤�昏緫绉诲埌杩欓噷
+ long start = System.currentTimeMillis();
+ try {
+ List<?> data = service.search(companion, startTime, endTime);
+ long searchTime = System.currentTimeMillis() - start;
+ ModuleSearchResult result = ModuleSearchResult.success(moduleCode, service.getModuleName(), data, data.size(), searchTime);
+ return CompletableFuture.completedFuture(result);
+ } catch (Exception e) {
+ log.error("妯″潡[{}]鎼滅储澶辫触: {}", moduleCode, e.getMessage());
+ ModuleSearchResult result = ModuleSearchResult.error(moduleCode, e.getMessage());
+ return CompletableFuture.completedFuture(result);
+ }
+ }
/**
* 閫氱敤鐨勮矾鐢辨悳绱㈣姹傦紙鏀寔涓嶅悓鍙傛暟绫诲瀷锛�
*/
@@ -48,6 +67,12 @@
public AjaxResult routeSearch(String moduleCode, Object... args) {
log.info("璺敱鎼滅储: moduleCode={}, args={}", moduleCode, Arrays.toString(args));
+ // 鍏ㄦā鍧楁悳绱細褰搈oduleCode涓虹┖鎴栫壒瀹氭爣璇嗘椂
+ if (moduleCode == null || moduleCode.isEmpty() || "all".equalsIgnoreCase(moduleCode)) {
+ return searchAllModules(args);
+ }
+
+ // 鍗曚釜妯″潡鎼滅储锛堝師鏈夐�昏緫锛�
ModuleSearchable searchService = moduleSearchMap.get(moduleCode);
if (searchService == null) {
String availableModules = String.join(", ", moduleSearchMap.keySet());
@@ -55,7 +80,6 @@
}
try {
- // 鏍规嵁鍙傛暟鏁伴噺杩涜璺敱
if (args.length == 3) {
return handleFourArgs(searchService, args);
} else {
@@ -67,9 +91,6 @@
}
}
- /**
- * 澶勭悊3涓弬鏁扮殑鎯呭喌锛坈ompanion + happenStartTime + happenEndTime锛�
- */
private AjaxResult handleFourArgs(ModuleSearchable searchService, Object[] args) {
String companion = null;
Date happenStartTime = null;
@@ -108,6 +129,98 @@
return AjaxResult.success("鎼滅储鎴愬姛", result);
}
+
+ /**
+ * 鍏ㄦā鍧楁悳绱細鑾峰彇鎵�鏈夋ā鍧楃殑鏁版嵁骞跺垎绫�
+ */
+ private AjaxResult searchAllModules(Object[] args) {
+ log.info("鎵ц鍏ㄦā鍧楁悳绱紝鍙傛暟鏁伴噺: {}", args.length);
+
+ try {
+ Map<String, Object> result = new LinkedHashMap<>();
+ int totalCount = 0;
+ int successCount = 0;
+
+ // 澶勭悊鎼滅储鍙傛暟
+ String companion = extractCompanion(args);
+ Date happenStartTime = extractStartTime(args);
+ Date happenEndTime = extractEndTime(args);
+
+ System.out.println("鍏ㄦā鍧楁悳绱� ------ 鍚屼即: " + companion);
+ System.out.println("鍏ㄦā鍧楁悳绱� ------ 寮�濮嬫椂闂�: " + happenStartTime);
+ System.out.println("鍏ㄦā鍧楁悳绱� ------ 缁撴潫鏃堕棿: " + happenEndTime);
+
+ // 骞惰澶勭悊鎵�鏈夋ā鍧楁悳绱紙鎻愰珮鎬ц兘锛�
+ List<CompletableFuture<ModuleSearchResult>> futures = moduleSearchMap.entrySet().stream().map(entry ->
+ searchModuleAsync(entry.getKey(),
+ entry.getValue(), companion,
+ happenStartTime, happenEndTime))
+ .collect(Collectors.toList());
+
+
+ // 绛夊緟鎵�鏈夋悳绱㈠畬鎴�
+ CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join();
+
+ // 鏀堕泦缁撴灉
+ for (CompletableFuture<ModuleSearchResult> future : futures) {
+ ModuleSearchResult moduleResult = future.get();
+ if (moduleResult.isSuccess()) {
+ // 鍒涘缓涓�涓彲鍙樼殑HashMap骞跺～鍏ユ暟鎹�
+ Map<String, Object> resultMap = new HashMap<>();
+ resultMap.put("data", moduleResult.getData());
+ resultMap.put("count", moduleResult.getCount());
+ resultMap.put("searchTime", moduleResult.getSearchTime());
+
+ // 灏嗘瀯寤哄ソ鐨凪ap鏀惧叆鏈�缁堢粨鏋滀腑
+ result.put(moduleResult.getModuleCode(), resultMap);
+
+ successCount++;
+ totalCount += moduleResult.getCount();
+ } else {
+ Map<String, Object> errorInfo = new HashMap<>();
+ errorInfo.put("error", moduleResult.getErrorMessage());
+ errorInfo.put("success", false);
+ result.put(moduleResult.getModuleCode(), errorInfo);
+ }
+ }
+
+ // 鏋勫缓杩斿洖缁撴灉
+ Map<String, Object> finalResult = new LinkedHashMap<>();
+ finalResult.put("totalModules", moduleSearchMap.size());
+ finalResult.put("successModules", successCount);
+ finalResult.put("totalRecords", totalCount);
+ finalResult.put("searchTime", new Date());
+ finalResult.put("modules", result);
+
+ log.info("鍏ㄦā鍧楁悳绱㈠畬鎴�: 鎴愬姛{}/{}涓ā鍧楋紝鎬昏{}鏉¤褰�",
+ successCount, moduleSearchMap.size(), totalCount);
+
+ return AjaxResult.success("鍏ㄦā鍧楁悳绱㈡垚鍔�", finalResult);
+
+ } catch (Exception e) {
+ log.error("鍏ㄦā鍧楁悳绱㈡墽琛屽け璐�", e);
+ return AjaxResult.error("鍏ㄦā鍧楁悳绱㈠け璐�: " + e.getMessage());
+ }
+ }
+
+ /**
+ * 鍗曚釜妯″潡鎼滅储鍖呰鏂规硶
+ */
+ private ModuleSearchResult searchSingleModule(String moduleCode, ModuleSearchable service,
+ String companion, Date startTime, Date endTime) {
+ long start = System.currentTimeMillis();
+ try {
+ List<?> data = service.search(companion, startTime, endTime);
+ long searchTime = System.currentTimeMillis() - start;
+
+ return ModuleSearchResult.success(moduleCode, service.getModuleName(),
+ data, data.size(), searchTime);
+
+ } catch (Exception e) {
+ log.error("妯″潡[{}]鎼滅储澶辫触: {}", moduleCode, e.getMessage());
+ return ModuleSearchResult.error(moduleCode, e.getMessage());
+ }
+ }
//
// /**
// * 鑾峰彇鎵�鏈夊彲鎼滅储鐨勬ā鍧椾俊鎭�
@@ -122,16 +235,22 @@
// }
/**
- * 妫�鏌ユā鍧楁槸鍚︽敮鎸佹悳绱�
+ * 鍙傛暟鎻愬彇杈呭姪鏂规硶
*/
- public boolean supports(String moduleCode) {
- return moduleSearchMap.containsKey(moduleCode);
+ private String extractCompanion(Object[] args) {
+ if (args.length > 0 && args[0] instanceof String) {
+ return (String) args[0];
+ } else if (args.length > 0 && args[0] != null) {
+ return args[0].toString();
+ }
+ return null;
}
- /**
- * 鑾峰彇妯″潡鏈嶅姟瀹炰緥
- */
- public ModuleSearchable getModuleService(String moduleCode) {
- return moduleSearchMap.get(moduleCode);
+ private Date extractStartTime(Object[] args) {
+ return (args.length > 1 && args[1] instanceof Date) ? (Date) args[1] : null;
+ }
+
+ private Date extractEndTime(Object[] args) {
+ return (args.length > 2 && args[2] instanceof Date) ? (Date) args[2] : null;
}
}
--
Gitblit v1.9.1