perf: 报告详情把会话任务名并入同一次批量查询
This commit is contained in:
@@ -32,6 +32,7 @@ import java.time.LocalDateTime;
|
|||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.LinkedHashMap;
|
import java.util.LinkedHashMap;
|
||||||
|
import java.util.LinkedHashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
@@ -119,7 +120,6 @@ public class ReviewServiceImpl implements ReviewService {
|
|||||||
: null;
|
: null;
|
||||||
if (session != null) {
|
if (session != null) {
|
||||||
detail.setSessionTaskNum(session.getTaskNum());
|
detail.setSessionTaskNum(session.getTaskNum());
|
||||||
detail.setSessionTaskName(loadTaskName(session.getTaskNum()));
|
|
||||||
}
|
}
|
||||||
Optional.ofNullable(studyExpectationsService.getBySessionNum(report.getSessionNum()))
|
Optional.ofNullable(studyExpectationsService.getBySessionNum(report.getSessionNum()))
|
||||||
.ifPresent(e -> detail.setSessionExpectation(e.getDescription()));
|
.ifPresent(e -> detail.setSessionExpectation(e.getDescription()));
|
||||||
@@ -131,12 +131,18 @@ public class ReviewServiceImpl implements ReviewService {
|
|||||||
.eq(StudyReportFragmentsEntity::getContextNum, report.getSessionNum())
|
.eq(StudyReportFragmentsEntity::getContextNum, report.getSessionNum())
|
||||||
.orderByAsc(StudyReportFragmentsEntity::getCreatedTime));
|
.orderByAsc(StudyReportFragmentsEntity::getCreatedTime));
|
||||||
|
|
||||||
// 归属任务名一次 IN 取齐:computeIfAbsent 里逐个查会把分组数变成额外的 N 次往返
|
// 会话任务名与归属任务名一次 IN 取齐:逐个查会把分组数变成额外的 N 次往返
|
||||||
Set<String> ownerTaskNums = fragments.stream()
|
Set<String> taskNums = fragments.stream()
|
||||||
.map(StudyReportFragmentsEntity::getOwnerTaskNum)
|
.map(StudyReportFragmentsEntity::getOwnerTaskNum)
|
||||||
.filter(StringUtils::hasText)
|
.filter(StringUtils::hasText)
|
||||||
.collect(Collectors.toSet());
|
.collect(Collectors.toCollection(LinkedHashSet::new));
|
||||||
Map<String, String> ownerTaskNames = loadTaskNames(ownerTaskNums);
|
if (session != null && StringUtils.hasText(session.getTaskNum())) {
|
||||||
|
taskNums.add(session.getTaskNum());
|
||||||
|
}
|
||||||
|
Map<String, String> taskNames = loadTaskNames(taskNums);
|
||||||
|
if (session != null) {
|
||||||
|
detail.setSessionTaskName(taskNames.get(session.getTaskNum()));
|
||||||
|
}
|
||||||
Map<String, StudyReportDetail.FragmentGroup> groups = new LinkedHashMap<>();
|
Map<String, StudyReportDetail.FragmentGroup> groups = new LinkedHashMap<>();
|
||||||
for (StudyReportFragmentsEntity fragment : fragments) {
|
for (StudyReportFragmentsEntity fragment : fragments) {
|
||||||
String owner = fragment.getOwnerTaskNum();
|
String owner = fragment.getOwnerTaskNum();
|
||||||
@@ -144,7 +150,7 @@ public class ReviewServiceImpl implements ReviewService {
|
|||||||
StudyReportDetail.FragmentGroup group = groups.computeIfAbsent(key, k -> {
|
StudyReportDetail.FragmentGroup group = groups.computeIfAbsent(key, k -> {
|
||||||
StudyReportDetail.FragmentGroup created = new StudyReportDetail.FragmentGroup();
|
StudyReportDetail.FragmentGroup created = new StudyReportDetail.FragmentGroup();
|
||||||
created.setTaskNum(StringUtils.hasText(owner) ? owner : null);
|
created.setTaskNum(StringUtils.hasText(owner) ? owner : null);
|
||||||
created.setTaskName(StringUtils.hasText(owner) ? ownerTaskNames.get(owner) : null);
|
created.setTaskName(StringUtils.hasText(owner) ? taskNames.get(owner) : null);
|
||||||
// 旁支 = 归属不是本会话所属任务的内容
|
// 旁支 = 归属不是本会话所属任务的内容
|
||||||
created.setBranch(!StringUtils.hasText(owner) || !Objects.equals(owner, detail.getSessionTaskNum()));
|
created.setBranch(!StringUtils.hasText(owner) || !Objects.equals(owner, detail.getSessionTaskNum()));
|
||||||
return created;
|
return created;
|
||||||
@@ -268,10 +274,6 @@ public class ReviewServiceImpl implements ReviewService {
|
|||||||
return new ReviewSortPreference(preset.name(), preset.getDescription());
|
return new ReviewSortPreference(preset.name(), preset.getDescription());
|
||||||
}
|
}
|
||||||
|
|
||||||
private String loadTaskName(String taskNum) {
|
|
||||||
return StringUtils.hasText(taskNum) ? loadTaskNames(List.of(taskNum)).get(taskNum) : null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 任务名一次 IN 取齐;已删除的任务不在结果里,调用方按 null 处理 */
|
/** 任务名一次 IN 取齐;已删除的任务不在结果里,调用方按 null 处理 */
|
||||||
private Map<String, String> loadTaskNames(Collection<String> taskNums) {
|
private Map<String, String> loadTaskNames(Collection<String> taskNums) {
|
||||||
if (taskNums.isEmpty()) {
|
if (taskNums.isEmpty()) {
|
||||||
|
|||||||
Reference in New Issue
Block a user