diff --git a/src/main/java/im/zhaojun/common/service/AbstractFileService.java b/src/main/java/im/zhaojun/common/service/AbstractFileService.java index e453483..847fe07 100644 --- a/src/main/java/im/zhaojun/common/service/AbstractFileService.java +++ b/src/main/java/im/zhaojun/common/service/AbstractFileService.java @@ -1,5 +1,6 @@ package im.zhaojun.common.service; +import cn.hutool.core.util.StrUtil; import com.alicp.jetcache.Cache; import com.alicp.jetcache.RefreshPolicy; import com.alicp.jetcache.anno.CacheRefresh; @@ -123,9 +124,20 @@ public abstract class AbstractFileService extends FileCacheService implements Fi public List search(String name) throws Exception { List result = new ArrayList<>(); + boolean searchIgnoreCase = systemConfigService.getSearchIgnoreCase(); + List fileItemList = selectAllFileList(); for (FileItemDTO fileItemDTO : fileItemList) { - if (fileItemDTO.getName().contains(name)) { + + boolean testResult; + + if (searchIgnoreCase) { + testResult = StrUtil.containsIgnoreCase(fileItemDTO.getName(), name); + } else { + testResult = fileItemDTO.getName().contains(name); + } + + if (testResult) { result.add(fileItemDTO); } } @@ -137,7 +149,7 @@ public abstract class AbstractFileService extends FileCacheService implements Fi * 查询所有文件, 仅去缓存中查询. * @return 所有文件 */ - public List selectAllFileList() throws Exception { + public List selectAllFileList() { List result = new ArrayList<>(); boolean enableCache = systemConfigService.getEnableCache(); if (!enableCache) { diff --git a/src/main/java/im/zhaojun/common/service/SystemConfigService.java b/src/main/java/im/zhaojun/common/service/SystemConfigService.java index ad12b3f..c7e1025 100644 --- a/src/main/java/im/zhaojun/common/service/SystemConfigService.java +++ b/src/main/java/im/zhaojun/common/service/SystemConfigService.java @@ -144,10 +144,15 @@ public class SystemConfigService { return systemConfigDTO.getStorageStrategy(); } - public boolean getEnableCache() { SystemConfigDTO systemConfigDTO = getSystemConfig(); return ObjectUtil.defaultIfNull(systemConfigDTO.getEnableCache(), false); } + public boolean getSearchIgnoreCase() { + SystemConfigDTO systemConfigDTO = getSystemConfig(); + return ObjectUtil.defaultIfNull(systemConfigDTO.getSearchIgnoreCase(), false); + } + + } \ No newline at end of file