From 99290d9faef8aa2940f0e38c065ff2a7a99679dc Mon Sep 17 00:00:00 2001
From: cat-shark <1716967236@qq.com>
Date: Sat, 10 Oct 2026 14:58:14 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=AE=8B=E7=89=87=E5=BD=92=E5=B1=9E?=
=?UTF-8?q?=E6=97=B6=E8=87=AA=E5=8A=A8=E6=89=93=E4=BB=BB=E5=8A=A1=E5=90=8D?=
=?UTF-8?q?=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/MarkerService.java | 9 +
.../service/impl/GuidanceServiceImpl.java | 4 +
.../service/impl/MarkerServiceImpl.java | 21 ++
.../impl/StudyReportFragmentsServiceImpl.java | 23 +-
.../FragmentOwnerTaskTagIntegrationTest.java | 197 ++++++++++++++++++
.../service/impl/GuidanceIntegrationTest.java | 10 +-
.../StudyReportFragmentsServiceImplTest.java | 4 +
7 files changed, 262 insertions(+), 6 deletions(-)
create mode 100644 src/test/java/com/guo/learningprogresstracker/service/impl/FragmentOwnerTaskTagIntegrationTest.java
diff --git a/src/main/java/com/guo/learningprogresstracker/service/MarkerService.java b/src/main/java/com/guo/learningprogresstracker/service/MarkerService.java
index b770fef..1bd5abf 100644
--- a/src/main/java/com/guo/learningprogresstracker/service/MarkerService.java
+++ b/src/main/java/com/guo/learningprogresstracker/service/MarkerService.java
@@ -72,6 +72,15 @@ public interface MarkerService {
*/
void addSystemMarker(MarkerObjectTypeEnum objectType, String objectNum, SystemMarkerEnum marker);
+ /**
+ * 残片获得内容归属时自动打「任务名标签」(闭环-02)。
+ *
+ *
标签名取任务当时的名字,走用户标签;幂等,任务编号为空或任务不存在时不打标。
+ * 任务改名不追溯、删任务时标签保留——因为标签只是带任务名字符串的普通用户标签,
+ * 系统不会主动改写或级联删除它。
+ */
+ void addOwnerTaskNameTag(MarkerObjectTypeEnum objectType, String objectNum, String taskNum);
+
/**
* 对象被删除时清理其标记(例如碎片被删除)。
*/
diff --git a/src/main/java/com/guo/learningprogresstracker/service/impl/GuidanceServiceImpl.java b/src/main/java/com/guo/learningprogresstracker/service/impl/GuidanceServiceImpl.java
index 476aea6..f20e150 100644
--- a/src/main/java/com/guo/learningprogresstracker/service/impl/GuidanceServiceImpl.java
+++ b/src/main/java/com/guo/learningprogresstracker/service/impl/GuidanceServiceImpl.java
@@ -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());
diff --git a/src/main/java/com/guo/learningprogresstracker/service/impl/MarkerServiceImpl.java b/src/main/java/com/guo/learningprogresstracker/service/impl/MarkerServiceImpl.java
index 3b1f355..6dfca2a 100644
--- a/src/main/java/com/guo/learningprogresstracker/service/impl/MarkerServiceImpl.java
+++ b/src/main/java/com/guo/learningprogresstracker/service/impl/MarkerServiceImpl.java
@@ -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.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)) {
diff --git a/src/main/java/com/guo/learningprogresstracker/service/impl/StudyReportFragmentsServiceImpl.java b/src/main/java/com/guo/learningprogresstracker/service/impl/StudyReportFragmentsServiceImpl.java
index f7bcbf7..7c8db96 100644
--- a/src/main/java/com/guo/learningprogresstracker/service/impl/StudyReportFragmentsServiceImpl.java
+++ b/src/main/java/com/guo/learningprogresstracker/service/impl/StudyReportFragmentsServiceImpl.java
@@ -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覆盖口径:创建即有归属、归类(含「升格为新任务」的 PUT 路径)时补打、同名不重复、
+ * 任务改名不追溯、删任务时标签保留。
+ */
+@SpringBootTest
+class FragmentOwnerTaskTagIntegrationTest {
+
+ private static final String USER = "任务名标签集成测试用户";
+
+ private static final AtomicInteger SEQ = new AtomicInteger();
+
+ @Autowired
+ private MarkerService markerService;
+
+ @Autowired
+ private StudyReportFragmentsService fragmentsService;
+
+ @Autowired
+ private StudyReportFragmentsMapper fragmentsMapper;
+
+ @Autowired
+ private StudySessionsMapper studySessionsMapper;
+
+ @Autowired
+ private TasksMapper tasksMapper;
+
+ @Autowired
+ private TasksService tasksService;
+
+ @BeforeEach
+ void setUp() {
+ StpUtil.login(USER, "test_device");
+ }
+
+ private String saveTask(String taskName) {
+ String taskNum = "TASKAT-IT-" + System.nanoTime() + "-" + SEQ.incrementAndGet();
+ TaskEntity task = new TaskEntity();
+ task.setTaskNum(taskNum);
+ task.setTaskName(taskName);
+ tasksMapper.insert(task);
+ return taskNum;
+ }
+
+ /** study_sessions.task_num 非空,所以会话必须挂一个任务;碎片归属仍可另设 */
+ private String saveSession(String taskNum) {
+ StudySessionsEntity session = new StudySessionsEntity();
+ session.setSessionNum(GenerateNumTool.generateNum("SESSAT"));
+ session.setTaskNum(taskNum);
+ session.setStartTime(LocalDateTime.now());
+ session.setLastStartTime(LocalDateTime.now());
+ session.setSessionState("ENDED");
+ studySessionsMapper.insert(session);
+ return session.getSessionNum();
+ }
+
+ private StudyReportFragmentsEntity createFragment(String sessionNum, String content) throws Exception {
+ CreateFragmentsRequest request = new CreateFragmentsRequest();
+ request.setContextNum(sessionNum);
+ request.setContent(content);
+ fragmentsService.createFragments(request);
+ return fragmentsMapper.selectOne(Wrappers.lambdaQuery()
+ .eq(StudyReportFragmentsEntity::getContextNum, sessionNum)
+ .orderByDesc(StudyReportFragmentsEntity::getId)
+ .last("LIMIT 1"));
+ }
+
+ /** 直接落一条待归类碎片,绕开创建路径的默认归属 */
+ private StudyReportFragmentsEntity insertPendingFragment(String sessionNum) {
+ StudyReportFragmentsEntity fragment = new StudyReportFragmentsEntity();
+ fragment.setContextType("SESSION");
+ fragment.setContextNum(sessionNum);
+ fragment.setOwnerTaskNum(null);
+ fragment.setContent("待归类碎片");
+ fragmentsMapper.insert(fragment);
+ return fragment;
+ }
+
+ private List userTagNames(Integer fragmentId) {
+ return markerService.listByObject(MarkerObjectTypeEnum.FRAGMENT, String.valueOf(fragmentId)).stream()
+ .filter(m -> MarkerKindEnum.USER.name().equals(m.getKind()))
+ .map(MarkerEntity::getMarkerName)
+ .sorted()
+ .toList();
+ }
+
+ @Test
+ void createWithOwnership_addsTaskNameTag() throws Exception {
+ String taskNum = saveTask("自动打标-创建");
+ String sessionNum = saveSession(taskNum);
+
+ StudyReportFragmentsEntity fragment = createFragment(sessionNum, "创建即有归属");
+
+ assertEquals(taskNum, fragment.getOwnerTaskNum());
+ assertEquals(List.of("自动打标-创建"), userTagNames(fragment.getId()));
+ }
+
+ @Test
+ void assignOwnership_addsTagAndDoesNotDuplicate() throws Exception {
+ String taskA = saveTask("自动打标-任务A");
+ String taskB = saveTask("自动打标-任务B");
+ String sessionNum = saveSession(taskA);
+ StudyReportFragmentsEntity fragment = createFragment(sessionNum, "归类");
+
+ fragmentsService.assignOwnership(fragment.getId(), taskB);
+
+ List tags = userTagNames(fragment.getId());
+ assertTrue(tags.contains("自动打标-任务A"), "原任务标签保留、不追溯改写");
+ assertTrue(tags.contains("自动打标-任务B"), "新归属补打任务名标签");
+
+ // 再次归到同一任务:幂等,同名标签不重复
+ fragmentsService.assignOwnership(fragment.getId(), taskB);
+ List again = userTagNames(fragment.getId());
+ assertEquals(2, again.size(), "同名用户标签不重复插入");
+ assertEquals(tags, again);
+ }
+
+ @Test
+ void updateFragmentsSettingOwnership_addsTag() throws Exception {
+ // 「升格为新任务」的归类走 PUT /report-fragments/{id}
+ String anchorTask = saveTask("自动打标-锚点任务");
+ String sessionNum = saveSession(anchorTask);
+ StudyReportFragmentsEntity fragment = insertPendingFragment(sessionNum);
+ assertTrue(userTagNames(fragment.getId()).isEmpty(), "碎片无归属时不打标");
+
+ String newTask = saveTask("自动打标-升格任务");
+ UpdateFragmentsRequest request = new UpdateFragmentsRequest();
+ request.setOwnerTaskNum(newTask);
+ fragmentsService.updateFragments(fragment.getId(), request);
+
+ assertEquals(List.of("自动打标-升格任务"), userTagNames(fragment.getId()));
+ }
+
+ @Test
+ void taskRename_doesNotChangeHistoricalTag() throws Exception {
+ String taskNum = saveTask("自动打标-改名前");
+ String sessionNum = saveSession(taskNum);
+ StudyReportFragmentsEntity fragment = createFragment(sessionNum, "改名测试");
+ assertEquals(List.of("自动打标-改名前"), userTagNames(fragment.getId()));
+
+ TaskEntity task = tasksMapper.selectOne(
+ Wrappers.lambdaQuery().eq(TaskEntity::getTaskNum, taskNum));
+ task.setTaskName("自动打标-改名后");
+ tasksMapper.updateById(task);
+
+ assertEquals(List.of("自动打标-改名前"), userTagNames(fragment.getId()),
+ "任务改名不回溯改写历史碎片上的标签");
+ }
+
+ @Test
+ void deleteTask_keepsTaskNameTag() throws Exception {
+ String taskNum = saveTask("自动打标-将被删除");
+ String sessionNum = saveSession(taskNum);
+ StudyReportFragmentsEntity fragment = createFragment(sessionNum, "删任务后保留标签");
+ assertEquals(List.of("自动打标-将被删除"), userTagNames(fragment.getId()));
+
+ TaskEntity task = tasksMapper.selectOne(
+ Wrappers.lambdaQuery().eq(TaskEntity::getTaskNum, taskNum));
+ tasksService.deleteTask(String.valueOf(task.getId()));
+
+ StudyReportFragmentsEntity after = fragmentsMapper.selectById(fragment.getId());
+ assertNull(after.getOwnerTaskNum(), "碎片进入待归类");
+ assertEquals(List.of("自动打标-将被删除"), userTagNames(fragment.getId()),
+ "删任务不级联删除标签");
+ }
+}
diff --git a/src/test/java/com/guo/learningprogresstracker/service/impl/GuidanceIntegrationTest.java b/src/test/java/com/guo/learningprogresstracker/service/impl/GuidanceIntegrationTest.java
index b9aa1a7..5d5d9e7 100644
--- a/src/test/java/com/guo/learningprogresstracker/service/impl/GuidanceIntegrationTest.java
+++ b/src/test/java/com/guo/learningprogresstracker/service/impl/GuidanceIntegrationTest.java
@@ -112,11 +112,17 @@ class GuidanceIntegrationTest {
// 带「来自学习引导」系统标记,且对用户可见、不可删
var markers = markerService.listByObject(
MarkerObjectTypeEnum.FRAGMENT, String.valueOf(fragment.getId()));
- assertEquals(1, markers.size());
- MarkerEntity marker = markers.get(0);
+ MarkerEntity marker = markers.stream()
+ .filter(MarkerEntity::isSystemMarker)
+ .findFirst()
+ .orElseThrow(() -> new AssertionError("应有「来自学习引导」系统标记"));
assertEquals(MarkerKindEnum.SYSTEM.name(), marker.getKind());
assertEquals("来源", marker.getMarkerName());
assertEquals("学习引导", marker.getMarkerValue());
+ // 闭环-02:默认内容归属同时带来一条任务名用户标签
+ assertTrue(markers.stream().anyMatch(m -> MarkerKindEnum.USER.name().equals(m.getKind())
+ && "学习引导测试任务".equals(m.getMarkerName())),
+ "引导产出的碎片也应自动带任务名标签");
// 会话被标记为结束
assertTrue(Boolean.TRUE.equals(
diff --git a/src/test/java/com/guo/learningprogresstracker/service/impl/StudyReportFragmentsServiceImplTest.java b/src/test/java/com/guo/learningprogresstracker/service/impl/StudyReportFragmentsServiceImplTest.java
index 5f2ec58..0150615 100644
--- a/src/test/java/com/guo/learningprogresstracker/service/impl/StudyReportFragmentsServiceImplTest.java
+++ b/src/test/java/com/guo/learningprogresstracker/service/impl/StudyReportFragmentsServiceImplTest.java
@@ -7,6 +7,7 @@ import com.guo.learningprogresstracker.entity.StudyReportFragmentsEntity;
import com.guo.learningprogresstracker.entity.StudySessionsEntity;
import com.guo.learningprogresstracker.exception.NotFindEntitiesException;
import com.guo.learningprogresstracker.mapper.StudySessionsMapper;
+import com.guo.learningprogresstracker.service.MarkerService;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.InjectMocks;
@@ -35,6 +36,9 @@ class StudyReportFragmentsServiceImplTest {
@Mock
private StudySessionsMapper studySessionsMapper;
+ @Mock
+ private MarkerService markerService;
+
private CreateFragmentsRequest createRequest(String sessionNum, String content) {
CreateFragmentsRequest request = new CreateFragmentsRequest();
request.setContextNum(sessionNum);