From 568547ada569baad754751b1ba9fa27e8f7c4781 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Wed, 1 Apr 2026 10:13:42 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E6=80=A7=E8=83=BD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/dromara/common/core/utils/StringUtils.java | 7 +++++++ .../dromara/common/excel/core/DefaultExcelListener.java | 6 +++--- .../org/dromara/common/mybatis/helper/DataBaseHelper.java | 3 ++- .../org/dromara/system/listener/DeptExcelConverter.java | 6 ++---- .../java/org/dromara/system/listener/DeptExcelOptions.java | 6 ++---- 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java index 066a39a18..21d19e644 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java @@ -548,4 +548,11 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { return Strings.CS.containsAny(cs, searchCharSequences); } + /** + * 将一个字符串替换为较大字符串内的另一个字符串，一次 + */ + public static String replaceOnce(final String text, final String searchString, final String replacement) { + return Strings.CS.replaceOnce(text, searchString, replacement); + } + } diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelListener.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelListener.java index 719e3ebaf..513c556a5 100644 --- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelListener.java +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelListener.java @@ -62,7 +62,7 @@ public class DefaultExcelListener extends AnalysisEventListener implements errMsg = StrUtil.format("第{}行-第{}列-表头{}: 解析异常
", rowIndex + 1, columnIndex + 1, headMap.get(columnIndex)); if (log.isDebugEnabled()) { - log.error(errMsg); + log.warn(errMsg); } } if (exception instanceof ConstraintViolationException constraintViolationException) { @@ -70,12 +70,12 @@ public class DefaultExcelListener extends AnalysisEventListener implements String constraintViolationsMsg = StreamUtils.join(constraintViolations, ConstraintViolation::getMessage, ", "); errMsg = StrUtil.format("第{}行数据校验异常: {}", context.readRowHolder().getRowIndex() + 1, constraintViolationsMsg); if (log.isDebugEnabled()) { - log.error(errMsg); + log.warn(errMsg); } } if (errMsg == null) { errMsg = StrUtil.format("第{}行数据异常: {}", context.readRowHolder().getRowIndex() + 1, exception.getMessage()); - log.error(errMsg, exception); + log.warn(errMsg, exception); } excelResult.getErrorList().add(errMsg); throw new ExcelAnalysisException(errMsg); diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataBaseHelper.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataBaseHelper.java index 0444a7b5b..03c521edb 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataBaseHelper.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataBaseHelper.java @@ -16,6 +16,7 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; /** * 数据库助手 @@ -26,7 +27,7 @@ import java.util.Map; public class DataBaseHelper { private static final DynamicRoutingDataSource DS = SpringUtils.getBean(DynamicRoutingDataSource.class); - private static final Map DB_TYPE_CACHE = new java.util.concurrent.ConcurrentHashMap<>(); + private static final Map DB_TYPE_CACHE = new ConcurrentHashMap<>(); /** * 获取当前数据源对应的数据库类型 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/DeptExcelConverter.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/DeptExcelConverter.java index a43531a75..81893a3a7 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/DeptExcelConverter.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/DeptExcelConverter.java @@ -10,11 +10,11 @@ import org.apache.fesod.sheet.metadata.GlobalConfiguration; import org.apache.fesod.sheet.metadata.data.ReadCellData; import org.apache.fesod.sheet.metadata.data.WriteCellData; import org.apache.fesod.sheet.metadata.property.ExcelContentProperty; +import org.dromara.common.core.utils.SpringUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.TreeBuildUtils; import org.dromara.system.domain.bo.SysDeptBo; import org.dromara.system.service.ISysDeptService; -import org.springframework.stereotype.Component; import java.util.HashMap; import java.util.Map; @@ -26,7 +26,6 @@ import java.util.concurrent.TimeUnit; * @author AprilWind */ @RequiredArgsConstructor -@Component public class DeptExcelConverter implements Converter { private static final String CACHE_KEY = "dept:excel"; @@ -38,9 +37,8 @@ public class DeptExcelConverter implements Converter { .expireAfterWrite(30, TimeUnit.SECONDS) .build(); - private final ISysDeptService deptService; - private DeptMaps getDeptMaps() { + ISysDeptService deptService = SpringUtils.getBean(ISysDeptService.class); return DEPT_CACHE.get(CACHE_KEY, k -> { Map> deptPathToTreeMap = buildDeptPathMap(deptService); Map idToName = new HashMap<>(); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/DeptExcelOptions.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/DeptExcelOptions.java index 47fe7177f..50391d6e9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/DeptExcelOptions.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/DeptExcelOptions.java @@ -1,9 +1,9 @@ package org.dromara.system.listener; import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.SpringUtils; import org.dromara.common.excel.core.ExcelOptionsProvider; import org.dromara.system.service.ISysDeptService; -import org.springframework.stereotype.Component; import java.util.Set; @@ -13,11 +13,8 @@ import java.util.Set; * @author AprilWind */ @RequiredArgsConstructor -@Component public class DeptExcelOptions implements ExcelOptionsProvider { - private final ISysDeptService deptService; - /** * 获取下拉选项数据 * @@ -25,6 +22,7 @@ public class DeptExcelOptions implements ExcelOptionsProvider { */ @Override public Set getOptions() { + ISysDeptService deptService = SpringUtils.getBean(ISysDeptService.class); return DeptExcelConverter.buildDeptPathMap(deptService).keySet(); }