From 1bfcbfa456264fc481dca749958ce535d59aa2a1 Mon Sep 17 00:00:00 2001
From: 一夏coco <627428179@qq.com>
Date: 星期五, 21 四月 2023 09:38:25 +0800
Subject: [PATCH] !341 优化忽略租户写法，在抛出异常时可以正确关闭忽略; 修复 oracle脚本字段缺失 * update 优化忽略租户写法，在抛出异常时可以正确关闭忽略 * fix 修复 oracle脚本字段缺失
---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java | 33 ++++++++++++++++++---------------
1 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java
index 2c4d1ea..4d421ee 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java
@@ -6,6 +6,8 @@
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.constant.CacheNames;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.MapstructUtils;
@@ -24,8 +26,6 @@
import org.dromara.system.domain.vo.SysOssConfigVo;
import org.dromara.system.mapper.SysOssConfigMapper;
import org.dromara.system.service.ISysOssConfigService;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -52,23 +52,26 @@
*/
@Override
public void init() {
- TenantHelper.enableIgnore();
- List<SysOssConfig> list = baseMapper.selectList(
- new LambdaQueryWrapper<SysOssConfig>().orderByAsc(TenantEntity::getTenantId));
- TenantHelper.disableIgnore();
+ List<SysOssConfig> list = TenantHelper.ignore(() ->
+ baseMapper.selectList(
+ new LambdaQueryWrapper<SysOssConfig>().orderByAsc(TenantEntity::getTenantId))
+ );
Map<String, List<SysOssConfig>> map = StreamUtils.groupByKey(list, SysOssConfig::getTenantId);
- for (String tenantId : map.keySet()) {
- TenantHelper.setDynamic(tenantId);
- // 鍔犺浇OSS鍒濆鍖栭厤缃�
- for (SysOssConfig config : map.get(tenantId)) {
- String configKey = config.getConfigKey();
- if ("0".equals(config.getStatus())) {
- RedisUtils.setCacheObject(OssConstant.DEFAULT_CONFIG_KEY, configKey);
+ try {
+ for (String tenantId : map.keySet()) {
+ TenantHelper.setDynamic(tenantId);
+ // 鍔犺浇OSS鍒濆鍖栭厤缃�
+ for (SysOssConfig config : map.get(tenantId)) {
+ String configKey = config.getConfigKey();
+ if ("0".equals(config.getStatus())) {
+ RedisUtils.setCacheObject(OssConstant.DEFAULT_CONFIG_KEY, configKey);
+ }
+ CacheUtils.put(CacheNames.SYS_OSS_CONFIG, config.getConfigKey(), JsonUtils.toJsonString(config));
}
- CacheUtils.put(CacheNames.SYS_OSS_CONFIG, config.getConfigKey(), JsonUtils.toJsonString(config));
}
+ } finally {
+ TenantHelper.clearDynamic();
}
- TenantHelper.clearDynamic();
}
@Override
--
Gitblit v1.9.3