From 4ac064d42140a32169745e2498387a9413b105b6 Mon Sep 17 00:00:00 2001
From: zrj <646384940@qq.com>
Date: Wed, 05 Jun 2024 17:45:48 +0800
Subject: [PATCH] 基层信息及缓存调整
---
blade-auth/src/main/java/org/springblade/common/cache/DictBizCache.java | 34 +++++++++-------------------------
1 files changed, 9 insertions(+), 25 deletions(-)
diff --git a/blade-auth/src/main/java/org/springblade/system/cache/DictBizCache.java b/blade-auth/src/main/java/org/springblade/common/cache/DictBizCache.java
similarity index 79%
rename from blade-auth/src/main/java/org/springblade/system/cache/DictBizCache.java
rename to blade-auth/src/main/java/org/springblade/common/cache/DictBizCache.java
index be47cb3..a26ce64 100644
--- a/blade-auth/src/main/java/org/springblade/system/cache/DictBizCache.java
+++ b/blade-auth/src/main/java/org/springblade/common/cache/DictBizCache.java
@@ -14,14 +14,14 @@
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
-package org.springblade.system.cache;
+package org.springblade.common.cache;
+import org.springblade.common.enums.DictBizEnum;
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.SpringUtil;
import org.springblade.core.tool.utils.StringPool;
import org.springblade.system.entity.DictBiz;
-import org.springblade.system.enums.DictBizEnum;
import org.springblade.system.service.IDictBizService;
import java.util.List;
@@ -39,13 +39,10 @@
private static final String DICT_VALUE = "dictBiz:value";
private static final String DICT_LIST = "dictBiz:list";
- private static IDictBizService dictClient;
+ private static final IDictBizService dictService;
- private static IDictBizService getDictClient() {
- if (dictClient == null) {
- dictClient = SpringUtil.getBean(IDictBizService.class);
- }
- return dictClient;
+ static {
+ dictService = SpringUtil.getBean(IDictBizService.class);
}
/**
@@ -56,10 +53,7 @@
*/
public static DictBiz getById(Long id) {
String keyPrefix = DICT_ID.concat(StringPool.DASH).concat(AuthUtil.getTenantId()).concat(StringPool.COLON);
- return CacheUtil.get(DICT_CACHE, keyPrefix, id, () -> {
- DictBiz result = getDictClient().getById(id);
- return result;
- });
+ return CacheUtil.get(DICT_CACHE, keyPrefix, id, () -> dictService.getById(id));
}
/**
@@ -73,7 +67,6 @@
return getValue(code.getName(), dictKey);
}
-
/**
* 获取字典值
*
@@ -83,10 +76,7 @@
*/
public static String getValue(String code, Integer dictKey) {
String keyPrefix = DICT_VALUE.concat(StringPool.DASH).concat(AuthUtil.getTenantId()).concat(StringPool.COLON);
- return CacheUtil.get(DICT_CACHE, keyPrefix + code + StringPool.COLON, String.valueOf(dictKey), () -> {
- String result = getDictClient().getValue(code, String.valueOf(dictKey));
- return result;
- });
+ return CacheUtil.get(DICT_CACHE, keyPrefix + code + StringPool.COLON, String.valueOf(dictKey), () -> dictService.getValue(code, String.valueOf(dictKey)));
}
/**
@@ -109,10 +99,7 @@
*/
public static String getValue(String code, String dictKey) {
String keyPrefix = DICT_VALUE.concat(StringPool.DASH).concat(AuthUtil.getTenantId()).concat(StringPool.COLON);
- return CacheUtil.get(DICT_CACHE, keyPrefix + code + StringPool.COLON, dictKey, () -> {
- String result = getDictClient().getValue(code, dictKey);
- return result;
- });
+ return CacheUtil.get(DICT_CACHE, keyPrefix + code + StringPool.COLON, dictKey, () -> dictService.getValue(code, dictKey));
}
/**
@@ -123,10 +110,7 @@
*/
public static List<DictBiz> getList(String code) {
String keyPrefix = DICT_LIST.concat(StringPool.DASH).concat(AuthUtil.getTenantId()).concat(StringPool.COLON);
- return CacheUtil.get(DICT_CACHE, keyPrefix, code, () -> {
- List<DictBiz> result = getDictClient().getList(code);
- return result;
- });
+ return CacheUtil.get(DICT_CACHE, keyPrefix, code, () -> dictService.getList(code));
}
}
--
Gitblit v1.9.3