feat: 残片归属时自动打任务名标签
This commit is contained in:
@@ -72,6 +72,15 @@ public interface MarkerService {
|
||||
*/
|
||||
void addSystemMarker(MarkerObjectTypeEnum objectType, String objectNum, SystemMarkerEnum marker);
|
||||
|
||||
/**
|
||||
* 残片获得内容归属时自动打「任务名标签」(闭环-02)。
|
||||
*
|
||||
* <p>标签名取任务当时的名字,走用户标签;幂等,任务编号为空或任务不存在时不打标。
|
||||
* 任务改名不追溯、删任务时标签保留——因为标签只是带任务名字符串的普通用户标签,
|
||||
* 系统不会主动改写或级联删除它。</p>
|
||||
*/
|
||||
void addOwnerTaskNameTag(MarkerObjectTypeEnum objectType, String objectNum, String taskNum);
|
||||
|
||||
/**
|
||||
* 对象被删除时清理其标记(例如碎片被删除)。
|
||||
*/
|
||||
|
||||
@@ -149,6 +149,10 @@ public class GuidanceServiceImpl implements GuidanceService {
|
||||
markerService.addSystemMarker(MarkerObjectTypeEnum.FRAGMENT,
|
||||
String.valueOf(fragment.getId()), SystemMarkerEnum.FROM_GUIDANCE);
|
||||
|
||||
// 引导产出的碎片默认也有内容归属 → 一并自动打任务名标签(闭环-02)
|
||||
markerService.addOwnerTaskNameTag(MarkerObjectTypeEnum.FRAGMENT,
|
||||
String.valueOf(fragment.getId()), fragment.getOwnerTaskNum());
|
||||
|
||||
finishConversation(conversation, timing);
|
||||
log.info("学习引导[{}]产出碎片[{}],默认归属任务[{}]",
|
||||
guidanceNum, fragment.getId(), conversation.getTaskNum());
|
||||
|
||||
@@ -199,6 +199,27 @@ public class MarkerServiceImpl implements MarkerService {
|
||||
markerMapper.insert(entity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addOwnerTaskNameTag(MarkerObjectTypeEnum objectType, String objectNum, String taskNum) {
|
||||
if (objectType == null || !StringUtils.hasText(objectNum) || !StringUtils.hasText(taskNum)) {
|
||||
return;
|
||||
}
|
||||
TaskEntity task = tasksMapper.selectOne(Wrappers.<TaskEntity>lambdaQuery()
|
||||
.eq(TaskEntity::getTaskNum, taskNum.trim())
|
||||
.last("LIMIT 1"));
|
||||
if (task == null || !StringUtils.hasText(task.getTaskName())) {
|
||||
// 任务已被删除或没有名字时不打标;归属本身不受影响
|
||||
return;
|
||||
}
|
||||
try {
|
||||
// 走用户标签:可改名、可删除,任务之后改名也不回溯改写这条历史标签
|
||||
addUserTag(objectType, objectNum, task.getTaskName());
|
||||
} catch (ErrorParameterException | NotFindEntitiesException e) {
|
||||
// 任务名超过标签长度上限等情况下只跳过打标,不让归属操作失败
|
||||
log.warn("对象[{}/{}]自动打任务名标签失败:{}", objectType, objectNum, e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void removeAllMarkers(MarkerObjectTypeEnum objectType, String objectNum) {
|
||||
if (objectType == null || !StringUtils.hasText(objectNum)) {
|
||||
|
||||
+19
-4
@@ -9,11 +9,13 @@ import com.guo.learningprogresstracker.entity.StudyReportFragmentsEntity;
|
||||
import com.guo.learningprogresstracker.entity.StudySessionsEntity;
|
||||
import com.guo.learningprogresstracker.entity.TaskEntity;
|
||||
import com.guo.learningprogresstracker.enums.FragmentContextTypeEnum;
|
||||
import com.guo.learningprogresstracker.enums.MarkerObjectTypeEnum;
|
||||
import com.guo.learningprogresstracker.exception.NotFindEntitiesException;
|
||||
import com.guo.learningprogresstracker.mapStruct.FragmentsConvert;
|
||||
import com.guo.learningprogresstracker.mapper.ReviewStandardMindMapMapper;
|
||||
import com.guo.learningprogresstracker.mapper.StudySessionsMapper;
|
||||
import com.guo.learningprogresstracker.mapper.TasksMapper;
|
||||
import com.guo.learningprogresstracker.service.MarkerService;
|
||||
import com.guo.learningprogresstracker.service.StudyReportFragmentsService;
|
||||
import com.guo.learningprogresstracker.mapper.StudyReportFragmentsMapper;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
@@ -42,7 +44,7 @@ public class StudyReportFragmentsServiceImpl extends ServiceImpl<StudyReportFrag
|
||||
private final StudySessionsMapper studySessionsMapper;
|
||||
private final TasksMapper tasksMapper;
|
||||
private final ReviewStandardMindMapMapper reviewStandardMindMapMapper;
|
||||
private final com.guo.learningprogresstracker.service.MarkerService markerService;
|
||||
private final MarkerService markerService;
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
@@ -63,6 +65,10 @@ public class StudyReportFragmentsServiceImpl extends ServiceImpl<StudyReportFrag
|
||||
entity.setOwnerTaskNum(session.getTaskNum());
|
||||
|
||||
this.save(entity);
|
||||
|
||||
// 碎片一诞生就有内容归属 → 自动打任务名标签(闭环-02)
|
||||
markerService.addOwnerTaskNameTag(
|
||||
MarkerObjectTypeEnum.FRAGMENT, String.valueOf(entity.getId()), entity.getOwnerTaskNum());
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -76,10 +82,16 @@ public class StudyReportFragmentsServiceImpl extends ServiceImpl<StudyReportFrag
|
||||
StudyReportFragmentsEntity patch = new StudyReportFragmentsEntity();
|
||||
patch.setId(id);
|
||||
patch.setContent(request.getContent());
|
||||
String resolvedOwner = null;
|
||||
if (request.getOwnerTaskNum() != null) {
|
||||
patch.setOwnerTaskNum(resolveOwnerTaskNum(request.getOwnerTaskNum()));
|
||||
resolvedOwner = resolveOwnerTaskNum(request.getOwnerTaskNum());
|
||||
patch.setOwnerTaskNum(resolvedOwner);
|
||||
}
|
||||
this.updateById(patch);
|
||||
// 本次把碎片归入某个任务(含「升格为新任务」的归类)→ 补打任务名标签(闭环-02)
|
||||
if (resolvedOwner != null) {
|
||||
markerService.addOwnerTaskNameTag(MarkerObjectTypeEnum.FRAGMENT, String.valueOf(id), resolvedOwner);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -103,6 +115,10 @@ public class StudyReportFragmentsServiceImpl extends ServiceImpl<StudyReportFrag
|
||||
// 归属改变后,原任务与新任务的导图都需要重建(由用户手动触发)
|
||||
markMindMapStale(previous);
|
||||
markMindMapStale(resolved);
|
||||
// 碎片获得内容归属 → 补打任务名标签(闭环-02);原标签保留不追溯
|
||||
if (resolved != null) {
|
||||
markerService.addOwnerTaskNameTag(MarkerObjectTypeEnum.FRAGMENT, String.valueOf(id), resolved);
|
||||
}
|
||||
log.info("碎片[{}]内容归属由[{}]变更为[{}]", id, previous, resolved);
|
||||
}
|
||||
|
||||
@@ -116,8 +132,7 @@ public class StudyReportFragmentsServiceImpl extends ServiceImpl<StudyReportFrag
|
||||
// 软删除;所属任务的导图需要重建
|
||||
this.removeById(id);
|
||||
// 对象没了,它身上的标记也不再有意义(标记-01)
|
||||
markerService.removeAllMarkers(
|
||||
com.guo.learningprogresstracker.enums.MarkerObjectTypeEnum.FRAGMENT, String.valueOf(id));
|
||||
markerService.removeAllMarkers(MarkerObjectTypeEnum.FRAGMENT, String.valueOf(id));
|
||||
markMindMapStale(existing.getOwnerTaskNum());
|
||||
log.info("碎片[{}]已删除", id);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user