From 1acc17d15bd3b6cc4eaa641db8b21d39145d0eae Mon Sep 17 00:00:00 2001
From: liuqingkun <LIUqk6666_>
Date: Tue, 7 Mar 2023 10:28:13 +0800
Subject: [PATCH] =?UTF-8?q?[bug]=E5=88=A0=E9=99=A4=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98=E6=97=B6=E7=9A=84=E4=BD=BF=E7=94=A8=E7=9A=84?=
 =?UTF-8?q?key=E4=B8=AD=E7=A7=9F=E6=88=B7ID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/springblade/common/cache/DictBizCache.java   | 12 ++++++++----
 .../business/controller/CommonApiController.java     |  8 ++++----
 .../business/service/impl/ApmRecordServiceImpl.java  |  1 -
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/springblade/common/cache/DictBizCache.java b/src/main/java/org/springblade/common/cache/DictBizCache.java
index 89f2d1d..1b5c1c3 100644
--- a/src/main/java/org/springblade/common/cache/DictBizCache.java
+++ b/src/main/java/org/springblade/common/cache/DictBizCache.java
@@ -54,7 +54,8 @@ public class DictBizCache {
 	 * @return DictBiz
 	 */
 	public static DictBiz getById(Long id) {
-		String keyPrefix = DICT_ID.concat(StringPool.DASH).concat(AuthUtil.getTenantId()).concat(StringPool.COLON);
+		//		String keyPrefix = DICT_VALUE.concat(StringPool.DASH).concat(AuthUtil.getTenantId()).concat(StringPool.COLON);
+		String keyPrefix = DICT_VALUE;
 		return CacheUtil.get(DICT_CACHE, keyPrefix, id, () -> dictService.getById(id), BusinessConstant.TENANT_MODE);
 	}
 
@@ -77,7 +78,8 @@ public class DictBizCache {
 	 * @return String
 	 */
 	public static String getValue(String code, Integer dictKey) {
-		String keyPrefix = DICT_VALUE.concat(StringPool.DASH).concat(AuthUtil.getTenantId()).concat(StringPool.COLON);
+		//		String keyPrefix = DICT_VALUE.concat(StringPool.DASH).concat(AuthUtil.getTenantId()).concat(StringPool.COLON);
+		String keyPrefix = DICT_VALUE;
 		return CacheUtil.get(DICT_CACHE, keyPrefix + code + StringPool.COLON, String.valueOf(dictKey), () -> dictService.getValue(code, String.valueOf(dictKey)), BusinessConstant.TENANT_MODE);
 	}
 
@@ -100,7 +102,8 @@ public class DictBizCache {
 	 * @return String
 	 */
 	public static String getValue(String code, String dictKey) {
-		String keyPrefix = DICT_VALUE.concat(StringPool.DASH).concat(AuthUtil.getTenantId()).concat(StringPool.COLON);
+//		String keyPrefix = DICT_VALUE.concat(StringPool.DASH).concat(AuthUtil.getTenantId()).concat(StringPool.COLON);
+		String keyPrefix = DICT_VALUE;
 		return CacheUtil.get(DICT_CACHE, keyPrefix + code + StringPool.COLON, dictKey, () -> dictService.getValue(code, dictKey), BusinessConstant.TENANT_MODE);
 	}
 
@@ -111,7 +114,8 @@ public class DictBizCache {
 	 * @return List<DictBiz>
 	 */
 	public static List<DictBiz> getList(String code) {
-		String keyPrefix = DICT_LIST.concat(StringPool.DASH).concat(AuthUtil.getTenantId()).concat(StringPool.COLON);
+		//		String keyPrefix = DICT_VALUE.concat(StringPool.DASH).concat(AuthUtil.getTenantId()).concat(StringPool.COLON);
+		String keyPrefix = DICT_VALUE;
 		return CacheUtil.get(DICT_CACHE, keyPrefix, code, () -> dictService.getList(code), BusinessConstant.TENANT_MODE);
 	}
 
diff --git a/src/main/java/org/springblade/modules/business/controller/CommonApiController.java b/src/main/java/org/springblade/modules/business/controller/CommonApiController.java
index ba152c4..08bee7c 100644
--- a/src/main/java/org/springblade/modules/business/controller/CommonApiController.java
+++ b/src/main/java/org/springblade/modules/business/controller/CommonApiController.java
@@ -42,8 +42,8 @@ public class CommonApiController extends BladeController {
 		return R.data(CommonDateUtil.getNowString());
 	}
 
-	@GetMapping("/test")
-	public R test() {
-		return R.data(DictBizCache.getDictValueWithOffset(BusinessConstant.DICT_KEY_BLACKLIST_OUTDATE));
-	}
+//	@GetMapping("/test")
+//	public R test() {
+//		return R.data(DictBizCache.getDictValueWithOffset(BusinessConstant.DICT_KEY_BLACKLIST_OUTDATE));
+//	}
 }
diff --git a/src/main/java/org/springblade/modules/business/service/impl/ApmRecordServiceImpl.java b/src/main/java/org/springblade/modules/business/service/impl/ApmRecordServiceImpl.java
index f359883..226eda5 100644
--- a/src/main/java/org/springblade/modules/business/service/impl/ApmRecordServiceImpl.java
+++ b/src/main/java/org/springblade/modules/business/service/impl/ApmRecordServiceImpl.java
@@ -121,7 +121,6 @@ public class ApmRecordServiceImpl extends BaseServiceImpl<ApmRecordMapper, ApmRe
 		String cupCardNo = apmRecordList.get(0).getCupCardNo();
 		Date apmDay = apmRecordList.get(0).getApmDay();
 
-		System.out.println(DictBizCache.getDictValueWithOffset("save check : "+BusinessConstant.DICT_KEY_BLACKLIST_OUTDATE));
 		// 判断用户是否正在被拉黑
 		Blacklist blacklist = blacklistService.getLatelyRecord(cupCardNo);
 		if (Func.isNotEmpty(blacklist) && CommonDateUtil.daysBetweenWithoutStartDay(blacklist.getCreateTime(), DateUtil.now()) < DictBizCache.getDictValueWithOffset(BusinessConstant.DICT_KEY_BLACKLIST_OUTDATE)) {