perf: 复习统计聚合下推到数据库
This commit is contained in:
@@ -0,0 +1,16 @@
|
||||
package com.guo.learningprogresstracker.dto;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 任务维度的内容条数聚合结果(数据-02):学习报告或知识碎片的条数。
|
||||
* <p>计数在 SQL 侧按内容归属(学习会话 → 任务)分组完成。</p>
|
||||
*/
|
||||
@Data
|
||||
public class TaskContentCount {
|
||||
|
||||
private String taskNum;
|
||||
|
||||
/** 该任务下的报告数或碎片数 */
|
||||
private Long contentCount;
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
package com.guo.learningprogresstracker.dto;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 任务维度的学习会话统计聚合结果(数据-02)。
|
||||
* <p>由 Mapper 层的 {@code SUM/COUNT + GROUP BY} 直接映射,避免把全部会话行拉回内存再聚合。</p>
|
||||
*/
|
||||
@Data
|
||||
public class TaskSessionStats {
|
||||
|
||||
private String taskNum;
|
||||
|
||||
/** 该任务的学习会话次数 */
|
||||
private Long sessionCount;
|
||||
|
||||
/** 累计有效学习时间(秒) */
|
||||
private Double effectiveTime;
|
||||
|
||||
/** 有效时间比之和,用于计算平均值(避免在 Java 侧再存一份分母之外的中间量) */
|
||||
private Double effectivenessRatioSum;
|
||||
|
||||
/** 今日有效学习时间(秒),时间窗在 SQL 侧判断 */
|
||||
private Double todayEffectiveTime;
|
||||
|
||||
/** 本周有效学习时间(秒),时间窗在 SQL 侧判断 */
|
||||
private Double weekEffectiveTime;
|
||||
}
|
||||
@@ -1,8 +1,13 @@
|
||||
package com.guo.learningprogresstracker.mapper;
|
||||
|
||||
import com.guo.learningprogresstracker.dto.TaskContentCount;
|
||||
import com.guo.learningprogresstracker.entity.StudyReportFragmentsEntity;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author guo
|
||||
@@ -13,6 +18,13 @@ import org.apache.ibatis.annotations.Mapper;
|
||||
@Mapper
|
||||
public interface StudyReportFragmentsMapper extends BaseMapper<StudyReportFragmentsEntity> {
|
||||
|
||||
/**
|
||||
* 按内容归属统计任务下的知识碎片条数(数据-02):碎片 → 会话 → 任务。
|
||||
* <p>语句见 {@code resources/mapper/StudyReportFragmentsMapper.xml};返回行数与任务数同阶。</p>
|
||||
*
|
||||
* @param taskNums 需要统计的任务编号;为空时返回空列表
|
||||
*/
|
||||
List<TaskContentCount> countFragmentsByTask(@Param("taskNums") Collection<String> taskNums);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -1,11 +1,15 @@
|
||||
package com.guo.learningprogresstracker.mapper;
|
||||
|
||||
import com.guo.learningprogresstracker.dto.TaskContentCount;
|
||||
import com.guo.learningprogresstracker.dto.StudySessionsDto;
|
||||
import com.guo.learningprogresstracker.entity.StudyReportsEntity;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author guo
|
||||
* @description 针对表【study_reports(存储每次学习结束时的完整学习报告)】的数据库操作Mapper
|
||||
@@ -16,6 +20,14 @@ import org.apache.ibatis.annotations.Param;
|
||||
public interface StudyReportsMapper extends BaseMapper<StudyReportsEntity> {
|
||||
|
||||
StudySessionsDto getNotEndedStudySessionDtoByTaskNum(@Param("task_num") String taskNum);
|
||||
|
||||
/**
|
||||
* 按内容归属统计任务下的学习报告条数(数据-02):报告 → 会话 → 任务。
|
||||
* <p>语句见 {@code resources/mapper/StudyReportsMapper.xml};返回行数与任务数同阶。</p>
|
||||
*
|
||||
* @param taskNums 需要统计的任务编号;为空时返回空列表
|
||||
*/
|
||||
List<TaskContentCount> countReportsByTask(@Param("taskNums") Collection<String> taskNums);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.guo.learningprogresstracker.mapper;
|
||||
|
||||
import com.guo.learningprogresstracker.dto.TaskSessionStats;
|
||||
import com.guo.learningprogresstracker.entity.StudySessionsEntity;
|
||||
import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
@@ -9,6 +10,7 @@ import org.apache.ibatis.annotations.Select;
|
||||
import org.apache.ibatis.annotations.Update;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
@@ -63,4 +65,17 @@ public interface StudySessionsMapper extends BaseMapper<StudySessionsEntity> {
|
||||
AND deleted = 0
|
||||
""")
|
||||
int convergeStaleSession(StudySessionsEntity session);
|
||||
|
||||
/**
|
||||
* 任务维度的学习统计聚合(数据-02):次数、累计/今日/本周有效时间与有效时间比之和。
|
||||
* <p>语句见 {@code resources/mapper/StudySessionsMapper.xml}:时间窗在 SQL 侧判断,
|
||||
* 返回行数与任务数同阶,不随历史会话数增长。</p>
|
||||
*
|
||||
* @param taskNums 需要统计的任务编号;为空时返回空列表
|
||||
* @param todayStart 今日起点(含)
|
||||
* @param weekStart 本周起点(含)
|
||||
*/
|
||||
List<TaskSessionStats> sumStudyStatsByTask(@Param("taskNums") Collection<String> taskNums,
|
||||
@Param("todayStart") LocalDateTime todayStart,
|
||||
@Param("weekStart") LocalDateTime weekStart);
|
||||
}
|
||||
|
||||
@@ -3,7 +3,9 @@ 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.TaskContentCount;
|
||||
import com.guo.learningprogresstracker.dto.TaskReviewDuration;
|
||||
import com.guo.learningprogresstracker.dto.TaskSessionStats;
|
||||
import com.guo.learningprogresstracker.entity.ReviewRecallRecordEntity;
|
||||
import com.guo.learningprogresstracker.entity.StudyReportFragmentsEntity;
|
||||
import com.guo.learningprogresstracker.entity.StudyReportsEntity;
|
||||
@@ -325,6 +327,10 @@ public class ReviewServiceImpl implements ReviewService {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 填充任务维度统计(数据-02):三类聚合(会话统计、报告数、碎片数)全部下推到 SQL,
|
||||
* 每次查询只返回「任务数」量级的行,不随历史会话/内容条数线性增长。
|
||||
*/
|
||||
private void fillReviewTaskStats(List<ReviewTaskStats> statsList) {
|
||||
Map<String, ReviewTaskStats> statsByTaskNum = statsList.stream()
|
||||
.filter(item -> StringUtils.hasText(item.getTaskNum()))
|
||||
@@ -338,50 +344,50 @@ public class ReviewServiceImpl implements ReviewService {
|
||||
return;
|
||||
}
|
||||
|
||||
List<StudySessionsEntity> sessions = studySessionsMapper.selectList(
|
||||
Wrappers.<StudySessionsEntity>lambdaQuery()
|
||||
.in(StudySessionsEntity::getTaskNum, statsByTaskNum.keySet()));
|
||||
|
||||
Set<String> taskNums = statsByTaskNum.keySet();
|
||||
LocalDateTime todayStart = LocalDate.now().atStartOfDay();
|
||||
LocalDateTime weekStart = LocalDate.now().with(DayOfWeek.MONDAY).atStartOfDay();
|
||||
Map<String, String> sessionToTaskNum = new HashMap<>();
|
||||
Map<String, Double> effectivenessRatioSum = new HashMap<>();
|
||||
|
||||
for (StudySessionsEntity session : sessions) {
|
||||
ReviewTaskStats stats = statsByTaskNum.get(session.getTaskNum());
|
||||
for (TaskSessionStats row : studySessionsMapper.sumStudyStatsByTask(taskNums, todayStart, weekStart)) {
|
||||
ReviewTaskStats stats = statsByTaskNum.get(row.getTaskNum());
|
||||
if (stats == null) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (StringUtils.hasText(session.getSessionNum())) {
|
||||
sessionToTaskNum.put(session.getSessionNum(), session.getTaskNum());
|
||||
}
|
||||
|
||||
double effectiveTime = session.getEffectiveTime();
|
||||
stats.setSessionCount(stats.getSessionCount() + 1);
|
||||
stats.setEffectiveTime(stats.getEffectiveTime() + effectiveTime);
|
||||
effectivenessRatioSum.merge(session.getTaskNum(), session.getEffectivenessRatio(), Double::sum);
|
||||
|
||||
LocalDateTime startTime = session.getStartTime();
|
||||
if (startTime != null && !startTime.isBefore(todayStart)) {
|
||||
stats.setTodayEffectiveTime(stats.getTodayEffectiveTime() + effectiveTime);
|
||||
}
|
||||
if (startTime != null && !startTime.isBefore(weekStart)) {
|
||||
stats.setWeekEffectiveTime(stats.getWeekEffectiveTime() + effectiveTime);
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
statsByTaskNum.forEach((taskNum, stats) -> {
|
||||
if (stats.getSessionCount() > 0) {
|
||||
stats.setAvgEffectiveTime(stats.getEffectiveTime() / stats.getSessionCount());
|
||||
stats.setAvgEffectivenessRatio(effectivenessRatioSum.getOrDefault(taskNum, 0D) / stats.getSessionCount());
|
||||
}
|
||||
});
|
||||
|
||||
fillReportAndFragmentCount(sessionToTaskNum, statsByTaskNum);
|
||||
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;
|
||||
}
|
||||
|
||||
/**
|
||||
* 按任务汇总复习行为累计耗时(复习-07)。聚合在 SQL 侧完成,只把任务数量的行拉回内存,
|
||||
* 不随回忆记录条数增长;结果由 {@code TaskReviewDuration} 承载,不走 Map。
|
||||
@@ -395,34 +401,4 @@ public class ReviewServiceImpl implements ReviewService {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void fillReportAndFragmentCount(Map<String, String> sessionToTaskNum,
|
||||
Map<String, ReviewTaskStats> statsByTaskNum) {
|
||||
if (sessionToTaskNum.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
Set<String> sessionNums = sessionToTaskNum.keySet();
|
||||
List<StudyReportsEntity> reports = studyReportsMapper.selectList(
|
||||
Wrappers.<StudyReportsEntity>lambdaQuery()
|
||||
.in(StudyReportsEntity::getSessionNum, sessionNums)
|
||||
.select(StudyReportsEntity::getSessionNum));
|
||||
for (StudyReportsEntity report : reports) {
|
||||
ReviewTaskStats stats = statsByTaskNum.get(sessionToTaskNum.get(report.getSessionNum()));
|
||||
if (stats != null) {
|
||||
stats.setReportCount(stats.getReportCount() + 1);
|
||||
}
|
||||
}
|
||||
|
||||
List<StudyReportFragmentsEntity> fragments = studyReportFragmentsMapper.selectList(
|
||||
Wrappers.<StudyReportFragmentsEntity>lambdaQuery()
|
||||
.in(StudyReportFragmentsEntity::getSessionNum, sessionNums)
|
||||
.select(StudyReportFragmentsEntity::getSessionNum));
|
||||
for (StudyReportFragmentsEntity fragment : fragments) {
|
||||
ReviewTaskStats stats = statsByTaskNum.get(sessionToTaskNum.get(fragment.getSessionNum()));
|
||||
if (stats != null) {
|
||||
stats.setFragmentCount(stats.getFragmentCount() + 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
-- 修正会话计时列的类型:actual_time / effective_time 是秒数(Java 侧为 double),
|
||||
-- 但初始迁移把它们声明成了 mediumtext。后果:
|
||||
-- 1. 无法建索引,ORDER BY / 比较按字符串语义;
|
||||
-- 2. 任何 SQL 聚合(SUM/AVG)都只能依赖隐式字符串→数字转换;
|
||||
-- 3. H2 / PostgreSQL 直接拒绝 SUM(text),导致统计聚合无法下推(数据-02 因此受阻)。
|
||||
-- 本迁移把它们改为 DOUBLE,与实体字段语义一致。
|
||||
--
|
||||
-- 部署前建议先核对是否真的存在非数值内容(应为 0 行):
|
||||
-- SELECT id, actual_time, effective_time FROM study_sessions
|
||||
-- WHERE (actual_time IS NOT NULL AND actual_time NOT REGEXP '^-?[0-9]+(\\.[0-9]+)?$')
|
||||
-- OR (effective_time IS NOT NULL AND effective_time NOT REGEXP '^-?[0-9]+(\\.[0-9]+)?$');
|
||||
-- 下面两步先把这些异常值规范为 0(只动确实非数值的行),再改类型,避免 ALTER 期间报错。
|
||||
|
||||
UPDATE study_sessions
|
||||
SET actual_time = '0'
|
||||
WHERE actual_time IS NOT NULL
|
||||
AND actual_time NOT REGEXP '^-?[0-9]+(\\.[0-9]+)?$';
|
||||
|
||||
UPDATE study_sessions
|
||||
SET effective_time = '0'
|
||||
WHERE effective_time IS NOT NULL
|
||||
AND effective_time NOT REGEXP '^-?[0-9]+(\\.[0-9]+)?$';
|
||||
|
||||
ALTER TABLE study_sessions
|
||||
MODIFY COLUMN actual_time DOUBLE NULL DEFAULT 0 COMMENT '实际使用时间(秒)';
|
||||
|
||||
ALTER TABLE study_sessions
|
||||
MODIFY COLUMN effective_time DOUBLE NULL DEFAULT 0 COMMENT '有效学习时间(秒)';
|
||||
@@ -19,4 +19,29 @@
|
||||
created_time,created_by,last_modified_time,
|
||||
last_modified_by
|
||||
</sql>
|
||||
|
||||
<!-- 显式列映射 -->
|
||||
<resultMap id="TaskContentCountMap" type="com.guo.learningprogresstracker.dto.TaskContentCount">
|
||||
<result property="taskNum" column="task_num" jdbcType="VARCHAR"/>
|
||||
<result property="contentCount" column="content_count" jdbcType="BIGINT"/>
|
||||
</resultMap>
|
||||
|
||||
<!--
|
||||
按内容归属统计任务下的碎片条数(数据-02)。
|
||||
两表都含 created_by,租户条件由拦截器分别追加;自定义 SQL 需显式写 deleted = 0。
|
||||
-->
|
||||
<select id="countFragmentsByTask" resultMap="TaskContentCountMap">
|
||||
SELECT ss.task_num AS task_num,
|
||||
COUNT(f.id) AS content_count
|
||||
FROM study_sessions ss
|
||||
JOIN study_report_fragments f ON f.session_num = ss.session_num AND f.deleted = 0
|
||||
WHERE ss.deleted = 0
|
||||
<if test="taskNums != null and !taskNums.isEmpty()">
|
||||
AND ss.task_num IN
|
||||
<foreach collection="taskNums" item="num" open="(" separator="," close=")">
|
||||
#{num}
|
||||
</foreach>
|
||||
</if>
|
||||
GROUP BY ss.task_num
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
@@ -30,4 +30,29 @@
|
||||
order by ss.last_modified_time desc, ss.created_time desc
|
||||
limit 1
|
||||
</select>
|
||||
|
||||
<!-- 显式列映射 -->
|
||||
<resultMap id="TaskContentCountMap" type="com.guo.learningprogresstracker.dto.TaskContentCount">
|
||||
<result property="taskNum" column="task_num" jdbcType="VARCHAR"/>
|
||||
<result property="contentCount" column="content_count" jdbcType="BIGINT"/>
|
||||
</resultMap>
|
||||
|
||||
<!--
|
||||
按内容归属统计任务下的报告条数(数据-02):报告挂在会话上,会话挂在任务上。
|
||||
两表都含 created_by,租户条件由拦截器分别追加;自定义 SQL 需显式写 deleted = 0。
|
||||
-->
|
||||
<select id="countReportsByTask" resultMap="TaskContentCountMap">
|
||||
SELECT ss.task_num AS task_num,
|
||||
COUNT(r.id) AS content_count
|
||||
FROM study_sessions ss
|
||||
JOIN study_reports r ON r.session_num = ss.session_num AND r.deleted = 0
|
||||
WHERE ss.deleted = 0
|
||||
<if test="taskNums != null and !taskNums.isEmpty()">
|
||||
AND ss.task_num IN
|
||||
<foreach collection="taskNums" item="num" open="(" separator="," close=")">
|
||||
#{num}
|
||||
</foreach>
|
||||
</if>
|
||||
GROUP BY ss.task_num
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
@@ -4,4 +4,37 @@
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.guo.learningprogresstracker.mapper.StudySessionsMapper">
|
||||
|
||||
<!-- 显式列映射:不依赖自动映射的大小写与下划线推断 -->
|
||||
<resultMap id="TaskSessionStatsMap" type="com.guo.learningprogresstracker.dto.TaskSessionStats">
|
||||
<result property="taskNum" column="task_num" jdbcType="VARCHAR"/>
|
||||
<result property="sessionCount" column="session_count" jdbcType="BIGINT"/>
|
||||
<result property="effectiveTime" column="effective_time" jdbcType="DOUBLE"/>
|
||||
<result property="effectivenessRatioSum" column="effectiveness_ratio_sum" jdbcType="DOUBLE"/>
|
||||
<result property="todayEffectiveTime" column="today_effective_time" jdbcType="DOUBLE"/>
|
||||
<result property="weekEffectiveTime" column="week_effective_time" jdbcType="DOUBLE"/>
|
||||
</resultMap>
|
||||
|
||||
<!--
|
||||
任务维度的学习统计聚合(数据-02)。
|
||||
今日/本周的时间窗在 SQL 侧判断,避免把全部会话拉回内存;
|
||||
租户条件 created_by 由 TenantLineInnerInterceptor 自动追加;
|
||||
自定义 SQL 不会被 @TableLogic 自动追加 deleted 条件,故显式写出。
|
||||
-->
|
||||
<select id="sumStudyStatsByTask" resultMap="TaskSessionStatsMap">
|
||||
SELECT task_num,
|
||||
COUNT(*) AS session_count,
|
||||
COALESCE(SUM(effective_time), 0) AS effective_time,
|
||||
COALESCE(SUM(effectiveness_ratio), 0) AS effectiveness_ratio_sum,
|
||||
COALESCE(SUM(CASE WHEN start_time >= #{todayStart} THEN effective_time ELSE 0 END), 0) AS today_effective_time,
|
||||
COALESCE(SUM(CASE WHEN start_time >= #{weekStart} THEN effective_time ELSE 0 END), 0) AS week_effective_time
|
||||
FROM study_sessions
|
||||
WHERE deleted = 0
|
||||
<if test="taskNums != null and !taskNums.isEmpty()">
|
||||
AND task_num IN
|
||||
<foreach collection="taskNums" item="num" open="(" separator="," close=")">
|
||||
#{num}
|
||||
</foreach>
|
||||
</if>
|
||||
GROUP BY task_num
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
Reference in New Issue
Block a user