From aa258ffd03aac01ae0b11a33d0a32bd33d3e0758 Mon Sep 17 00:00:00 2001 From: liuqingkun Date: Mon, 6 Mar 2023 15:38:42 +0800 Subject: [PATCH] =?UTF-8?q?[bug]=E4=BF=AE=E5=A4=8D=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=AD=97=E5=85=B8=E4=BF=AE=E6=94=B9=E6=97=B6=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E4=B8=8D=E6=B8=85=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/springblade/common/cache/DictBizCache.java | 6 +----- .../modules/business/controller/ApmRecordController.java | 6 +++++- .../modules/system/controller/DictBizController.java | 1 - 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/springblade/common/cache/DictBizCache.java b/src/main/java/org/springblade/common/cache/DictBizCache.java index 1fa2f83..21de43f 100644 --- a/src/main/java/org/springblade/common/cache/DictBizCache.java +++ b/src/main/java/org/springblade/common/cache/DictBizCache.java @@ -124,7 +124,7 @@ public class DictBizCache { * @return */ public static Integer getDictValueWithOffset(String dictCode) { - Integer value = CacheUtil.get(DICT_VALUE, dictCode, COMMON_BUSINESS_DICT_KEY, () -> null); + int value = Integer.parseInt(getValue(dictCode, COMMON_BUSINESS_DICT_KEY)); if (Func.isEmpty(value)) { String valueStr = dictService.getValue(dictCode, DictBizCache.COMMON_BUSINESS_DICT_KEY); @@ -152,8 +152,4 @@ public class DictBizCache { return value; } - - public static void cleanCacheWithOffset(String dictCode) { - CacheUtil.evict(DICT_VALUE, dictCode, COMMON_BUSINESS_DICT_KEY); - } } diff --git a/src/main/java/org/springblade/modules/business/controller/ApmRecordController.java b/src/main/java/org/springblade/modules/business/controller/ApmRecordController.java index a0a68a1..b9f146e 100644 --- a/src/main/java/org/springblade/modules/business/controller/ApmRecordController.java +++ b/src/main/java/org/springblade/modules/business/controller/ApmRecordController.java @@ -7,6 +7,7 @@ import io.swagger.annotations.*; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.common.cache.DeptCache; +import org.springblade.common.cache.DictBizCache; import org.springblade.common.constant.BusinessConstant; import org.springblade.common.constant.CommonConstant; import org.springblade.common.enums.ApmRecordStatusEnum; @@ -207,7 +208,10 @@ public class ApmRecordController extends BladeController { String checkMsg = recordService.checkApmRecordSave(apmRecordList); if (Func.isBlank(checkMsg)) { recordService.saveBatch(apmRecordList); - return R.status(true); + int blacklistOutdate = DictBizCache.getDictValueWithOffset(BusinessConstant.DICT_KEY_BLACKLIST_OUTDATE); + Map result = new HashMap<>(); + result.put("blacklistOutDate", blacklistOutdate); + return R.data(result); } return R.fail(checkMsg); } diff --git a/src/main/java/org/springblade/modules/system/controller/DictBizController.java b/src/main/java/org/springblade/modules/system/controller/DictBizController.java index bac6608..e54ab79 100644 --- a/src/main/java/org/springblade/modules/system/controller/DictBizController.java +++ b/src/main/java/org/springblade/modules/system/controller/DictBizController.java @@ -141,7 +141,6 @@ public class DictBizController extends BladeController { @ApiOperation(value = "新增或修改", notes = "传入dict") public R submit(@Valid @RequestBody DictBiz dict) { CacheUtil.clear(DICT_CACHE); - DictBizCache.cleanCacheWithOffset(dict.getCode()); return R.status(dictService.submit(dict)); }