refactor: 复习耗时聚合改为强类型结果并补充数据访问规范

This commit is contained in:
2026-10-09 11:53:41 +08:00
parent 3b33cd8396
commit 67c8711eee
7 changed files with 139 additions and 55 deletions
@@ -3,6 +3,7 @@ package com.guo.learningprogresstracker.service.impl;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.guo.learningprogresstracker.dto.ReviewFeedItem;
import com.guo.learningprogresstracker.dto.ReviewTaskStats;
import com.guo.learningprogresstracker.dto.TaskReviewDuration;
import com.guo.learningprogresstracker.entity.ReviewRecallRecordEntity;
import com.guo.learningprogresstracker.entity.StudyReportFragmentsEntity;
import com.guo.learningprogresstracker.entity.StudyReportsEntity;
@@ -382,43 +383,19 @@ public class ReviewServiceImpl implements ReviewService {
}
/**
* 按任务汇总复习行为累计耗时(复习-07)。在 SQL 侧聚合,只把任务数量的行拉回内存,
* 不随回忆记录条数增长。
* 按任务汇总复习行为累计耗时(复习-07)。聚合在 SQL 侧完成,只把任务数量的行拉回内存,
* 不随回忆记录条数增长;结果由 {@code TaskReviewDuration} 承载,不走 Map。
*/
private void fillReviewDuration(Map<String, ReviewTaskStats> statsByTaskNum) {
List<Map<String, Object>> rows = reviewRecallRecordMapper.selectMaps(
Wrappers.<ReviewRecallRecordEntity>query()
.select("task_num AS taskNum",
"COALESCE(SUM(review_duration_seconds), 0) AS reviewDurationSeconds")
.in("task_num", statsByTaskNum.keySet())
.groupBy("task_num"));
for (Map<String, Object> row : rows) {
Object taskNum = columnValue(row, "taskNum");
Object duration = columnValue(row, "reviewDurationSeconds");
ReviewTaskStats stats = taskNum == null ? null : statsByTaskNum.get(taskNum.toString());
if (stats != null && duration instanceof Number number) {
stats.setReviewDurationSeconds(number.longValue());
List<TaskReviewDuration> rows = reviewRecallRecordMapper.sumReviewDurationByTask(statsByTaskNum.keySet());
for (TaskReviewDuration row : rows) {
ReviewTaskStats stats = statsByTaskNum.get(row.getTaskNum());
if (stats != null && row.getReviewDurationSeconds() != null) {
stats.setReviewDurationSeconds(row.getReviewDurationSeconds());
}
}
}
/**
* 取聚合结果的列:别名大小写随数据库实现不同(MySQL 保留、H2 会转为小写),这里统一不区分大小写。
*/
private static Object columnValue(Map<String, Object> row, String column) {
Object direct = row.get(column);
if (direct != null) {
return direct;
}
for (Map.Entry<String, Object> entry : row.entrySet()) {
if (entry.getKey() != null && entry.getKey().equalsIgnoreCase(column)) {
return entry.getValue();
}
}
return null;
}
private void fillReportAndFragmentCount(Map<String, String> sessionToTaskNum,
Map<String, ReviewTaskStats> statsByTaskNum) {
if (sessionToTaskNum.isEmpty()) {