From a558e2a08a05911f54ee3afe60a519b6fec2e8db Mon Sep 17 00:00:00 2001 From: cat-shark <1716967236@qq.com> Date: Sat, 10 Oct 2026 10:52:11 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AD=A6=E4=B9=A0=E5=BC=95=E5=AF=BC?= =?UTF-8?q?=E4=B8=8D=E5=86=8D=E5=A4=8D=E7=94=A8=E8=BF=9B=E8=A1=8C=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AiTaskServiceImpl.java | 18 ++++++++++------ .../service/impl/AiTaskServiceImplTest.java | 21 +++++++++++++++++++ 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/guo/learningprogresstracker/service/impl/AiTaskServiceImpl.java b/src/main/java/com/guo/learningprogresstracker/service/impl/AiTaskServiceImpl.java index f2d8e5a..461712f 100644 --- a/src/main/java/com/guo/learningprogresstracker/service/impl/AiTaskServiceImpl.java +++ b/src/main/java/com/guo/learningprogresstracker/service/impl/AiTaskServiceImpl.java @@ -54,12 +54,18 @@ public class AiTaskServiceImpl implements AiTaskService { String targetNum = request.getTargetNum().trim(); - // AI-04:同一目标已有进行中任务时复用,不重复触发生成 - Optional active = findActiveTask(type, targetNum); - if (active.isPresent()) { - log.info("AI 任务复用进行中的任务: type={}, targetNum={}, taskNum={}", - type, targetNum, active.get().getTaskNum()); - return toResponse(active.get()); + // AI-04:同一目标已有进行中任务时复用,不重复触发生成。 + // + // 学习引导例外:它的一轮对话不是幂等操作,而 targetNum 是整段会话,复用会把多轮提交 + // 合并成一次生成;更麻烦的是任务一旦卡在 PENDING/RUNNING,该会话后续每一轮都会复用这个 + // 死任务,表面现象就是「不再触发 LLM」。所以 GUIDANCE 一律新建。 + if (type != AiTaskTypeEnum.GUIDANCE) { + Optional active = findActiveTask(type, targetNum); + if (active.isPresent()) { + log.info("AI 任务复用进行中的任务: type={}, targetNum={}, taskNum={}", + type, targetNum, active.get().getTaskNum()); + return toResponse(active.get()); + } } AiTaskEntity task = AiTaskEntity.initNewTask(type.name(), targetNum, writeJson(request.getParams())); diff --git a/src/test/java/com/guo/learningprogresstracker/service/impl/AiTaskServiceImplTest.java b/src/test/java/com/guo/learningprogresstracker/service/impl/AiTaskServiceImplTest.java index d7dfdc5..6e08635 100644 --- a/src/test/java/com/guo/learningprogresstracker/service/impl/AiTaskServiceImplTest.java +++ b/src/test/java/com/guo/learningprogresstracker/service/impl/AiTaskServiceImplTest.java @@ -108,6 +108,27 @@ class AiTaskServiceImplTest { verify(eventPublisher, never()).publishEvent(any(AiTaskSubmittedEvent.class)); } + @Test + void submit_guidance_doesNotReuseActiveTaskOfSameConversation() throws Exception { + injectDependencies(); + // 学习引导的多轮对话不是幂等操作:同一会话已有进行中任务时也必须新建, + // 否则这一轮会被合并掉(任务卡住时更是所有后续轮次都复用这个死任务)。 + AiTaskEntity running = AiTaskEntity.initNewTask("GUIDANCE", "GUIDANCE-1", null); + running.setId(9); + running.setStatus(AiTaskStatusEnum.RUNNING.name()); + when(aiTaskMapper.selectOne(any(Wrapper.class))).thenReturn(running); + + AiTaskResponse response = service.submit(request("GUIDANCE", "GUIDANCE-1", null)); + + assertNotEquals(running.getTaskNum(), response.getTaskNum(), + "同一会话的新一轮必须新建任务,否则不会触发 LLM"); + assertEquals(AiTaskStatusEnum.PENDING.name(), response.getStatus()); + verify(aiTaskMapper).insert(any(AiTaskEntity.class)); + verify(eventPublisher).publishEvent(any(AiTaskSubmittedEvent.class)); + // 连查询都不该发生:复用逻辑对 GUIDANCE 整体不适用 + verify(aiTaskMapper, never()).selectOne(any(Wrapper.class)); + } + @Test void submit_unknownType_isRejected() { injectDependencies();