refactor: 回忆改用独立存储与请求响应 DTO,服务按域拆包
This commit is contained in:
@@ -0,0 +1,172 @@
|
||||
package com.guo.learningprogresstracker.service.review;
|
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.guo.learningprogresstracker.dto.ReviewSummary;
|
||||
import com.guo.learningprogresstracker.dto.ReviewTaskStats;
|
||||
import com.guo.learningprogresstracker.dto.TaskContentCount;
|
||||
import com.guo.learningprogresstracker.dto.TaskSessionStats;
|
||||
import com.guo.learningprogresstracker.dto.recall.TaskRecallDuration;
|
||||
import com.guo.learningprogresstracker.entity.TaskEntity;
|
||||
import com.guo.learningprogresstracker.mapper.ReviewRecallMapper;
|
||||
import com.guo.learningprogresstracker.mapper.StudyReportFragmentsMapper;
|
||||
import com.guo.learningprogresstracker.mapper.StudyReportsMapper;
|
||||
import com.guo.learningprogresstracker.mapper.StudySessionsMapper;
|
||||
import com.guo.learningprogresstracker.mapper.TasksMapper;
|
||||
import java.time.DayOfWeek;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Collections;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Collectors;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.util.StringUtils;
|
||||
|
||||
/**
|
||||
* 复习统计数据(总览与任务维度)。
|
||||
*
|
||||
* <p>口径与 feed 列表一致:报告按「报告 → 会话 → 任务」归属,碎片按内容归属(归属-01)。
|
||||
* 聚合一律下推到 SQL(数据-02),返回行数与任务数同阶。</p>
|
||||
*/
|
||||
@Component
|
||||
@RequiredArgsConstructor
|
||||
public class ReviewStatsService {
|
||||
|
||||
private final StudyReportsMapper studyReportsMapper;
|
||||
private final StudyReportFragmentsMapper studyReportFragmentsMapper;
|
||||
private final StudySessionsMapper studySessionsMapper;
|
||||
private final TasksMapper tasksMapper;
|
||||
private final ReviewRecallMapper newRecallMapper;
|
||||
|
||||
public ReviewSummary summary() {
|
||||
// 口径必须与 /review/tasks 的列表一致(列表逐页相加 == 这里的汇总):
|
||||
// 报告按「报告 → 会话 → 任务」归属,碎片按内容归属(owner_task_num)统计。
|
||||
// 不能用裸表的 selectCount:那样「学习残片」会把待归类碎片也算进来,
|
||||
// 与列表逐页相加的结果对不上(待归类在总览里有独立区块展示)。
|
||||
return new ReviewSummary(
|
||||
tasksMapper.selectCount(null),
|
||||
studyReportsMapper.countOwnedReports(),
|
||||
studyReportFragmentsMapper.countOwnedFragments());
|
||||
}
|
||||
|
||||
public Page<ReviewTaskStats> getReviewTaskStats(int pageNum, int pageSize, String markerName) {
|
||||
// 点标签即筛选:过滤下推到 SQL(EXISTS 子查询),由数据库一次算出命中任务并分页;
|
||||
// 不再「先查全部命中对象号、再拼 IN 回查」——命中量大时 IN 会膨胀。
|
||||
IPage<TaskEntity> taskPage;
|
||||
if (StringUtils.hasText(markerName)) {
|
||||
taskPage = tasksMapper.selectPageByMarker(new Page<>(pageNum, pageSize), markerName.trim());
|
||||
} else {
|
||||
taskPage = tasksMapper.selectPage(
|
||||
new Page<>(pageNum, pageSize),
|
||||
Wrappers.<TaskEntity>lambdaQuery()
|
||||
.orderByDesc(TaskEntity::getCalculatedPriority)
|
||||
// 优先级相同的任务之间要有稳定次序,否则翻页会重复或漏掉
|
||||
.orderByDesc(TaskEntity::getId));
|
||||
}
|
||||
List<ReviewTaskStats> stats =
|
||||
taskPage.getRecords().stream().map(this::newTaskStats).collect(Collectors.toList());
|
||||
// 聚合只算这一页的任务,不再对全部任务做 IN 聚合
|
||||
fillReviewTaskStats(stats);
|
||||
|
||||
Page<ReviewTaskStats> result = new Page<>(taskPage.getCurrent(), taskPage.getSize(), taskPage.getTotal());
|
||||
result.setRecords(stats);
|
||||
return result;
|
||||
}
|
||||
|
||||
public ReviewTaskStats getReviewTaskStats(String taskNum) {
|
||||
TaskEntity task = tasksMapper
|
||||
.selectList(Wrappers.<TaskEntity>lambdaQuery()
|
||||
.eq(TaskEntity::getTaskNum, taskNum)
|
||||
.last("LIMIT 1"))
|
||||
.stream()
|
||||
.findFirst()
|
||||
.orElse(null);
|
||||
|
||||
ReviewTaskStats stats = newTaskStats(taskNum, task == null ? null : task.getTaskName());
|
||||
fillReviewTaskStats(Collections.singletonList(stats));
|
||||
return stats;
|
||||
}
|
||||
|
||||
/**
|
||||
* 填充任务维度统计(数据-02):三类聚合(会话统计、报告数、碎片数)全部下推到 SQL,
|
||||
* 每次查询只返回「任务数」量级的行,不随历史会话/内容条数线性增长。
|
||||
*/
|
||||
private void fillReviewTaskStats(List<ReviewTaskStats> statsList) {
|
||||
Map<String, ReviewTaskStats> statsByTaskNum = statsList.stream()
|
||||
.filter(item -> StringUtils.hasText(item.getTaskNum()))
|
||||
.collect(Collectors.toMap(ReviewTaskStats::getTaskNum, item -> item, (a, b) -> a, LinkedHashMap::new));
|
||||
|
||||
if (statsByTaskNum.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
Set<String> taskNums = statsByTaskNum.keySet();
|
||||
LocalDateTime todayStart = LocalDate.now().atStartOfDay();
|
||||
LocalDateTime weekStart = LocalDate.now().with(DayOfWeek.MONDAY).atStartOfDay();
|
||||
|
||||
for (TaskSessionStats row : studySessionsMapper.sumStudyStatsByTask(taskNums, todayStart, weekStart)) {
|
||||
ReviewTaskStats stats = statsByTaskNum.get(row.getTaskNum());
|
||||
if (stats == null) {
|
||||
continue;
|
||||
}
|
||||
long sessionCount = row.getSessionCount() == null ? 0L : row.getSessionCount();
|
||||
stats.setSessionCount(sessionCount);
|
||||
stats.setEffectiveTime(nullToZero(row.getEffectiveTime()));
|
||||
stats.setTodayEffectiveTime(nullToZero(row.getTodayEffectiveTime()));
|
||||
stats.setWeekEffectiveTime(nullToZero(row.getWeekEffectiveTime()));
|
||||
if (sessionCount > 0) {
|
||||
stats.setAvgEffectiveTime(stats.getEffectiveTime() / sessionCount);
|
||||
stats.setAvgEffectivenessRatio(nullToZero(row.getEffectivenessRatioSum()) / sessionCount);
|
||||
}
|
||||
}
|
||||
|
||||
fillContentCounts(statsByTaskNum, taskNums);
|
||||
fillReviewDuration(statsByTaskNum);
|
||||
}
|
||||
|
||||
/** 报告数与碎片数:同样在 SQL 侧按内容归属分组计数 */
|
||||
private void fillContentCounts(Map<String, ReviewTaskStats> statsByTaskNum, Set<String> taskNums) {
|
||||
for (TaskContentCount row : studyReportsMapper.countReportsByTask(taskNums)) {
|
||||
ReviewTaskStats stats = statsByTaskNum.get(row.getTaskNum());
|
||||
if (stats != null) {
|
||||
stats.setReportCount(row.getContentCount() == null ? 0L : row.getContentCount());
|
||||
}
|
||||
}
|
||||
for (TaskContentCount row : studyReportFragmentsMapper.countFragmentsByTask(taskNums)) {
|
||||
ReviewTaskStats stats = statsByTaskNum.get(row.getTaskNum());
|
||||
if (stats != null) {
|
||||
stats.setFragmentCount(row.getContentCount() == null ? 0L : row.getContentCount());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static double nullToZero(Double value) {
|
||||
return value == null ? 0D : value;
|
||||
}
|
||||
|
||||
/** Current free recall duration is aggregated from the single-current-draft table. */
|
||||
private void fillReviewDuration(Map<String, ReviewTaskStats> statsByTaskNum) {
|
||||
for (TaskRecallDuration row : newRecallMapper.sumTaskDuration()) {
|
||||
ReviewTaskStats stats = statsByTaskNum.get(row.getTaskNum());
|
||||
if (stats != null && row.getActiveDurationMs() != null) {
|
||||
stats.setReviewDurationSeconds(stats.getReviewDurationSeconds() + row.getActiveDurationMs() / 1000);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private ReviewTaskStats newTaskStats(TaskEntity task) {
|
||||
return newTaskStats(task.getTaskNum(), task.getTaskName());
|
||||
}
|
||||
|
||||
private ReviewTaskStats newTaskStats(String taskNum, String taskName) {
|
||||
ReviewTaskStats stats = new ReviewTaskStats();
|
||||
stats.setTaskNum(taskNum);
|
||||
stats.setTaskName(taskName);
|
||||
return stats;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user