feat: 拆分记录上下文与内容归属并把报告改为结构化
This commit is contained in:
+149
-35
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.guo.learningprogresstracker.dto.IdRange;
|
||||
import com.guo.learningprogresstracker.dto.ReviewFeedItem;
|
||||
import com.guo.learningprogresstracker.dto.ReviewTaskStats;
|
||||
import com.guo.learningprogresstracker.dto.StudyReportDetail;
|
||||
import com.guo.learningprogresstracker.dto.TaskContentCount;
|
||||
import com.guo.learningprogresstracker.dto.TaskReviewDuration;
|
||||
import com.guo.learningprogresstracker.dto.TaskSessionStats;
|
||||
@@ -12,13 +13,16 @@ 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.FragmentContextTypeEnum;
|
||||
import com.guo.learningprogresstracker.exception.NotFindEntitiesException;
|
||||
import com.guo.learningprogresstracker.mapper.ReviewRecallRecordMapper;
|
||||
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.dto.request.UpdateStudyReportRequest;
|
||||
import com.guo.learningprogresstracker.service.ReviewService;
|
||||
import com.guo.learningprogresstracker.service.StudyExpectationsService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
@@ -45,12 +49,17 @@ public class ReviewServiceImpl implements ReviewService {
|
||||
private static final String RANDOM_MODE = "random";
|
||||
private static final String SMART_MODE = "smart";
|
||||
private static final int SMART_CANDIDATE_MULTIPLIER = 5;
|
||||
private static final String SOURCE_REPORT = "REPORT";
|
||||
private static final String SOURCE_FRAGMENT = "FRAGMENT";
|
||||
/** 待归类分组在内部的键名(不会作为任务编号出现在响应里,响应里 taskNum 为 null) */
|
||||
private static final String PENDING_OWNERSHIP_KEY = "__PENDING__";
|
||||
|
||||
private final StudyReportsMapper studyReportsMapper;
|
||||
private final StudyReportFragmentsMapper studyReportFragmentsMapper;
|
||||
private final StudySessionsMapper studySessionsMapper;
|
||||
private final TasksMapper tasksMapper;
|
||||
private final ReviewRecallRecordMapper reviewRecallRecordMapper;
|
||||
private final StudyExpectationsService studyExpectationsService;
|
||||
|
||||
@Override
|
||||
public List<ReviewFeedItem> getReviewFeed(int limit, String mode) {
|
||||
@@ -231,6 +240,7 @@ public class ReviewServiceImpl implements ReviewService {
|
||||
|
||||
@Override
|
||||
public List<ReviewFeedItem> getTaskReview(String taskNum) {
|
||||
// 报告按会话生成:取属于该任务的会话所产生的报告
|
||||
List<String> sessionNums = studySessionsMapper.selectList(
|
||||
Wrappers.<StudySessionsEntity>lambdaQuery()
|
||||
.eq(StudySessionsEntity::getTaskNum, taskNum)
|
||||
@@ -239,18 +249,16 @@ public class ReviewServiceImpl implements ReviewService {
|
||||
.map(StudySessionsEntity::getSessionNum)
|
||||
.collect(Collectors.toList());
|
||||
|
||||
if (sessionNums.isEmpty()) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
||||
List<StudyReportsEntity> reports = studyReportsMapper.selectList(
|
||||
Wrappers.<StudyReportsEntity>lambdaQuery()
|
||||
.in(StudyReportsEntity::getSessionNum, sessionNums)
|
||||
.orderByDesc(StudyReportsEntity::getCreatedTime));
|
||||
List<StudyReportsEntity> reports = sessionNums.isEmpty() ? List.of()
|
||||
: studyReportsMapper.selectList(
|
||||
Wrappers.<StudyReportsEntity>lambdaQuery()
|
||||
.in(StudyReportsEntity::getSessionNum, sessionNums)
|
||||
.orderByDesc(StudyReportsEntity::getCreatedTime));
|
||||
|
||||
// 知识碎片按内容归属:只看它属于谁,不看它产生于哪次会话(归属-01)
|
||||
List<StudyReportFragmentsEntity> fragments = studyReportFragmentsMapper.selectList(
|
||||
Wrappers.<StudyReportFragmentsEntity>lambdaQuery()
|
||||
.in(StudyReportFragmentsEntity::getSessionNum, sessionNums)
|
||||
.eq(StudyReportFragmentsEntity::getOwnerTaskNum, taskNum)
|
||||
.orderByDesc(StudyReportFragmentsEntity::getCreatedTime));
|
||||
|
||||
return mergeAndConvert(reports, fragments);
|
||||
@@ -265,6 +273,81 @@ public class ReviewServiceImpl implements ReviewService {
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public StudyReportDetail getReportDetailStructured(int id) throws NotFindEntitiesException {
|
||||
StudyReportsEntity report = getReportDetail(id);
|
||||
StudyReportDetail detail = StudyReportDetail.of(report);
|
||||
|
||||
// 报告所属会话与任务:用于判断哪些碎片是「旁支」(归属不等于本会话的任务)
|
||||
StudySessionsEntity session = StringUtils.hasText(report.getSessionNum())
|
||||
? studySessionsMapper.selectOne(Wrappers.<StudySessionsEntity>lambdaQuery()
|
||||
.eq(StudySessionsEntity::getSessionNum, report.getSessionNum())
|
||||
.last("LIMIT 1"))
|
||||
: null;
|
||||
if (session != null) {
|
||||
detail.setSessionTaskNum(session.getTaskNum());
|
||||
detail.setSessionTaskName(loadTaskName(session.getTaskNum()));
|
||||
}
|
||||
Optional.ofNullable(studyExpectationsService.getBySessionNum(report.getSessionNum()))
|
||||
.ifPresent(e -> detail.setSessionExpectation(e.getDescription()));
|
||||
|
||||
// 第四部分不落库:按会话产生的碎片 + 它们的**当前**内容归属实时聚合
|
||||
List<StudyReportFragmentsEntity> fragments = studyReportFragmentsMapper.selectList(
|
||||
Wrappers.<StudyReportFragmentsEntity>lambdaQuery()
|
||||
.eq(StudyReportFragmentsEntity::getContextNum, report.getSessionNum())
|
||||
.orderByAsc(StudyReportFragmentsEntity::getCreatedTime));
|
||||
|
||||
Map<String, StudyReportDetail.FragmentGroup> groups = new LinkedHashMap<>();
|
||||
for (StudyReportFragmentsEntity fragment : fragments) {
|
||||
String owner = fragment.getOwnerTaskNum();
|
||||
String key = StringUtils.hasText(owner) ? owner : PENDING_OWNERSHIP_KEY;
|
||||
StudyReportDetail.FragmentGroup group = groups.computeIfAbsent(key, k -> {
|
||||
StudyReportDetail.FragmentGroup created = new StudyReportDetail.FragmentGroup();
|
||||
created.setTaskNum(StringUtils.hasText(owner) ? owner : null);
|
||||
created.setTaskName(StringUtils.hasText(owner) ? loadTaskName(owner) : null);
|
||||
// 旁支 = 归属不是本会话所属任务的内容
|
||||
created.setBranch(!StringUtils.hasText(owner)
|
||||
|| !Objects.equals(owner, detail.getSessionTaskNum()));
|
||||
return created;
|
||||
});
|
||||
group.getFragments().add(fragment);
|
||||
}
|
||||
detail.setFragmentGroups(new ArrayList<>(groups.values()));
|
||||
return detail;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateReport(int id, UpdateStudyReportRequest request) throws NotFindEntitiesException {
|
||||
StudyReportsEntity existing = getReportDetail(id);
|
||||
StudyReportsEntity patch = new StudyReportsEntity();
|
||||
patch.setId(existing.getId());
|
||||
patch.setSessionSummary(request.getSessionSummary());
|
||||
patch.setExpectationVerdict(request.getExpectationVerdict());
|
||||
patch.setFreeSummary(request.getFreeSummary());
|
||||
studyReportsMapper.updateById(patch);
|
||||
log.info("学习报告[{}]已修改", id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteReport(int id) throws NotFindEntitiesException {
|
||||
StudyReportsEntity existing = getReportDetail(id);
|
||||
// 软删除。刻意不连带删除同一会话的知识碎片:碎片是独立原料,可能已被归类到其他任务
|
||||
studyReportsMapper.deleteById(existing.getId());
|
||||
log.info("学习报告[{}]已删除(知识碎片保留)", id);
|
||||
}
|
||||
|
||||
/** 取任务名,任务不存在时返回 null(任务被删除后碎片会进入待归类,报告仍可能引用旧任务号) */
|
||||
private String loadTaskName(String taskNum) {
|
||||
if (!StringUtils.hasText(taskNum)) {
|
||||
return null;
|
||||
}
|
||||
return tasksMapper.selectOne(Wrappers.<TaskEntity>lambdaQuery()
|
||||
.eq(TaskEntity::getTaskNum, taskNum)
|
||||
.select(TaskEntity::getTaskName)
|
||||
.last("LIMIT 1"))
|
||||
.getTaskName();
|
||||
}
|
||||
|
||||
@Override
|
||||
public StudyReportFragmentsEntity getFragmentDetail(int id) throws NotFindEntitiesException {
|
||||
return Optional.ofNullable(studyReportFragmentsMapper.selectById(id))
|
||||
@@ -279,43 +362,50 @@ public class ReviewServiceImpl implements ReviewService {
|
||||
*/
|
||||
private List<ReviewFeedItem> mergeAndConvert(List<StudyReportsEntity> reports,
|
||||
List<StudyReportFragmentsEntity> fragments) {
|
||||
Set<String> allSessionNums = Stream.concat(
|
||||
reports.stream().map(StudyReportsEntity::getSessionNum),
|
||||
fragments.stream().map(StudyReportFragmentsEntity::getSessionNum)
|
||||
).collect(Collectors.toSet());
|
||||
|
||||
if (allSessionNums.isEmpty()) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
||||
Map<String, String> sessionToTaskMap = studySessionsMapper.selectList(
|
||||
Wrappers.<StudySessionsEntity>lambdaQuery()
|
||||
.in(StudySessionsEntity::getSessionNum, allSessionNums)
|
||||
.select(StudySessionsEntity::getSessionNum, StudySessionsEntity::getTaskNum))
|
||||
// 报告的任务取自它所属的会话(报告按会话生成)
|
||||
Set<String> reportSessionNums = reports.stream()
|
||||
.map(StudyReportsEntity::getSessionNum)
|
||||
.filter(Objects::nonNull)
|
||||
.collect(Collectors.toSet());
|
||||
Map<String, String> sessionToTaskMap = reportSessionNums.isEmpty()
|
||||
? Collections.emptyMap()
|
||||
: studySessionsMapper.selectList(
|
||||
Wrappers.<StudySessionsEntity>lambdaQuery()
|
||||
.in(StudySessionsEntity::getSessionNum, reportSessionNums)
|
||||
.select(StudySessionsEntity::getSessionNum, StudySessionsEntity::getTaskNum))
|
||||
.stream()
|
||||
.collect(Collectors.toMap(
|
||||
StudySessionsEntity::getSessionNum,
|
||||
StudySessionsEntity::getTaskNum,
|
||||
(a, b) -> a));
|
||||
|
||||
// 碎片的任务取自它自己的内容归属
|
||||
Set<String> taskNums = new HashSet<>(sessionToTaskMap.values());
|
||||
Map<String, String> taskNameMap = tasksMapper.selectList(
|
||||
Wrappers.<TaskEntity>lambdaQuery()
|
||||
.in(TaskEntity::getTaskNum, taskNums)
|
||||
.select(TaskEntity::getTaskNum, TaskEntity::getTaskName))
|
||||
fragments.stream()
|
||||
.map(StudyReportFragmentsEntity::getOwnerTaskNum)
|
||||
.filter(StringUtils::hasText)
|
||||
.forEach(taskNums::add);
|
||||
taskNums.removeIf(num -> !StringUtils.hasText(num));
|
||||
|
||||
Map<String, String> taskNameMap = taskNums.isEmpty() ? Collections.emptyMap()
|
||||
: tasksMapper.selectList(
|
||||
Wrappers.<TaskEntity>lambdaQuery()
|
||||
.in(TaskEntity::getTaskNum, taskNums)
|
||||
.select(TaskEntity::getTaskNum, TaskEntity::getTaskName))
|
||||
.stream()
|
||||
.collect(Collectors.toMap(
|
||||
TaskEntity::getTaskNum,
|
||||
TaskEntity::getTaskName,
|
||||
task -> task.getTaskName() == null ? "" : task.getTaskName(),
|
||||
(a, b) -> a));
|
||||
|
||||
List<ReviewFeedItem> reportItems = reports.stream().map(r -> {
|
||||
ReviewFeedItem item = new ReviewFeedItem();
|
||||
item.setId(r.getId());
|
||||
item.setSessionNum(r.getSessionNum());
|
||||
item.setSourceType("REPORT");
|
||||
item.setContent(r.getContent());
|
||||
item.setSourceType(SOURCE_REPORT);
|
||||
item.setContent(reportDisplayText(r));
|
||||
item.setCreatedTime(r.getCreatedTime());
|
||||
item.setContextType(FragmentContextTypeEnum.SESSION.name());
|
||||
item.setContextNum(r.getSessionNum());
|
||||
String taskNum = sessionToTaskMap.get(r.getSessionNum());
|
||||
item.setTaskNum(taskNum);
|
||||
item.setTaskName(taskNum != null ? taskNameMap.get(taskNum) : null);
|
||||
@@ -325,13 +415,16 @@ public class ReviewServiceImpl implements ReviewService {
|
||||
List<ReviewFeedItem> fragmentItems = fragments.stream().map(f -> {
|
||||
ReviewFeedItem item = new ReviewFeedItem();
|
||||
item.setId(f.getId());
|
||||
item.setSessionNum(f.getSessionNum());
|
||||
item.setSourceType("FRAGMENT");
|
||||
item.setSourceType(SOURCE_FRAGMENT);
|
||||
item.setContent(f.getContent());
|
||||
item.setCreatedTime(f.getCreatedTime());
|
||||
String taskNum = sessionToTaskMap.get(f.getSessionNum());
|
||||
item.setTaskNum(taskNum);
|
||||
item.setTaskName(taskNum != null ? taskNameMap.get(taskNum) : null);
|
||||
item.setContextType(f.getContextType());
|
||||
item.setContextNum(f.getContextNum());
|
||||
// 内容归属:为空即「待归类」,前端据此打标并提供就地归类入口
|
||||
item.setPendingOwnership(f.isPendingOwnership());
|
||||
item.setTaskNum(f.getOwnerTaskNum());
|
||||
item.setTaskName(StringUtils.hasText(f.getOwnerTaskNum())
|
||||
? taskNameMap.get(f.getOwnerTaskNum()) : null);
|
||||
return item;
|
||||
}).collect(Collectors.toList());
|
||||
|
||||
@@ -341,6 +434,27 @@ public class ReviewServiceImpl implements ReviewService {
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
|
||||
/**
|
||||
* 报告在列表/Feed 中的展示文本:结构化报告由三段组成,这里按段拼接。
|
||||
*/
|
||||
private static String reportDisplayText(StudyReportsEntity report) {
|
||||
StringBuilder text = new StringBuilder();
|
||||
appendSection(text, "会话摘要", report.getSessionSummary());
|
||||
appendSection(text, "预期达成判断", report.getExpectationVerdict());
|
||||
appendSection(text, "自由总结", report.getFreeSummary());
|
||||
return text.length() == 0 ? "" : text.toString().trim();
|
||||
}
|
||||
|
||||
private static void appendSection(StringBuilder text, String title, String body) {
|
||||
if (body == null || body.isBlank()) {
|
||||
return;
|
||||
}
|
||||
if (text.length() > 0) {
|
||||
text.append("\n\n");
|
||||
}
|
||||
text.append("【").append(title).append("】\n").append(body.trim());
|
||||
}
|
||||
|
||||
private ReviewTaskStats newTaskStats(TaskEntity task) {
|
||||
return newTaskStats(task.getTaskNum(), task.getTaskName());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user