fix: 修复回忆列表并发死锁并收敛多表查询

This commit is contained in:
2026-11-21 16:54:07 +08:00
parent 4b65eb57b1
commit 9c3e22680d
17 changed files with 497 additions and 128 deletions
@@ -17,8 +17,11 @@ import com.guo.learningprogresstracker.mapper.TasksMapper;
import java.time.DayOfWeek;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -78,6 +81,24 @@ public class ReviewStatsService {
return result;
}
/** 一批任务一次取齐:逐任务调用会把 4 条聚合乘以任务数。 */
public List<ReviewTaskStats> getReviewTaskStats(Collection<String> taskNums) {
if (taskNums == null || taskNums.isEmpty()) {
return List.of();
}
Map<String, String> names = new LinkedHashMap<>();
for (TaskEntity task : tasksMapper.selectList(
Wrappers.<TaskEntity>lambdaQuery().in(TaskEntity::getTaskNum, taskNums))) {
names.put(task.getTaskNum(), task.getTaskName());
}
List<ReviewTaskStats> stats = new ArrayList<>();
for (String taskNum : new LinkedHashSet<>(taskNums)) {
stats.add(newTaskStats(taskNum, names.get(taskNum)));
}
fillReviewTaskStats(stats);
return stats;
}
public ReviewTaskStats getReviewTaskStats(String taskNum) {
TaskEntity task = tasksMapper
.selectList(Wrappers.<TaskEntity>lambdaQuery()
@@ -151,7 +172,10 @@ public class ReviewStatsService {
/** Current free recall duration is aggregated from the single-current-draft table. */
private void fillReviewDuration(Map<String, ReviewTaskStats> statsByTaskNum) {
for (TaskRecallDuration row : newRecallMapper.sumTaskDuration()) {
if (statsByTaskNum.isEmpty()) {
return;
}
for (TaskRecallDuration row : newRecallMapper.sumTaskDuration(statsByTaskNum.keySet())) {
ReviewTaskStats stats = statsByTaskNum.get(row.getTaskNum());
if (stats != null && row.getActiveDurationMs() != null) {
stats.setReviewDurationSeconds(stats.getReviewDurationSeconds() + row.getActiveDurationMs() / 1000);