From 3eb37463a952fb69d586769ca660886b956cb016 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 30 十二月 2025 12:24:40 +0800
Subject: [PATCH] 人物搜索 新加所有家族模块
---
zhang-content/src/main/java/com/ruoyi/service/impl/InterfaceBasedSearchRouter.java | 511 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 326 insertions(+), 185 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 91509a9..e47aa94 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
@@ -1,20 +1,18 @@
package com.ruoyi.service.impl;
import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.domain.ModuleSearchResult;
+import com.ruoyi.domain.PeopleSea;
import com.ruoyi.service.ModuleSearchable;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.logging.Log;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
-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;
@@ -24,6 +22,11 @@
private final Map<String, ModuleSearchable> moduleSearchMap;
+ // 妯″潡鍒嗗壊绗�
+ private static final String MODULE_SEPARATOR = ",";
+
+ // 鍏ㄦā鍧楁爣璇�
+ private static final String ALL_MODULES_FLAG = "all";
/**
* 鑷姩鏀堕泦鎵�鏈夊疄鐜癕oduleSearchable鎺ュ彛鐨凚ean
@@ -43,214 +46,352 @@
log.info("宸叉敞鍐屾悳绱㈡ā鍧�: {}", moduleSearchMap.keySet());
}
- @Async // 澹版槑姝ゆ柟娉曞紓姝ユ墽琛岋紝灏嗕娇鐢ㄦ垜浠笂闈㈤厤缃殑Executor
- public CompletableFuture<ModuleSearchResult> searchModuleAsync(String moduleCode, ModuleSearchable service, String companion, Date startTime, Date endTime) {
- // 灏嗗師鏉ュ湪lambda琛ㄨ揪寮忎腑鐨勬悳绱㈤�昏緫绉诲埌杩欓噷
+ @Async
+ public CompletableFuture<ModuleSearchResult> searchModuleAsync(String moduleCode, ModuleSearchable service,
+ String companion, Date startTime, Date endTime,
+ String hasAttachment) {
long start = System.currentTimeMillis();
try {
- List<?> data = service.search(companion, startTime, endTime);
+ // 璋冪敤鎼滅储鏂规硶锛岃繑鍥� List<?>
+ List<?> data = service.search(companion, startTime, endTime, hasAttachment);
long searchTime = System.currentTimeMillis() - start;
- ModuleSearchResult result = ModuleSearchResult.success(moduleCode, service.getModuleName(), data, data.size(), searchTime);
+
+ int count = 0;
+ if (data != null) {
+ count = data.size();
+ }
+
+ // 鑾峰彇妯″潡鍚嶇О
+ String moduleName = getModuleName(moduleCode);
+
+ ModuleSearchResult result = ModuleSearchResult.success(
+ moduleCode, moduleName, data, count, searchTime
+ );
return CompletableFuture.completedFuture(result);
} catch (Exception e) {
- log.error("妯″潡[{}]鎼滅储澶辫触: {}", moduleCode, e.getMessage());
- ModuleSearchResult result = ModuleSearchResult.error(moduleCode, e.getMessage());
+ log.error("妯″潡[{}]鎼滅储澶辫触: {}", moduleCode, e.getMessage(), e);
+ String errorMessage = e.getMessage();
+ if (e.getCause() != null) {
+ errorMessage += " (" + e.getCause().getMessage() + ")";
+ }
+ ModuleSearchResult result = ModuleSearchResult.error(moduleCode, errorMessage);
return CompletableFuture.completedFuture(result);
}
}
- /**
- * 閫氱敤鐨勮矾鐢辨悳绱㈣姹傦紙鏀寔涓嶅悓鍙傛暟绫诲瀷锛�
- */
+
/**
* 閫氱敤鐨勮矾鐢辨悳绱㈣姹�
*/
- public AjaxResult routeSearch(String moduleCode, Object... args) {
- log.info("璺敱鎼滅储: moduleCode={}, args={}", moduleCode, Arrays.toString(args));
+ public AjaxResult routeSearch(PeopleSea peopleS, Integer pageNum, Integer pageSize) {
+ String moduleCode = null;
- // 鍏ㄦā鍧楁悳绱細褰搈oduleCode涓虹┖鎴栫壒瀹氭爣璇嗘椂
- if (moduleCode == null || moduleCode.isEmpty() || "all".equalsIgnoreCase(moduleCode)) {
- return searchAllModules(args);
- }
+ // 瀹夊叏澶勭悊 String[] 绫诲瀷鐨� modules
+ if (peopleS != null && peopleS.getModules() != null && peopleS.getModules().length != 0) {
+ String[] modulesArray = peopleS.getModules();
- // 鍗曚釜妯″潡鎼滅储锛堝師鏈夐�昏緫锛�
- ModuleSearchable searchService = moduleSearchMap.get(moduleCode);
- if (searchService == null) {
- String availableModules = String.join(", ", moduleSearchMap.keySet());
- return AjaxResult.error("涓嶆敮鎸佺殑鎼滅储妯″潡: " + moduleCode + "銆傚彲鐢ㄦā鍧�: [" + availableModules + "]");
- }
-
- try {
- if (args.length == 3) {
- return handleFourArgs(searchService, args);
- } else {
- return AjaxResult.error("涓嶆敮鎸佺殑鍙傛暟鏁伴噺锛岄渶瑕�3涓弬鏁帮紝瀹為檯鏀跺埌: " + args.length);
- }
- } catch (Exception e) {
- log.error("鎼滅储鎵ц澶辫触: moduleCode={}", moduleCode, e);
- return AjaxResult.error("鎼滅储鎵ц澶辫触: " + e.getMessage());
- }
- }
-
- private AjaxResult handleFourArgs(ModuleSearchable searchService, Object[] args) {
- String companion = null;
- Date happenStartTime = null;
- Date happenEndTime = null;
-
- // 澶勭悊companion鍙傛暟
- if (args[0] instanceof String) {
- companion = (String) args[0];
- } else if (args[0] != null) {
- companion = args[0].toString();
- }
-
- // 澶勭悊鏃堕棿鍙傛暟
- if (args[1] instanceof Date) {
- happenStartTime = (Date) args[1];
- }
-
- if (args[2] instanceof Date) {
- happenEndTime = (Date) args[2];
- }
-
- // 鍒ゆ柇鎼滅储绫诲瀷
- boolean hasTimeRange = happenStartTime != null && happenEndTime != null;
-
- List<?> result;
- if (hasTimeRange) {
- // 鏈夋椂闂磋寖鍥达細鎵ц鏃堕棿鑼冨洿鎼滅储
- log.info("鎵ц鏃堕棿鑼冨洿鎼滅储: companion={}, startTime={}, endTime={}",
- companion, happenStartTime, happenEndTime);
- result = searchService.search(companion, happenStartTime, happenEndTime);
- } else {
- // 鏃犳椂闂磋寖鍥达細鍙寜companion鎼滅储
- log.info("鎵цcompanion鎼滅储: companion={}, 鏃堕棿鑼冨洿涓虹┖", companion);
- result = searchService.search(companion, null, null);
- }
-
- 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))
+ // 杩囨护鎺夌┖瀛楃涓插拰绌虹櫧瀛楃
+ List<String> validModules = Arrays.stream(modulesArray)
+ .filter(StringUtils::isNotBlank)
+ .map(String::trim)
.collect(Collectors.toList());
+ if (!validModules.isEmpty()) {
+ // 鐢ㄩ�楀彿杩炴帴鏈夋晥鐨勬ā鍧椾唬鐮�
+ moduleCode = String.join(",", validModules);
+ }
+ }
- // 绛夊緟鎵�鏈夋悳绱㈠畬鎴�
- CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join();
+ log.info("璺敱鎼滅储: moduleCode={}, peopleS={}, pageNum={}, pageSize={}",
+ moduleCode, peopleS, pageNum, pageSize);
- // 鏀堕泦缁撴灉
- 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());
+ // 瑙ｆ瀽妯″潡浠ｇ爜
+ List<String> targetModules = parseModuleCodes(moduleCode);
- // 灏嗘瀯寤哄ソ鐨凪ap鏀惧叆鏈�缁堢粨鏋滀腑
- result.put(moduleResult.getModuleCode(), resultMap);
+ if (targetModules.isEmpty()) {
+ // 涓嶉�夋ā鍧楃殑鎯呭喌
+ return handleNoModuleSelected();
+ }
- 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);
+ // 缁熶竴澶勭悊锛氬崟涓ā鍧椼�佸涓ā鍧楅兘浣跨敤鍚屾牱鐨勫鐞嗛�昏緫
+ return executeModulesSearch(targetModules, peopleS, pageNum, pageSize);
+ }
+
+ /**
+ * 缁熶竴鎵ц妯″潡鎼滅储
+ */
+ private AjaxResult executeModulesSearch(List<String> moduleCodes, PeopleSea peopleS,
+ Integer pageNum, Integer pageSize) {
+ log.info("鎵ц妯″潡鎼滅储: moduleCodes={}, 妯″潡鏁伴噺={}", moduleCodes, moduleCodes.size());
+
+ // 楠岃瘉鎵�鏈夋ā鍧楁槸鍚﹀瓨鍦�
+ List<String> invalidModules = moduleCodes.stream()
+ .filter(code -> !moduleSearchMap.containsKey(code))
+ .collect(Collectors.toList());
+
+ if (!invalidModules.isEmpty()) {
+ String availableModules = String.join(", ", moduleSearchMap.keySet());
+ String errorMsg = String.format("浠ヤ笅妯″潡涓嶆敮鎸�: %s銆傚彲鐢ㄦā鍧�: [%s]",
+ invalidModules, availableModules);
+ return AjaxResult.error(errorMsg);
+ }
+
+ // 鎻愬彇鍙傛暟
+ String companion = extractCompanion(peopleS);
+ Date startTime = extractStartTime(peopleS);
+ Date endTime = extractEndTime(peopleS);
+ String hasAttachment = extractHasAttachment(peopleS);
+
+ // 璁剧疆鍒嗛〉榛樿鍊�
+ if (pageNum == null || pageNum <= 0) {
+ pageNum = 1;
+ }
+ if (pageSize == null || pageSize <= 0) {
+ pageSize = 10;
+ }
+
+ // 骞跺彂鎼滅储
+
+ List<CompletableFuture<ModuleSearchResult>> futures = moduleCodes.stream()
+ .map(code -> searchModuleAsync(code, moduleSearchMap.get(code),
+ companion, startTime, endTime, hasAttachment))
+ .collect(Collectors.toList());
+
+ // 绛夊緟瀹屾垚
+ CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join();
+
+ // 鍚堝苟鏁版嵁
+ List<Object> allData = new ArrayList<>();
+ for (CompletableFuture<ModuleSearchResult> future : futures) {
+ try {
+ ModuleSearchResult result = future.get();
+ if (result.isSuccess() && result.getData() != null) {
+ allData.addAll(result.getData());
+ }
+ } catch (Exception e) {
+ // 璁板綍閿欒浣嗙户缁鐞嗗叾浠栨ā鍧�
+ log.error("鑾峰彇妯″潡鎼滅储缁撴灉澶辫触", e);
+ }
+ }
+
+ // 瀵规暟鎹繘琛屾帓搴忥紙濡傛灉闇�瑕侊級
+ sortData(allData);
+
+ // 鍒嗛〉
+ int startIndex = (pageNum - 1) * pageSize;
+ List<Object> paginatedData = allData.stream()
+ .skip(startIndex)
+ .limit(pageSize)
+ .collect(Collectors.toList());
+
+ // 杩斿洖缁撴灉
+ Map<String, Object> data = new HashMap<>();
+ data.put("list", paginatedData);
+ data.put("total", allData.size());
+ data.put("pageNum", pageNum);
+ data.put("pageSize", pageSize);
+
+ return AjaxResult.success(data);
+ }
+
+ /**
+ * 瀵规暟鎹繘琛屾帓搴�
+ * 榛樿鎸夊垱寤烘椂闂撮檷搴忔帓鍒�
+ */
+ private void sortData(List<Object> allData) {
+ if (CollectionUtils.isEmpty(allData)) {
+ return;
+ }
+
+ // 濡傛灉鏁版嵁鏄� Map 绫诲瀷锛屽皾璇曟寜 createTime 鎺掑簭
+ if (allData.get(0) instanceof Map) {
+ allData.sort((a, b) -> {
+ Map<String, Object> mapA = (Map<String, Object>) a;
+ Map<String, Object> mapB = (Map<String, Object>) b;
+
+ Object timeA = mapA.get("createTime");
+ Object timeB = mapB.get("createTime");
+
+ if (timeA instanceof Date && timeB instanceof Date) {
+ // 闄嶅簭鎺掑垪锛氭渶鏂扮殑鍦ㄥ墠
+ return ((Date) timeB).compareTo((Date) timeA);
+ } else if (timeA instanceof String && timeB instanceof String) {
+ // 濡傛灉鏃堕棿鏄瓧绗︿覆锛屽皾璇曡В鏋�
+ try {
+ Date dateA = parseDate((String) timeA);
+ Date dateB = parseDate((String) timeB);
+ if (dateA != null && dateB != null) {
+ return dateB.compareTo(dateA);
+ }
+ } catch (Exception e) {
+ // 瑙ｆ瀽澶辫触锛屼笉鎺掑簭
+ }
+ }
+ return 0;
+ });
+ }
+ }
+
+ /**
+ * 瑙ｆ瀽鏃ユ湡瀛楃涓�
+ */
+ private Date parseDate(String dateStr) {
+ if (dateStr == null || dateStr.isEmpty()) {
+ return null;
+ }
+
+ try {
+ // 灏濊瘯甯歌鐨勬棩鏈熸牸寮�
+ String[] formats = {
+ "yyyy-MM-dd'T'HH:mm:ss.SSSXXX",
+ "yyyy-MM-dd HH:mm:ss",
+ "yyyy-MM-dd"
+ };
+
+ for (String format : formats) {
+ try {
+ return new java.text.SimpleDateFormat(format).parse(dateStr);
+ } catch (Exception e) {
+ // 缁х画灏濊瘯涓嬩竴涓牸寮�
}
}
-
- // 鏋勫缓杩斿洖缁撴灉
- 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());
+ log.warn("鏃犳硶瑙ｆ瀽鏃ユ湡瀛楃涓�: {}", dateStr, e);
}
- }
- /**
- * 鍗曚釜妯″潡鎼滅储鍖呰鏂规硶
- */
- 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());
- }
- }
-//
-// /**
-// * 鑾峰彇鎵�鏈夊彲鎼滅储鐨勬ā鍧椾俊鎭�
-// */
-// public List<SysMenu> getAvailableModules() {
-// return moduleSearchMap.values().stream()
-// .map(service -> SysMenu.builder()
-// .moduleCode(service.getModuleCode())
-// .moduleName(service.getModuleName())
-// .build())
-// .collect(Collectors.toList());
-// }
-
- /**
- * 鍙傛暟鎻愬彇杈呭姪鏂规硶
- */
- 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;
}
- private Date extractStartTime(Object[] args) {
- return (args.length > 1 && args[1] instanceof Date) ? (Date) args[1] : null;
+ /**
+ * 鑾峰彇妯″潡鍚嶇О
+ */
+ private String getModuleName(String moduleCode) {
+ ModuleSearchable service = moduleSearchMap.get(moduleCode);
+ return service != null ? service.getModuleName() : "鏈煡妯″潡";
}
- private Date extractEndTime(Object[] args) {
- return (args.length > 2 && args[2] instanceof Date) ? (Date) args[2] : null;
+ /**
+ * 瀹夊叏鐨勫弬鏁版彁鍙栨柟娉�
+ */
+ private String extractCompanion(PeopleSea peopleS) {
+ if (peopleS == null) {
+ return "";
+ }
+ return peopleS.getPeoples() == null ? "" : peopleS.getPeoples().trim();
+ }
+
+ private Date extractStartTime(PeopleSea peopleS) {
+ if (peopleS == null) {
+ return null;
+ }
+ return peopleS.getStartTime();
+ }
+
+ private Date extractEndTime(PeopleSea peopleS) {
+ if (peopleS == null) {
+ return null;
+ }
+ return peopleS.getEndTime();
+ }
+
+ private String extractHasAttachment(PeopleSea peopleS) {
+ if (peopleS == null) {
+ return "";
+ }
+ return peopleS.getHasAttachment() == null ? "" : peopleS.getHasAttachment().trim();
+ }
+
+ /**
+ * 瑙ｆ瀽妯″潡浠ｇ爜
+ */
+ private List<String> parseModuleCodes(String moduleCode) {
+ if (StringUtils.isBlank(moduleCode)) {
+ // 绌�/绌虹櫧/null -> 鍏ㄦā鍧楁悳绱�
+ return new ArrayList<>(moduleSearchMap.keySet());
+ }
+
+ String trimmedCode = moduleCode.trim();
+
+ // 澶勭悊鍏ㄦā鍧楁爣璇�
+ if (ALL_MODULES_FLAG.equalsIgnoreCase(trimmedCode)) {
+ return new ArrayList<>(moduleSearchMap.keySet());
+ }
+
+ // 澶勭悊涓嶉�夋ā鍧楃殑鎯呭喌
+ if ("none".equalsIgnoreCase(trimmedCode) || "null".equalsIgnoreCase(trimmedCode)) {
+ return Collections.emptyList();
+ }
+
+ // 妫�鏌ユ槸鍚﹀寘鍚�楀彿锛堝涓ā鍧楋級
+ if (trimmedCode.contains(MODULE_SEPARATOR)) {
+ String[] moduleArray = trimmedCode.split(MODULE_SEPARATOR);
+ return Arrays.stream(moduleArray)
+ .map(String::trim)
+ .filter(code -> !code.isEmpty())
+ .collect(Collectors.toList());
+ }
+
+ // 鍗曚釜妯″潡
+ return Collections.singletonList(trimmedCode);
+ }
+
+ /**
+ * 涓嶉�夋ā鍧楃殑澶勭悊閫昏緫
+ */
+ private AjaxResult handleNoModuleSelected() {
+ Map<String, Object> result = new LinkedHashMap<>();
+ result.put("list", Collections.emptyList());
+ result.put("total", 0);
+ result.put("pageNum", 1);
+ result.put("pageSize", 10);
+
+ return AjaxResult.success("鏈�夋嫨鎼滅储妯″潡锛岃閫夋嫨瑕佹悳绱㈢殑妯″潡", result);
+ }
+
+ /**
+ * 鑾峰彇鍙敤妯″潡鍒楄〃
+ */
+ public AjaxResult getAvailableModules() {
+ Map<String, Object> result = new HashMap<>();
+
+ List<Map<String, Object>> modules = moduleSearchMap.values().stream()
+ .map(service -> {
+ Map<String, Object> moduleInfo = new HashMap<>();
+ moduleInfo.put("moduleCode", service.getModuleCode());
+ moduleInfo.put("moduleName", service.getModuleName());
+ return moduleInfo;
+ })
+ .collect(Collectors.toList());
+
+ result.put("modules", modules);
+ result.put("total", modules.size());
+
+ return AjaxResult.success("鑾峰彇鍙敤妯″潡鎴愬姛", result);
+ }
+
+ /**
+ * 楠岃瘉妯″潡浠ｇ爜鏄惁瀛樺湪
+ */
+ public boolean validateModule(String moduleCode) {
+ if (StringUtils.isBlank(moduleCode)) {
+ return false;
+ }
+
+ // 澶勭悊澶氫釜妯″潡鐨勬儏鍐�
+ if (moduleCode.contains(MODULE_SEPARATOR)) {
+ String[] moduleArray = moduleCode.split(MODULE_SEPARATOR);
+ for (String code : moduleArray) {
+ String trimmedCode = code.trim();
+ if (!moduleSearchMap.containsKey(trimmedCode) &&
+ !ALL_MODULES_FLAG.equalsIgnoreCase(trimmedCode)) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ // 鍗曚釜妯″潡鐨勬儏鍐�
+ String trimmedCode = moduleCode.trim();
+ return moduleSearchMap.containsKey(trimmedCode) ||
+ ALL_MODULES_FLAG.equalsIgnoreCase(trimmedCode);
}
}
--
Gitblit v1.9.1