From b2a9624aac0b6c7fde6b64c06b04730d52425ddf Mon Sep 17 00:00:00 2001 From: huk Date: Sat, 27 Sep 2025 11:41:30 +0800 Subject: [PATCH] =?UTF-8?q?refactor(dict):=E4=BC=98=E5=8C=96=E5=AD=97?= =?UTF-8?q?=E5=85=B8=E7=BC=93=E5=AD=98=E6=B8=85=E7=90=86=E9=80=BB=E8=BE=91?= =?UTF-8?q?-=20=E7=A7=BB=E9=99=A4=20SYS=5FDICT=5FTYPE=5FWITH=5FDEFAULT=5FT?= =?UTF-8?q?ENANTID=20=E7=BC=93=E5=AD=98=E5=B8=B8=E9=87=8F-=20=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=20GlobalConstants.GLOBAL=5FDICT=5FKEY=20=E6=9B=BF?= =?UTF-8?q?=E4=BB=A3=E6=97=A7=E7=BC=93=E5=AD=98=E9=94=AE-=20=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=20insertDictType=E4=B8=8E=20updateDictType=20?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E7=9A=84=E7=BC=93=E5=AD=98=E6=B3=A8=E8=A7=A3?= =?UTF-8?q?=20-=20=E5=9C=A8=E5=88=A0=E9=99=A4=E5=92=8C=E9=87=8D=E7=BD=AE?= =?UTF-8?q?=E7=BC=93=E5=AD=98=E6=97=B6=E5=90=8C=E6=AD=A5=E6=B8=85=E7=90=86?= =?UTF-8?q?=E5=85=A8=E5=B1=80=E5=AD=97=E5=85=B8=E7=BC=93=E5=AD=98-=20?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E7=BC=93=E5=AD=98=E6=9B=B4=E6=96=B0=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=EF=BC=8C=E5=90=8C=E6=97=B6=E6=9B=B4=E6=96=B0=20SYS=5F?= =?UTF-8?q?DICT=20=E5=92=8C=E5=85=A8=E5=B1=80=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/common/core/constant/CacheNames.java | 5 ----- .../system/service/impl/SysDictDataServiceImpl.java | 6 ++++-- .../system/service/impl/SysDictTypeServiceImpl.java | 9 ++++----- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java index 34845d8fc..519034cf2 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java @@ -35,11 +35,6 @@ public interface CacheNames { */ String SYS_DICT_TYPE = "sys_dict_type"; - /** - * 数据字典类型 - */ - String SYS_DICT_TYPE_WITH_DEFAULT_TENANTID= "sys_dict_type_with_default_tenantid"; - /** * 租户 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java index e44fdbc29..0a7596d09 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.dromara.common.core.constant.CacheNames; +import org.dromara.common.core.constant.GlobalConstants; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.ObjectUtils; import org.dromara.common.mybatis.core.page.PageQuery; @@ -100,6 +101,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService { SysDictData data = baseMapper.selectById(dictCode); baseMapper.deleteById(dictCode); CacheUtils.evict(CacheNames.SYS_DICT, data.getDictType()); + CacheUtils.evict(GlobalConstants.GLOBAL_DICT_KEY, data.getDictType()); } } @@ -109,7 +111,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService { * @param bo 字典数据信息 * @return 结果 */ - @CachePut(cacheNames = CacheNames.SYS_DICT, key = "#bo.dictType") + @CachePut(cacheNames = {CacheNames.SYS_DICT, GlobalConstants.GLOBAL_DICT_KEY}, key = "#bo.dictType") @Override public List insertDictData(SysDictDataBo bo) { SysDictData data = MapstructUtils.convert(bo, SysDictData.class); @@ -126,7 +128,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService { * @param bo 字典数据信息 * @return 结果 */ - @CachePut(cacheNames = CacheNames.SYS_DICT, key = "#bo.dictType") + @CachePut(cacheNames = {CacheNames.SYS_DICT, GlobalConstants.GLOBAL_DICT_KEY}, key = "#bo.dictType") @Override public List updateDictData(SysDictDataBo bo) { SysDictData data = MapstructUtils.convert(bo, SysDictData.class); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java index 0ae6f4e5f..56ee2fb0f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java @@ -160,7 +160,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService } CacheUtils.evict(CacheNames.SYS_DICT, dictType.getDictType()); CacheUtils.evict(CacheNames.SYS_DICT_TYPE, dictType.getDictType()); - CacheUtils.evict(CacheNames.SYS_DICT_TYPE_WITH_DEFAULT_TENANTID, dictType.getDictType()); + CacheUtils.evict(GlobalConstants.GLOBAL_DICT_KEY, dictType.getDictType()); } baseMapper.deleteByIds(Arrays.asList(dictIds)); } @@ -172,7 +172,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService public void resetDictCache() { CacheUtils.clear(CacheNames.SYS_DICT); CacheUtils.clear(CacheNames.SYS_DICT_TYPE); - CacheUtils.clear(CacheNames.SYS_DICT_TYPE_WITH_DEFAULT_TENANTID); + CacheUtils.clear(GlobalConstants.GLOBAL_DICT_KEY); } /** @@ -181,7 +181,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService * @param bo 字典类型信息 * @return 结果 */ - @CachePut(cacheNames = CacheNames.SYS_DICT, key = "#bo.dictType") + @CachePut(cacheNames = {CacheNames.SYS_DICT, GlobalConstants.GLOBAL_DICT_KEY}, key = "#bo.dictType") @Override public List insertDictType(SysDictTypeBo bo) { SysDictType dict = MapstructUtils.convert(bo, SysDictType.class); @@ -199,7 +199,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService * @param bo 字典类型信息 * @return 结果 */ - @CachePut(cacheNames = CacheNames.SYS_DICT, key = "#bo.dictType") + @CachePut(cacheNames = {CacheNames.SYS_DICT, GlobalConstants.GLOBAL_DICT_KEY}, key = "#bo.dictType") @Override @Transactional(rollbackFor = Exception.class) public List updateDictType(SysDictTypeBo bo) { @@ -212,7 +212,6 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService if (row > 0) { CacheUtils.evict(CacheNames.SYS_DICT, oldDict.getDictType()); CacheUtils.evict(CacheNames.SYS_DICT_TYPE, oldDict.getDictType()); - CacheUtils.evict(CacheNames.SYS_DICT_TYPE_WITH_DEFAULT_TENANTID, oldDict.getDictType()); return dictDataMapper.selectDictDataByType(dict.getDictType()); } throw new ServiceException("操作失败");