From 5073a245f53fd5ca936e779be8c6b9b19d42f67d Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 11 七月 2024 09:47:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/main/java/com/ycl/jxkg/job/StudyRecordJob.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/job/StudyRecordJob.java b/src/main/java/com/ycl/jxkg/job/StudyRecordJob.java
index 36eda18..ee588fc 100644
--- a/src/main/java/com/ycl/jxkg/job/StudyRecordJob.java
+++ b/src/main/java/com/ycl/jxkg/job/StudyRecordJob.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.benmanes.caffeine.cache.Cache;
+import com.ycl.jxkg.constants.CaffeineConstant;
import com.ycl.jxkg.domain.entity.StudyRecord;
import com.ycl.jxkg.mapper.StudyRecordMapper;
import com.ycl.jxkg.service.StudyRecordService;
@@ -36,15 +37,13 @@
private void updateStudyRecord() {
log.info("寮�濮嬪瓨瀛︿範鏃堕暱");
List<StudyRecord> cacheList = new ArrayList<>();
- // 鍙栧嚭鎵�鏈夌紦瀛橀」
+ // 鍙栧嚭鎵�鏈夊涔犺褰曠紦瀛橀」
ConcurrentMap<String, Object> map = caffeineCache.asMap();
- for (Map.Entry<String, Object> entry : map.entrySet()) {
- String key = entry.getKey();
- if (key.startsWith("STUDENT_")) {
- StudyRecord studyRecord = (StudyRecord) entry.getValue();
- cacheList.add(studyRecord);
- }
+ Map<String,StudyRecord> studyMap = (Map<String, StudyRecord>) map.get(CaffeineConstant.STUDY_RECORD);
+ for (Map.Entry<String, StudyRecord> entry : studyMap.entrySet()) {
+ cacheList.add(entry.getValue());
}
+
List<Integer> studentIds = cacheList.stream().map(StudyRecord::getStudentId).collect(Collectors.toList());
if (!CollectionUtils.isEmpty(studentIds)) {
//鏁版嵁搴撲腑宸茬粡瀛樺湪鐨勫鐢熸暟鎹�
@@ -62,7 +61,7 @@
}
studyRecordService.saveOrUpdateBatch(cacheList);
}
- caffeineCache.invalidateAll(map.keySet());
+ caffeineCache.invalidate(CaffeineConstant.STUDY_RECORD);
log.info("缁撴潫瀛樺涔犳椂闀�");
}
}
--
Gitblit v1.8.0