From a0a35faec8edf2b8bc6de21cbc557310bf30c82f Mon Sep 17 00:00:00 2001
From: cat-shark <1716967236@qq.com>
Date: Thu, 22 Oct 2026 21:59:30 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A4=8D=E4=B9=A0=E6=80=BB=E8=A7=88?=
=?UTF-8?q?=E5=88=86=E9=A1=B5=E4=B8=8E=E5=85=A8=E5=B1=80=E6=B1=87=E6=80=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/ReviewController.java | 26 +++-
.../dto/ReviewSummary.java | 23 ++++
.../mapper/StudyReportFragmentsMapper.java | 11 ++
.../mapper/StudyReportsMapper.java | 11 ++
.../mapper/TasksMapper.java | 14 ++
.../service/ReviewService.java | 15 +-
.../service/impl/ReviewServiceImpl.java | 40 +++++-
.../mapper/StudyReportFragmentsMapper.xml | 13 ++
.../resources/mapper/StudyReportsMapper.xml | 14 ++
src/main/resources/mapper/TasksMapper.xml | 22 +++
.../controller/ReviewControllerUnitTest.java | 37 ++++-
.../service/impl/ReviewServiceImplTest.java | 47 ++++++-
...ReviewStatsAggregationIntegrationTest.java | 129 ++++++++++++++++++
13 files changed, 383 insertions(+), 19 deletions(-)
create mode 100644 src/main/java/com/guo/learningprogresstracker/dto/ReviewSummary.java
diff --git a/src/main/java/com/guo/learningprogresstracker/controller/ReviewController.java b/src/main/java/com/guo/learningprogresstracker/controller/ReviewController.java
index f50ae74..60bdf23 100644
--- a/src/main/java/com/guo/learningprogresstracker/controller/ReviewController.java
+++ b/src/main/java/com/guo/learningprogresstracker/controller/ReviewController.java
@@ -2,8 +2,10 @@ package com.guo.learningprogresstracker.controller;
import com.guo.learningprogresstracker.dto.ReviewFeedItem;
import com.guo.learningprogresstracker.dto.ReviewSortPreference;
+import com.guo.learningprogresstracker.dto.ReviewSummary;
import com.guo.learningprogresstracker.dto.ReviewTaskStats;
import com.guo.learningprogresstracker.dto.StudyReportDetail;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.guo.learningprogresstracker.dto.request.UpdateStandardMindMapRequest;
import com.guo.learningprogresstracker.dto.request.ReviewFeedbackRequest;
import com.guo.learningprogresstracker.dto.request.UpdateStudyReportRequest;
@@ -85,11 +87,29 @@ public class ReviewController {
}
/**
- * 获取任务维度的复习统计汇总
+ * 复习总览的全局汇总(任务/报告/碎片总数)。
+ *
+ *
列表接口分页后,前端只能看到当前页;把每页相加会得到「本页合计」而不是总数,
+ * 因此汇总单独出接口,口径不受分页影响。
+ */
+ @GetMapping("/summary")
+ public CommonResult summary() {
+ return CommonResult.success(reviewService.summary());
+ }
+
+ /**
+ * 分页获取任务维度的复习统计汇总。
+ *
+ * 分页不只为了排版:聚合(时长/报告数/碎片数)只算当前这一页的任务,
+ * 不再对全部任务做 IN 聚合。{@code markerName} 把「点标签即筛选」下推到服务端,
+ * 否则客户端只能筛当前页、total 也会不对。
*/
@GetMapping("/tasks")
- public CommonResult> getReviewTaskStats() {
- return CommonResult.success(reviewService.getReviewTaskStats());
+ public CommonResult> getReviewTaskStats(
+ @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+ @RequestParam(value = "pageSize", defaultValue = "20") Integer pageSize,
+ @RequestParam(value = "markerName", required = false) String markerName) {
+ return CommonResult.success(reviewService.getReviewTaskStats(pageNum, pageSize, markerName));
}
/**
diff --git a/src/main/java/com/guo/learningprogresstracker/dto/ReviewSummary.java b/src/main/java/com/guo/learningprogresstracker/dto/ReviewSummary.java
new file mode 100644
index 0000000..5164ae4
--- /dev/null
+++ b/src/main/java/com/guo/learningprogresstracker/dto/ReviewSummary.java
@@ -0,0 +1,23 @@
+package com.guo.learningprogresstracker.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+/**
+ * 复习总览的全局汇总。
+ *
+ * 刻意单独出接口:任务列表已分页,客户端只能看到当前页,
+ * 再把每页的报告数/碎片数相加会得到一个「看起来是总数、其实是本页合计」的错数字。
+ *
+ * 口径与 {@code /review/tasks} 的列表完全一致(列表逐页相加 == 这里的汇总):
+ * 报告按「报告 → 会话 → 任务」归属,碎片按内容归属({@code owner_task_num})统计。
+ * 因此待归类碎片不计入 {@code fragmentTotal}(由总览的「待归类内容」独立区块展示),
+ * 任务删除后残留的报告也不计入。
+ */
+public record ReviewSummary(
+ @Schema(description = "任务总数")
+ long taskTotal,
+ @Schema(description = "学习报告总数")
+ long reportTotal,
+ @Schema(description = "学习碎片总数")
+ long fragmentTotal) {
+}
diff --git a/src/main/java/com/guo/learningprogresstracker/mapper/StudyReportFragmentsMapper.java b/src/main/java/com/guo/learningprogresstracker/mapper/StudyReportFragmentsMapper.java
index fcceeff..a12fc82 100644
--- a/src/main/java/com/guo/learningprogresstracker/mapper/StudyReportFragmentsMapper.java
+++ b/src/main/java/com/guo/learningprogresstracker/mapper/StudyReportFragmentsMapper.java
@@ -27,6 +27,17 @@ public interface StudyReportFragmentsMapper extends BaseMapper countFragmentsByTask(@Param("taskNums") Collection taskNums);
+ /**
+ * 复习总览汇总:当前用户全量「已归属」碎片数(不含待归类)。
+ *
+ * 口径必须与 {@link #countFragmentsByTask} 一致——按内容归属({@code owner_task_num})统计,
+ * 只算仍指向现存(未删除)任务的碎片。待归类碎片由总览的「待归类内容」独立区块展示,
+ * 不能在这里重复计数,否则汇总与列表逐页相加的结果对不上。
+ *
+ * 语句见 {@code resources/mapper/StudyReportFragmentsMapper.xml}。
+ */
+ long countOwnedFragments();
+
/**
* 取知识碎片的主键区间(复习-03):供随机取样计算随机起点。
* 语句见 {@code resources/mapper/StudyReportFragmentsMapper.xml};无数据时两列为 null。
diff --git a/src/main/java/com/guo/learningprogresstracker/mapper/StudyReportsMapper.java b/src/main/java/com/guo/learningprogresstracker/mapper/StudyReportsMapper.java
index 83c20cb..ddbda07 100644
--- a/src/main/java/com/guo/learningprogresstracker/mapper/StudyReportsMapper.java
+++ b/src/main/java/com/guo/learningprogresstracker/mapper/StudyReportsMapper.java
@@ -28,6 +28,17 @@ public interface StudyReportsMapper extends BaseMapper {
* @param taskNums 需要统计的任务编号;为空时返回空列表
*/
List countReportsByTask(@Param("taskNums") Collection taskNums);
+
+ /**
+ * 复习总览汇总:当前用户全量报告数。
+ *
+ * 口径必须与 {@link #countReportsByTask} 一致——按「报告 → 会话 → 任务」归属,
+ * 只统计仍归属于现存(未删除)任务的报告。否则任务删除后残留的报告会被算进总览,
+ * 与列表逐页相加的结果对不上。
+ *
+ * 语句见 {@code resources/mapper/StudyReportsMapper.xml}。
+ */
+ long countOwnedReports();
}
diff --git a/src/main/java/com/guo/learningprogresstracker/mapper/TasksMapper.java b/src/main/java/com/guo/learningprogresstracker/mapper/TasksMapper.java
index eb45cca..c63acdc 100644
--- a/src/main/java/com/guo/learningprogresstracker/mapper/TasksMapper.java
+++ b/src/main/java/com/guo/learningprogresstracker/mapper/TasksMapper.java
@@ -2,7 +2,9 @@ package com.guo.learningprogresstracker.mapper;
import com.guo.learningprogresstracker.entity.TaskEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
/**
* @author guo
@@ -13,6 +15,18 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface TasksMapper extends BaseMapper {
+ /**
+ * 按用户标签分页筛选任务(点标签即筛选)。
+ *
+ * 标记过滤直接下推到 SQL({@code EXISTS} 子查询),由数据库在一次查询里算出命中任务,
+ * 不再「先查全部命中对象号、再拼 {@code IN} 回查」——命中量大时 {@code IN} 会膨胀,
+ * 优化器也拿不到好的执行计划。排序与任务列表一致(优先级倒序、id 兜底保证翻页稳定)。
+ *
+ * 语句见 {@code resources/mapper/TasksMapper.xml};租户条件由拦截器给 tasks 与 markers 分别追加。
+ *
+ * @param markerName 用户标签名({@code kind=USER});空白时调用方不应走这个分支
+ */
+ IPage selectPageByMarker(IPage page, @Param("markerName") String markerName);
}
diff --git a/src/main/java/com/guo/learningprogresstracker/service/ReviewService.java b/src/main/java/com/guo/learningprogresstracker/service/ReviewService.java
index ed2e04c..6e439cf 100644
--- a/src/main/java/com/guo/learningprogresstracker/service/ReviewService.java
+++ b/src/main/java/com/guo/learningprogresstracker/service/ReviewService.java
@@ -1,10 +1,12 @@
package com.guo.learningprogresstracker.service;
import com.guo.learningprogresstracker.dto.ReviewFeedItem;
+import com.guo.learningprogresstracker.dto.ReviewSummary;
import com.guo.learningprogresstracker.dto.ReviewTaskStats;
import com.guo.learningprogresstracker.entity.StudyReportFragmentsEntity;
import com.guo.learningprogresstracker.entity.StudyReportsEntity;
import com.guo.learningprogresstracker.exception.NotFindEntitiesException;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.List;
@@ -19,9 +21,18 @@ public interface ReviewService {
List getReviewFeed(int limit, String mode);
/**
- * 获取所有任务的复习统计数据
+ * 分页获取任务的复习统计数据(优先级倒序,同优先级按 id 倒序保证翻页稳定)。
+ *
+ * @param markerName 可选:只返回带该用户标签的任务(单个标记筛选,不做组合)
*/
- List getReviewTaskStats();
+ Page getReviewTaskStats(int pageNum, int pageSize, String markerName);
+
+ /**
+ * 复习总览的全局汇总(任务/报告/碎片总数)。
+ *
+ * 不能由前端把分页后的每页数字相加:那样得到的是「本页合计」而不是总数。
+ */
+ ReviewSummary summary();
/**
* 获取指定任务的复习统计数据
diff --git a/src/main/java/com/guo/learningprogresstracker/service/impl/ReviewServiceImpl.java b/src/main/java/com/guo/learningprogresstracker/service/impl/ReviewServiceImpl.java
index 4a1207a..c4bc4e5 100644
--- a/src/main/java/com/guo/learningprogresstracker/service/impl/ReviewServiceImpl.java
+++ b/src/main/java/com/guo/learningprogresstracker/service/impl/ReviewServiceImpl.java
@@ -1,8 +1,11 @@
package com.guo.learningprogresstracker.service.impl;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.guo.learningprogresstracker.dto.IdRange;
import com.guo.learningprogresstracker.dto.ReviewFeedItem;
+import com.guo.learningprogresstracker.dto.ReviewSummary;
import com.guo.learningprogresstracker.dto.ReviewTaskStats;
import com.guo.learningprogresstracker.dto.StudyReportDetail;
import com.guo.learningprogresstracker.dto.TaskRecallRatio;
@@ -247,17 +250,40 @@ public class ReviewServiceImpl implements ReviewService {
}
@Override
- public List getReviewTaskStats() {
- List tasks = tasksMapper.selectList(
- Wrappers.lambdaQuery()
- .orderByDesc(TaskEntity::getCalculatedPriority));
+ public ReviewSummary summary() {
+ // 口径必须与 /review/tasks 的列表一致(列表逐页相加 == 这里的汇总):
+ // 报告按「报告 → 会话 → 任务」归属,碎片按内容归属(owner_task_num)统计。
+ // 不能用裸表的 selectCount:那样「学习残片」会把待归类碎片也算进来,
+ // 与列表逐页相加的结果对不上(待归类在总览里有独立区块展示)。
+ return new ReviewSummary(
+ tasksMapper.selectCount(null),
+ studyReportsMapper.countOwnedReports(),
+ studyReportFragmentsMapper.countOwnedFragments());
+ }
- List stats = tasks.stream()
+ @Override
+ public Page getReviewTaskStats(int pageNum, int pageSize, String markerName) {
+ // 点标签即筛选:过滤下推到 SQL(EXISTS 子查询),由数据库一次算出命中任务并分页;
+ // 不再「先查全部命中对象号、再拼 IN 回查」——命中量大时 IN 会膨胀。
+ IPage taskPage;
+ if (StringUtils.hasText(markerName)) {
+ taskPage = tasksMapper.selectPageByMarker(new Page<>(pageNum, pageSize), markerName.trim());
+ } else {
+ taskPage = tasksMapper.selectPage(new Page<>(pageNum, pageSize),
+ Wrappers.lambdaQuery()
+ .orderByDesc(TaskEntity::getCalculatedPriority)
+ // 优先级相同的任务之间要有稳定次序,否则翻页会重复或漏掉
+ .orderByDesc(TaskEntity::getId));
+ }
+ List stats = taskPage.getRecords().stream()
.map(this::newTaskStats)
.collect(Collectors.toList());
-
+ // 聚合只算这一页的任务,不再对全部任务做 IN 聚合
fillReviewTaskStats(stats);
- return stats;
+
+ Page result = new Page<>(taskPage.getCurrent(), taskPage.getSize(), taskPage.getTotal());
+ result.setRecords(stats);
+ return result;
}
@Override
diff --git a/src/main/resources/mapper/StudyReportFragmentsMapper.xml b/src/main/resources/mapper/StudyReportFragmentsMapper.xml
index e79d9f8..aae4fcb 100644
--- a/src/main/resources/mapper/StudyReportFragmentsMapper.xml
+++ b/src/main/resources/mapper/StudyReportFragmentsMapper.xml
@@ -63,4 +63,17 @@
GROUP BY owner_task_num
+
+
+
diff --git a/src/main/resources/mapper/StudyReportsMapper.xml b/src/main/resources/mapper/StudyReportsMapper.xml
index 61e4b08..5097ae4 100644
--- a/src/main/resources/mapper/StudyReportsMapper.xml
+++ b/src/main/resources/mapper/StudyReportsMapper.xml
@@ -55,4 +55,18 @@
GROUP BY ss.task_num
+
+
+
diff --git a/src/main/resources/mapper/TasksMapper.xml b/src/main/resources/mapper/TasksMapper.xml
index 75dcb9f..f1fb76a 100644
--- a/src/main/resources/mapper/TasksMapper.xml
+++ b/src/main/resources/mapper/TasksMapper.xml
@@ -27,4 +27,26 @@
created_time,created_by,last_modified_time,
last_modified_by
+
+
+
diff --git a/src/test/java/com/guo/learningprogresstracker/controller/ReviewControllerUnitTest.java b/src/test/java/com/guo/learningprogresstracker/controller/ReviewControllerUnitTest.java
index fb28cfa..31ceeab 100644
--- a/src/test/java/com/guo/learningprogresstracker/controller/ReviewControllerUnitTest.java
+++ b/src/test/java/com/guo/learningprogresstracker/controller/ReviewControllerUnitTest.java
@@ -1,6 +1,8 @@
package com.guo.learningprogresstracker.controller;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.guo.learningprogresstracker.dto.ReviewFeedItem;
+import com.guo.learningprogresstracker.dto.ReviewSummary;
import com.guo.learningprogresstracker.dto.ReviewTaskStats;
import com.guo.learningprogresstracker.dto.request.UpdateStandardMindMapRequest;
import com.guo.learningprogresstracker.entity.CommonResult;
@@ -54,14 +56,39 @@ class ReviewControllerUnitTest {
}
@Test
- void getReviewTaskStats_noArg_returnsAllTaskStats() {
- List stats = List.of(new ReviewTaskStats());
- when(reviewService.getReviewTaskStats()).thenReturn(stats);
+ void summary_returnsTotals() {
+ ReviewSummary summary = new ReviewSummary(45, 30, 33);
+ when(reviewService.summary()).thenReturn(summary);
- CommonResult> result = controller.getReviewTaskStats();
+ CommonResult result = controller.summary();
assertEquals(200, result.getCode());
- assertSame(stats, result.getData());
+ assertEquals(45, result.getData().taskTotal());
+ }
+
+ @Test
+ void getReviewTaskStats_paged_returnsTaskPage() {
+ ReviewTaskStats stats = new ReviewTaskStats();
+ Page page = new Page<>(1, 20, 1);
+ page.setRecords(List.of(stats));
+ when(reviewService.getReviewTaskStats(1, 20, null)).thenReturn(page);
+
+ CommonResult> result = controller.getReviewTaskStats(1, 20, null);
+
+ assertEquals(200, result.getCode());
+ assertSame(page, result.getData());
+ assertEquals(1, result.getData().getTotal());
+ }
+
+ @Test
+ void getReviewTaskStats_passesMarkerFilterToService() {
+ Page empty = new Page<>(1, 20, 0);
+ when(reviewService.getReviewTaskStats(2, 50, "英语")).thenReturn(empty);
+
+ controller.getReviewTaskStats(2, 50, "英语");
+
+ // 标记筛选必须下推到服务端,否则只能筛当前页
+ verify(reviewService).getReviewTaskStats(2, 50, "英语");
}
@Test
diff --git a/src/test/java/com/guo/learningprogresstracker/service/impl/ReviewServiceImplTest.java b/src/test/java/com/guo/learningprogresstracker/service/impl/ReviewServiceImplTest.java
index b4eb10d..eb4c1cf 100644
--- a/src/test/java/com/guo/learningprogresstracker/service/impl/ReviewServiceImplTest.java
+++ b/src/test/java/com/guo/learningprogresstracker/service/impl/ReviewServiceImplTest.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.MybatisConfiguration;
import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
import com.guo.learningprogresstracker.dto.IdRange;
import com.guo.learningprogresstracker.dto.ReviewFeedItem;
+import com.guo.learningprogresstracker.dto.ReviewSummary;
import com.guo.learningprogresstracker.dto.ReviewTaskStats;
import com.guo.learningprogresstracker.dto.TaskContentCount;
import com.guo.learningprogresstracker.dto.TaskRecallRatio;
@@ -20,6 +21,7 @@ import com.guo.learningprogresstracker.mapper.StudyReportsMapper;
import com.guo.learningprogresstracker.mapper.StudySessionsMapper;
import com.guo.learningprogresstracker.mapper.TasksMapper;
import com.guo.learningprogresstracker.mapper.UserReviewPreferencesMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.builder.MapperBuilderAssistant;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
@@ -32,7 +34,11 @@ import java.time.LocalDateTime;
import java.util.List;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
@@ -163,7 +169,7 @@ class ReviewServiceImplTest {
sessionStats.setTodayEffectiveTime(600D);
sessionStats.setWeekEffectiveTime(600D);
- when(tasksMapper.selectList(any())).thenReturn(List.of(task));
+ when(tasksMapper.selectPage(any(), any())).thenReturn(taskPage(task));
when(studySessionsMapper.sumStudyStatsByTask(any(), any(), any())).thenReturn(List.of(sessionStats));
when(studyReportsMapper.countReportsByTask(any())).thenReturn(List.of(count("T1", 2L)));
when(studyReportFragmentsMapper.countFragmentsByTask(any())).thenReturn(List.of(count("T1", 3L)));
@@ -172,7 +178,7 @@ class ReviewServiceImplTest {
reviewDuration("T1", 420L),
reviewDuration("T_UNKNOWN", 100L)));
- List stats = reviewService.getReviewTaskStats();
+ List stats = reviewService.getReviewTaskStats(1, 20, null).getRecords();
assertEquals(1, stats.size());
assertEquals(600, stats.get(0).getEffectiveTime());
@@ -184,6 +190,43 @@ class ReviewServiceImplTest {
assertEquals(420L, stats.get(0).getReviewDurationSeconds());
}
+ @Test
+ void getReviewTaskStats_markerFilter_pushesFilterIntoSql() {
+ // 过滤下推到 SQL:命中任务由 selectPageByMarker 一次查出,
+ // 不再先取全部命中对象号再 IN,也不会在没有命中时退化成「不过滤」
+ Page empty = new Page<>(1, 20, 0);
+ when(tasksMapper.selectPageByMarker(any(), eq("没有的标签"))).thenReturn(empty);
+
+ Page result = reviewService.getReviewTaskStats(1, 20, "没有的标签");
+
+ assertEquals(0, result.getTotal());
+ assertTrue(result.getRecords().isEmpty());
+ verify(tasksMapper).selectPageByMarker(any(), eq("没有的标签"));
+ // 带筛选时必须走专用查询,不能退化成不带筛选的全量分页
+ verify(tasksMapper, never()).selectPage(any(), any());
+ }
+
+ @Test
+ void summary_countsAllInsteadOfCurrentPage() {
+ when(tasksMapper.selectCount(null)).thenReturn(45L);
+ when(studyReportsMapper.countOwnedReports()).thenReturn(30L);
+ when(studyReportFragmentsMapper.countOwnedFragments()).thenReturn(28L);
+
+ ReviewSummary summary = reviewService.summary();
+
+ assertEquals(45L, summary.taskTotal());
+ assertEquals(30L, summary.reportTotal());
+ // 28 而不是裸表总数:汇总只算已归属碎片,与列表逐页相加同口径(待归类另有区块)
+ assertEquals(28L, summary.fragmentTotal());
+ }
+
+ /** 分页结果:与分页拖控的同一形状,聚合只对该页的任务做 */
+ private static Page taskPage(TaskEntity... tasks) {
+ Page page = new Page<>(1, 20, tasks.length);
+ page.setRecords(List.of(tasks));
+ return page;
+ }
+
private static IdRange idRange(int minId, int maxId) {
IdRange range = new IdRange();
range.setMinId(minId);
diff --git a/src/test/java/com/guo/learningprogresstracker/service/impl/ReviewStatsAggregationIntegrationTest.java b/src/test/java/com/guo/learningprogresstracker/service/impl/ReviewStatsAggregationIntegrationTest.java
index 0d4e0e0..b981453 100644
--- a/src/test/java/com/guo/learningprogresstracker/service/impl/ReviewStatsAggregationIntegrationTest.java
+++ b/src/test/java/com/guo/learningprogresstracker/service/impl/ReviewStatsAggregationIntegrationTest.java
@@ -1,16 +1,25 @@
package com.guo.learningprogresstracker.service.impl;
import cn.dev33.satoken.stp.StpUtil;
+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.entity.MarkerEntity;
import com.guo.learningprogresstracker.entity.StudyReportFragmentsEntity;
import com.guo.learningprogresstracker.entity.StudyReportsEntity;
import com.guo.learningprogresstracker.entity.StudySessionsEntity;
+import com.guo.learningprogresstracker.entity.TaskEntity;
+import com.guo.learningprogresstracker.enums.MarkerKindEnum;
+import com.guo.learningprogresstracker.enums.MarkerObjectTypeEnum;
import com.guo.learningprogresstracker.enums.StudySessionStateEnum;
+import com.guo.learningprogresstracker.mapper.MarkerMapper;
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 com.guo.learningprogresstracker.service.MarkerService;
import com.guo.learningprogresstracker.service.ReviewService;
import com.guo.learningprogresstracker.utils.GenerateNumTool;
import org.junit.jupiter.api.BeforeEach;
@@ -54,6 +63,15 @@ class ReviewStatsAggregationIntegrationTest {
@Autowired
private StudyReportFragmentsMapper studyReportFragmentsMapper;
+ @Autowired
+ private TasksMapper tasksMapper;
+
+ @Autowired
+ private MarkerService markerService;
+
+ @Autowired
+ private MarkerMapper markerMapper;
+
@BeforeEach
void setUp() {
StpUtil.login(USER, "test_device");
@@ -146,11 +164,122 @@ class ReviewStatsAggregationIntegrationTest {
ReviewTaskStats otherStats = reviewService.getReviewTaskStats(taskNum);
assertEquals(0, otherStats.getSessionCount(), "统计聚合必须受租户隔离约束");
assertEquals(0D, otherStats.getEffectiveTime(), 0.001);
+ // 汇总同样不能跨租户:join 出来的 tasks 也会被拦截器追加 created_by,
+ // 否则会把别人的报告/碎片算进自己的总览
+ ReviewSummary otherSummary = reviewService.summary();
+ assertEquals(0L, otherSummary.taskTotal(), "汇总必须受租户隔离约束");
+ assertEquals(0L, otherSummary.reportTotal(), "汇总必须受租户隔离约束");
+ assertEquals(0L, otherSummary.fragmentTotal(), "汇总必须受租户隔离约束");
StpUtil.login(USER, "test_device");
assertEquals(1, reviewService.getReviewTaskStats(taskNum).getSessionCount());
}
+ /**
+ * 总览汇总必须与按任务列表同口径:列表逐页相加 == summary。
+ *
+ * 裸表 count 会把「待归类」碎片也算进「学习残片」,而列表的碎片数按内容归属聚合,
+ * 两者对不上(待归类在总览里另有独立区块展示)。这里额外造一条待归类碎片,
+ * 一旦汇总退回裸表计数,断言就会失败。
+ */
+ @Test
+ void summaryMatchesListTotalsAcrossAllPagesAndExcludesPendingFragments() {
+ String taskNum = saveTask();
+ StudySessionsEntity session = saveSession(taskNum, 60, LocalDateTime.now());
+ insertReport(session.getSessionNum());
+ insertFragment(session.getSessionNum(), taskNum);
+ // 待归类碎片:不属于任何任务,因此不进列表,也不该进汇总的「学习残片」
+ insertFragment(session.getSessionNum(), null);
+
+ ReviewSummary summary = reviewService.summary();
+
+ long listReports = 0L;
+ long listFragments = 0L;
+ int pageSize = 100;
+ long total = reviewService.getReviewTaskStats(1, pageSize, null).getTotal();
+ long pages = (total + pageSize - 1) / pageSize;
+ for (int page = 1; page <= pages; page++) {
+ Page pageResult = reviewService.getReviewTaskStats(page, pageSize, null);
+ for (ReviewTaskStats stats : pageResult.getRecords()) {
+ listReports += stats.getReportCount();
+ listFragments += stats.getFragmentCount();
+ }
+ }
+
+ assertEquals(listReports, summary.reportTotal(), "汇总报告数必须等于列表逐页相加");
+ assertEquals(listFragments, summary.fragmentTotal(), "汇总碎片数必须等于列表逐页相加(不含待归类)");
+ }
+
+ /** 真实的任务行:列表按 tasks 表分页,因此汇总的 join 必须能匹配到它 */
+ private String saveTask() {
+ String taskNum = uniqueTaskNum();
+ TaskEntity task = new TaskEntity();
+ task.setTaskNum(taskNum);
+ task.setTaskName("统计聚合集成测试任务");
+ tasksMapper.insert(task);
+ return taskNum;
+ }
+
+ /**
+ * 标签筛选下推到 SQL:命中任务由一次 EXISTS 查询算出,且子查询也受租户隔离约束。
+ *
+ * 「同一 task_num 上存在别人打的同名标签」这种编号碰撞下,若子查询没带 created_by,
+ * 就会把别人标记的任务算成自己的命中——这里用直插 marker 的方式构造该场景守住它。
+ */
+ @Test
+ void markerFilterIsPushedIntoSqlAndStaysTenantScoped() throws Exception {
+ String untaggedTask = saveTask();
+ String taggedTask = saveTask();
+ markerService.addUserTag(MarkerObjectTypeEnum.TASK, taggedTask, "筛选标签");
+
+ // 本用户:只命中自己打过标签的那一个
+ Page page = reviewService.getReviewTaskStats(1, 20, "筛选标签");
+ assertEquals(1, page.getTotal());
+ assertEquals(taggedTask, page.getRecords().get(0).getTaskNum());
+
+ // 没有命中时返回空页,不能退化成「不过滤」
+ Page none = reviewService.getReviewTaskStats(1, 20, "不存在的标签");
+ assertEquals(0, none.getTotal());
+ assertTrue(none.getRecords().isEmpty());
+
+ // 另一用户在同一个 task_num 上插同名标签(模拟编号碰撞)
+ StpUtil.login("统计聚合集成测试标记用户", "test_device");
+ MarkerEntity foreign = new MarkerEntity();
+ foreign.setObjectType(MarkerObjectTypeEnum.TASK.name());
+ foreign.setObjectNum(untaggedTask);
+ foreign.setKind(MarkerKindEnum.USER.name());
+ foreign.setMarkerName("筛选标签");
+ markerMapper.insert(foreign);
+
+ // 本用户仍只看到自己标记的任务:别人的标记不能让他未打标签的任务命中
+ StpUtil.login(USER, "test_device");
+ Page after = reviewService.getReviewTaskStats(1, 20, "筛选标签");
+ assertEquals(1, after.getTotal(), "标签筛选必须受租户隔离约束");
+ assertEquals(taggedTask, after.getRecords().get(0).getTaskNum());
+ }
+
+ /**
+ * 分页总数必须受租户隔离:分页拦截器要注册在多租户之后,
+ * 否则 count 语句是从「还没追加租户条件」的原句派生的,records 正确但 total 会跨租户。
+ */
+ @Test
+ void pagedTaskListTotalIsTenantScoped() {
+ StpUtil.login(USER, "test_device");
+ long mineBefore = reviewService.getReviewTaskStats(1, 20, null).getTotal();
+
+ // 另一用户新建任务:若 count 没带租户条件,本用户看到的 total 会被抬高
+ StpUtil.login("统计聚合集成测试分页用户", "test_device");
+ long theirsBefore = reviewService.getReviewTaskStats(1, 20, null).getTotal();
+ saveTask();
+ saveTask();
+ assertEquals(theirsBefore + 2, reviewService.getReviewTaskStats(1, 20, null).getTotal(),
+ "分页 count 必须只算自己的任务");
+
+ StpUtil.login(USER, "test_device");
+ assertEquals(mineBefore, reviewService.getReviewTaskStats(1, 20, null).getTotal(),
+ "分页 count 必须带租户条件,别人的任务不能算进我的总数");
+ }
+
private StudySessionsEntity saveSession(String taskNum, long effectiveSeconds, LocalDateTime startTime) {
StudySessionsEntity session = new StudySessionsEntity();
session.setSessionNum(GenerateNumTool.generateNum("SESSIONAGG"));