feat(task-interrupt): 任务「中断+继续」——在跑可停、部分表可下载、已中断可续跑
用户口径(2026-11-03,33179 卡 80%「正在提交检测」的救援出口):任务卡片加
「中断/继续」;中断后已完成检测的数据生成结果文件供下载,未完成行不再检测;
继续在原任务上续跑剩余行(断点续传,已检测行不重检)。
中断(POST /api/tasks/{taskId}/interrupt,鉴权镜像 retry:resolveOwnershipUserId
+归属校验,普通账号只能中断自己名下的任务;终态重按幂等 no-op):
- TaskHeartbeatService.markCancelledByUser:ACTIVE→CANCELLED 条件更新(词表走
TaskStatuses.FileTask 常量),写「用户中断任务,已完成部分可下载」+finished_at,
syncTerminalState 同步模块缓存与进度快照;客户端心跳拿到 notAlive 即协作停止
(app_client/maixiang 零改动,≤60s 自停)。
- LLM 批循环批间查终态即停:当前批跑完不再发新批(isOwningTaskTerminal)。
- 中断任务的组装跳过候选申领/LLM/补检,直接按已有行账出部分表(allowPartial),
状态保持 CANCELLED 不改写,只补行账缺口文案;cleanupResultFileJob 对 CANCELLED
任务保留分片/范围态/瞬态载荷(这就是「继续」的续跑点),常规交付照旧清理。
继续(retry 链路放宽 CANCELLED,全部在原任务上):
- retryInPlace 条件更新放宽 FAILED/CANCELLED;CAS 前经 ResultFileJobHandler
新钩子 onTaskResumed 清模块补检预算(AP:删 __recheck__ 哨兵键;不清则继续后
第一轮就被「预算耗尽」直接按部分表收尾,钩子抛错即中止不留半态)。
- 中断已交付过的:清 result.result_file_url/size(让位给新表)+把 SUCCESS 的
ASSEMBLE_RESULT 作业复位 PENDING(retry/stuck 计数清零、清错误与 finished_at);
FAILED 仍走既有 resetTerminalFailedForRecovery。
- 校验文案「只有失败或已中断的任务可以继续」;成功任务不可继续。
前端(用户端外观专利 Tab 先行,后端端点本身通用):中断按钮进当前/历史两个
动作槽(确认框说明「未完成行不再检测、已完成检测的数据会生成结果文件供下载」);
CANCELLED 显示「已中断」(判定先于 isResultPreparing,不掉「等待中」兜底);
重试按钮文案 CANCELLED→「继续」,继续的确认框警示部分结果文件将被替换请先下载;
轮询收敛集合与 keepPendingFileTask 补 CANCELLED。棘轮:前端 catch 块 310→311
(interruptTaskRecord 一支,两处 ElMessageBox 确认走 .then 两臂不新增 catch);
状态词表全走 TaskStatuses 常量。
测试:TaskHeartbeatServiceTest +4(CAS 落库+缓存同步/终态幂等/非本人 403/
任务不存在明确报错)、TaskInPlaceRetryServiceTest +3(继续复位+作业复位+
补检钩子只对 CANCELLED 触发/成功不可继续)、新增 AppearancePatentInterrupted
ResumeTest(3)(保留分片=续跑点/常规交付照旧清理/中断收尾不改写状态)与
AppearancePatentLlmBatchPipelineInterruptTest(2)(批间终态即停);后端定向
79+22 全绿。前端新增 appearance-patent-interrupt-continue.test.ts(9);npm test
1003/1003、test:mount 55/55、vue-tsc 零错;ops 快检 overall=pass(grep 需
Git usr/bin 在 PATH,两红格系本机 shell 环境非代码红)。
并发边界:同工作树另一会话的在飞件(TaskFileJobService 卡死归属守卫、
TaskResultFileJobWorker、DeliverySupport 补检闸及其 3 支测试、useLiveTaskBoard、
task-delete 三件)未卷入本提交;本提交不依赖其中任何符号(appendDeliveryGapMessage/
resetTerminalFailedForRecovery/registry.asMap 均在 HEAD 已在)。
This commit is contained in:
+125
@@ -0,0 +1,125 @@
|
||||
package com.nanri.aiimage.modules.appearancepatent.service.support;
|
||||
|
||||
import com.nanri.aiimage.modules.appearancepatent.service.AppearancePatentTaskCacheService;
|
||||
import com.nanri.aiimage.modules.task.mapper.FileResultMapper;
|
||||
import com.nanri.aiimage.modules.task.mapper.FileTaskMapper;
|
||||
import com.nanri.aiimage.modules.task.mapper.TaskChunkMapper;
|
||||
import com.nanri.aiimage.modules.task.mapper.TaskScopeStateMapper;
|
||||
import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity;
|
||||
import com.nanri.aiimage.modules.task.model.entity.TaskFileJobEntity;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.extension.ExtendWith;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.junit.jupiter.MockitoExtension;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.contains;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
/**
|
||||
* 用户中断(2026-11-03「中断+继续」)的两条承重墙:
|
||||
*
|
||||
* <ol>
|
||||
* <li><b>中断交付保留分片</b>:结果行只存在分片载荷里,作业 SUCCESS 的常规清理会把
|
||||
* 分片删光——删了它,「继续」就没有续跑点(已检结论在分片里,剩余行靠它们重新入候选)。
|
||||
* 中断交付的任务必须跳过清理,保留到任务被删除或继续跑完整表为止。</li>
|
||||
* <li><b>中断收尾不改任务结论</b>:出表不得把用户亲手落的 CANCELLED 改写成 SUCCESS/FAILED
|
||||
* (铁律 14 同一口径),只把行账缺口补进消息;下载按钮挂 result_file_url,与状态无关。</li>
|
||||
* </ol>
|
||||
*/
|
||||
@ExtendWith(MockitoExtension.class)
|
||||
class AppearancePatentInterruptedResumeTest {
|
||||
|
||||
@Mock private FileTaskMapper fileTaskMapper;
|
||||
@Mock private FileResultMapper fileResultMapper;
|
||||
@Mock private TaskScopeStateMapper taskScopeStateMapper;
|
||||
@Mock private TaskChunkMapper taskChunkMapper;
|
||||
@Mock private AppearancePatentPayloadSupport payloadSupport;
|
||||
@Mock private AppearancePatentDeliverySupport deliverySupport;
|
||||
@Mock private AppearancePatentProgressSupport progressSupport;
|
||||
@Mock private AppearancePatentTaskCacheService taskCacheService;
|
||||
|
||||
@Test
|
||||
void 中断交付的任务保留分片作为继续的续跑点() {
|
||||
AppearancePatentResultJobSupport support = support();
|
||||
when(fileTaskMapper.selectById(33179L)).thenReturn(task("CANCELLED"));
|
||||
|
||||
support.cleanupResultFileJob(job());
|
||||
|
||||
verify(taskChunkMapper, never()).delete(any());
|
||||
verify(taskScopeStateMapper, never()).delete(any());
|
||||
verify(payloadSupport, never()).deleteTransientTaskPayloads(any());
|
||||
}
|
||||
|
||||
@Test
|
||||
void 常规交付仍照旧清理分片() {
|
||||
AppearancePatentResultJobSupport support = support();
|
||||
when(fileTaskMapper.selectById(33179L)).thenReturn(task("RUNNING"));
|
||||
|
||||
support.cleanupResultFileJob(job());
|
||||
|
||||
verify(payloadSupport).deleteTransientTaskPayloads(eq(33179L));
|
||||
verify(taskChunkMapper).delete(any());
|
||||
verify(taskScopeStateMapper).delete(any());
|
||||
}
|
||||
|
||||
@Test
|
||||
void 中断收尾保持CANCELLED并补行账缺口文案() {
|
||||
AppearancePatentResultJobSupport support = support();
|
||||
FileTaskEntity task = task("CANCELLED");
|
||||
task.setErrorMessage("用户中断任务,已完成部分可下载");
|
||||
// (expected=5, judged=3, noData=1, 缺口键 2):与 RecheckProgressMessageTest 的构造口径一致
|
||||
AppearancePatentRowOutcome.Facts facts =
|
||||
new AppearancePatentRowOutcome.Facts(5, 3, 1, List.of("k1", "k2"));
|
||||
when(deliverySupport.appendDeliveryGapMessage(any(), eq(facts))).thenReturn(
|
||||
"用户中断任务,已完成部分可下载;有 2 行未完成检测、有 1 行未采集到数据(结果文件中这些行已单独标注)");
|
||||
|
||||
Boolean delivered = support.finalizeInterruptedDelivery(
|
||||
task, job(), 6, "用户中断任务,已完成部分可下载", facts);
|
||||
|
||||
assertTrue(delivered, "中断交付按部分表收尾,作业走 SUCCESS");
|
||||
ArgumentCaptor<FileTaskEntity> saved = ArgumentCaptor.forClass(FileTaskEntity.class);
|
||||
verify(fileTaskMapper).updateById(saved.capture());
|
||||
assertEquals("CANCELLED", saved.getValue().getStatus(), "出表不得改写用户亲手落的终态");
|
||||
assertTrue(saved.getValue().getErrorMessage().contains("有 2 行未完成检测"));
|
||||
assertTrue(saved.getValue().getErrorMessage().contains("有 1 行未采集到数据"));
|
||||
verify(progressSupport).saveFileBuildProgress(eq(task), eq(job()), eq(6), eq(6), contains("结果文件已生成"));
|
||||
verify(taskCacheService).deleteTaskCache(eq(33179L));
|
||||
}
|
||||
|
||||
private AppearancePatentResultJobSupport support() {
|
||||
// 仅本类三格涉及的协作者给 mock,其余传 null(构造器只赋值,与 RecheckProgressMessageTest 同口径)
|
||||
return new AppearancePatentResultJobSupport(
|
||||
"APPEARANCE_PATENT", 0L, null, null,
|
||||
fileTaskMapper, fileResultMapper, taskScopeStateMapper, taskChunkMapper,
|
||||
taskCacheService, null, null,
|
||||
payloadSupport, null, null, deliverySupport, progressSupport, null,
|
||||
null, null, null, null, null, null, null);
|
||||
}
|
||||
|
||||
private static FileTaskEntity task(String status) {
|
||||
FileTaskEntity task = new FileTaskEntity();
|
||||
task.setId(33179L);
|
||||
task.setModuleType("APPEARANCE_PATENT");
|
||||
task.setStatus(status);
|
||||
return task;
|
||||
}
|
||||
|
||||
private static TaskFileJobEntity job() {
|
||||
TaskFileJobEntity job = new TaskFileJobEntity();
|
||||
job.setId(23815L);
|
||||
job.setTaskId(33179L);
|
||||
job.setResultId(36102L);
|
||||
job.setModuleType("APPEARANCE_PATENT");
|
||||
job.setStatus("RUNNING");
|
||||
return job;
|
||||
}
|
||||
}
|
||||
+149
@@ -0,0 +1,149 @@
|
||||
package com.nanri.aiimage.modules.appearancepatent.service.support;
|
||||
|
||||
import com.nanri.aiimage.config.AppearancePatentProperties;
|
||||
import com.nanri.aiimage.modules.appearancepatent.client.AppearancePatentLlmClient;
|
||||
import com.nanri.aiimage.modules.appearancepatent.model.dto.AppearancePatentResultRowDto;
|
||||
import com.nanri.aiimage.modules.appearancepatent.service.AppearancePatentTaskCacheService;
|
||||
import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity;
|
||||
import com.nanri.aiimage.modules.task.model.entity.TaskChunkEntity;
|
||||
import com.nanri.aiimage.modules.task.model.entity.TaskFileJobEntity;
|
||||
import com.nanri.aiimage.modules.task.service.TaskFileJobService;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.extension.ExtendWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.junit.jupiter.MockitoExtension;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.anyList;
|
||||
import static org.mockito.ArgumentMatchers.anyLong;
|
||||
import static org.mockito.ArgumentMatchers.anyString;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.lenient;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.times;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
/**
|
||||
* 用户中断(2026-11-03)后 LLM 批循环必须收手:当前批跑完、结果合并,下一批不再发——
|
||||
* 继续发只会白扣用户密钥次数。两条:批循环开跑前已终态 ⇒ 零批发;批间变终态 ⇒ 只发已进入的那批。
|
||||
*/
|
||||
@ExtendWith(MockitoExtension.class)
|
||||
class AppearancePatentLlmBatchPipelineInterruptTest {
|
||||
|
||||
private static final Long TASK_ID = 33179L;
|
||||
|
||||
@Mock private AppearancePatentProperties properties;
|
||||
@Mock private AppearancePatentLlmClient llmClient;
|
||||
@Mock private AppearancePatentTaskCacheService taskCacheService;
|
||||
@Mock private TaskFileJobService taskFileJobService;
|
||||
|
||||
private AppearancePatentLlmBatchPipeline pipeline;
|
||||
|
||||
@BeforeEach
|
||||
void setUp() {
|
||||
lenient().when(properties.getLlmBatchSize()).thenReturn(2);
|
||||
pipeline = new AppearancePatentLlmBatchPipeline(
|
||||
properties,
|
||||
llmClient,
|
||||
taskCacheService,
|
||||
taskFileJobService,
|
||||
AppearancePatentLlmBatchPipelineInterruptTest::rowKey,
|
||||
row -> true,
|
||||
chunk -> chunkRows(),
|
||||
taskId -> List.of(chunk()),
|
||||
taskId -> true,
|
||||
taskId -> { },
|
||||
task -> "prompt",
|
||||
task -> "api-key",
|
||||
task -> null,
|
||||
(taskId, scopeHash, chunkIndex, rows) -> List.of(),
|
||||
(preferred, fallback) -> preferred == null || preferred.isBlank() ? fallback : preferred,
|
||||
(task, message) -> { });
|
||||
lenient().when(llmClient.inspectRows(anyList(), anyString(), anyString()))
|
||||
.thenAnswer(invocation -> new ArrayList<>(invocation.getArgument(0)));
|
||||
}
|
||||
|
||||
@Test
|
||||
void 已终态的任务一批都不再发() {
|
||||
FileTaskEntity task = task("CANCELLED");
|
||||
when(taskFileJobService.isOwningTaskTerminal(TASK_ID)).thenReturn(true);
|
||||
// 候选必须真实存在:不 stub 申领则候选为空、循环根本进不去,断言会空转
|
||||
lenient().when(taskCacheService.beginRowInspection(eq(TASK_ID), anyString())).thenReturn(true);
|
||||
|
||||
pipeline.submitLlmBatches(task, null, job(), List.of(chunk()));
|
||||
|
||||
verify(llmClient, never()).inspectRows(anyList(), anyString(), anyString());
|
||||
verify(taskCacheService, never()).touchRowInspection(anyLong(), anyList());
|
||||
verify(taskCacheService, never()).countRowInspectionRound(anyLong(), anyList());
|
||||
}
|
||||
|
||||
@Test
|
||||
void 批间变终态只发已进入的那一批() {
|
||||
FileTaskEntity task = task("CANCELLED");
|
||||
// 第 1 次检查(批 1 前)未终态,第 2 次检查(批 2 前)已中断
|
||||
when(taskFileJobService.isOwningTaskTerminal(TASK_ID)).thenReturn(false, true);
|
||||
// 4 行、批 2 行 ⇒ 两个候选批;只有批 1 真发出去
|
||||
Map<String, AppearancePatentResultRowDto> rows = new LinkedHashMap<>();
|
||||
for (int i = 1; i <= 4; i++) {
|
||||
AppearancePatentResultRowDto row = new AppearancePatentResultRowDto();
|
||||
row.setRowToken("r" + i);
|
||||
row.setAsin("B0A000000" + i);
|
||||
rows.put("r" + i, row);
|
||||
}
|
||||
lenient().when(taskCacheService.beginRowInspection(eq(TASK_ID), anyString())).thenReturn(true);
|
||||
|
||||
pipeline.submitLlmBatches(task, null, job(), List.of(chunk()));
|
||||
|
||||
verify(llmClient, times(1)).inspectRows(anyList(), anyString(), anyString());
|
||||
// 没落库的行撤销处理中标记(批 1 的 keysToRetry),下一轮/继续时能重新申领
|
||||
verify(taskCacheService).releaseRowInspection(eq(TASK_ID), anyList());
|
||||
}
|
||||
|
||||
private static String rowKey(AppearancePatentResultRowDto row) {
|
||||
return row == null || row.getRowToken() == null ? "" : row.getRowToken();
|
||||
}
|
||||
|
||||
private static FileTaskEntity task(String status) {
|
||||
FileTaskEntity task = new FileTaskEntity();
|
||||
task.setId(TASK_ID);
|
||||
task.setModuleType("APPEARANCE_PATENT");
|
||||
task.setUserId(1293L);
|
||||
task.setStatus(status);
|
||||
return task;
|
||||
}
|
||||
|
||||
private static TaskFileJobEntity job() {
|
||||
TaskFileJobEntity job = new TaskFileJobEntity();
|
||||
job.setId(23815L);
|
||||
job.setTaskId(TASK_ID);
|
||||
job.setStatus("RUNNING");
|
||||
return job;
|
||||
}
|
||||
|
||||
private static TaskChunkEntity chunk() {
|
||||
TaskChunkEntity chunk = new TaskChunkEntity();
|
||||
chunk.setTaskId(TASK_ID);
|
||||
chunk.setScopeHash("scope-hash-1");
|
||||
chunk.setChunkIndex(1);
|
||||
return chunk;
|
||||
}
|
||||
|
||||
/** 单片载荷反序列化产物:本测试用同一份行集代表所有分片(行键 r1…r4)。 */
|
||||
private static Map<String, AppearancePatentResultRowDto> chunkRows() {
|
||||
Map<String, AppearancePatentResultRowDto> rows = new LinkedHashMap<>();
|
||||
for (int i = 1; i <= 4; i++) {
|
||||
AppearancePatentResultRowDto row = new AppearancePatentResultRowDto();
|
||||
row.setRowToken("r" + i);
|
||||
row.setAsin("B0A000000" + i);
|
||||
rows.put("r" + i, row);
|
||||
}
|
||||
return rows;
|
||||
}
|
||||
}
|
||||
+77
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.MybatisConfiguration;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.config.SimilarAsinProperties;
|
||||
import com.nanri.aiimage.modules.collectdata.service.CollectDataService;
|
||||
import com.nanri.aiimage.modules.collectdata.service.CollectDataTaskHeartbeatSpi;
|
||||
@@ -30,9 +31,11 @@ import java.util.List;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.anyLong;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.ArgumentMatchers.isNull;
|
||||
import static org.mockito.Mockito.inOrder;
|
||||
import static org.mockito.Mockito.mock;
|
||||
@@ -217,4 +220,78 @@ class TaskHeartbeatServiceTest {
|
||||
// 坏 id 的轮询不能把 Redis 写成垃圾键
|
||||
verify(livenessService, never()).stamp(anyLong());
|
||||
}
|
||||
|
||||
// ---- 用户中断(2026-11-03「中断+继续」)----
|
||||
|
||||
@Test
|
||||
@SuppressWarnings("unchecked")
|
||||
void 用户中断把在跑任务落CANCELLED并同步缓存与快照() {
|
||||
long taskId = 20153L;
|
||||
FileTaskEntity task = runningTask(taskId, "APPEARANCE_PATENT");
|
||||
task.setUserId(1293L);
|
||||
TaskModuleHeartbeatSpi handler = mock(TaskModuleHeartbeatSpi.class);
|
||||
when(handler.moduleType()).thenReturn("APPEARANCE_PATENT");
|
||||
TaskHeartbeatService service = serviceWith(handler);
|
||||
|
||||
when(fileTaskMapper.selectOne(any(LambdaQueryWrapper.class))).thenReturn(task);
|
||||
when(fileTaskMapper.update(isNull(), any(LambdaUpdateWrapper.class))).thenReturn(1);
|
||||
|
||||
TaskHeartbeatVo result = service.markCancelledByUser(taskId, 1293L);
|
||||
|
||||
assertFalse(result.isAlive(), "中断后心跳必须返回不存活:客户端据此置 stop_requested 协作停止");
|
||||
assertEquals("CANCELLED", result.getStatus());
|
||||
verify(fileTaskMapper).update(isNull(), any(LambdaUpdateWrapper.class));
|
||||
// 终态必须同步进模块缓存与进度快照:不刷的话前端一直按 RUNNING 渲染
|
||||
verify(taskProgressSnapshotService).markTerminal(eq(taskId), eq("APPEARANCE_PATENT"), eq("CANCELLED"), any());
|
||||
verify(handler).saveTaskCache(task);
|
||||
}
|
||||
|
||||
@Test
|
||||
@SuppressWarnings("unchecked")
|
||||
void 终态任务重按中断是幂等noop但仍按现值自愈缓存() {
|
||||
long taskId = 20154L;
|
||||
FileTaskEntity task = runningTask(taskId, "APPEARANCE_PATENT");
|
||||
task.setUserId(1293L);
|
||||
task.setStatus("CANCELLED");
|
||||
TaskHeartbeatService service = serviceWith();
|
||||
|
||||
when(fileTaskMapper.selectOne(any(LambdaQueryWrapper.class))).thenReturn(task);
|
||||
when(fileTaskMapper.update(isNull(), any(LambdaUpdateWrapper.class))).thenReturn(0);
|
||||
|
||||
TaskHeartbeatVo result = service.markCancelledByUser(taskId, 1293L);
|
||||
|
||||
assertFalse(result.isAlive());
|
||||
assertEquals("CANCELLED", result.getStatus());
|
||||
verify(fileTaskMapper).update(isNull(), any(LambdaUpdateWrapper.class));
|
||||
// 历史遗留的 RUNNING 缓存按 DB 现值自愈(与 markInterrupted 同一口径)
|
||||
verify(taskProgressSnapshotService).markTerminal(eq(taskId), eq("APPEARANCE_PATENT"), eq("CANCELLED"), any());
|
||||
}
|
||||
|
||||
@Test
|
||||
@SuppressWarnings("unchecked")
|
||||
void 普通账号不能中断别人名下的任务() {
|
||||
long taskId = 20155L;
|
||||
FileTaskEntity task = runningTask(taskId, "APPEARANCE_PATENT");
|
||||
task.setUserId(1293L);
|
||||
TaskHeartbeatService service = serviceWith();
|
||||
|
||||
when(fileTaskMapper.selectOne(any(LambdaQueryWrapper.class))).thenReturn(task);
|
||||
|
||||
BusinessException ex = assertThrows(BusinessException.class,
|
||||
() -> service.markCancelledByUser(taskId, 999L));
|
||||
assertEquals(403, ex.getCode());
|
||||
verify(fileTaskMapper, never()).update(isNull(), any(LambdaUpdateWrapper.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
@SuppressWarnings("unchecked")
|
||||
void 中断不存在的任务明确报错而不是静默() {
|
||||
long taskId = 20156L;
|
||||
TaskHeartbeatService service = serviceWith();
|
||||
|
||||
when(fileTaskMapper.selectOne(any(LambdaQueryWrapper.class))).thenReturn(null);
|
||||
|
||||
assertThrows(BusinessException.class, () -> service.markCancelledByUser(taskId, 1293L));
|
||||
verify(fileTaskMapper, never()).update(isNull(), any(LambdaUpdateWrapper.class));
|
||||
}
|
||||
}
|
||||
|
||||
+91
-1
@@ -2,16 +2,21 @@ package com.nanri.aiimage.modules.task.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.MybatisConfiguration;
|
||||
import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.modules.task.mapper.FileResultMapper;
|
||||
import com.nanri.aiimage.modules.task.mapper.FileTaskMapper;
|
||||
import com.nanri.aiimage.modules.task.mapper.TaskFileJobMapper;
|
||||
import com.nanri.aiimage.modules.task.model.entity.FileResultEntity;
|
||||
import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity;
|
||||
import com.nanri.aiimage.modules.task.model.entity.TaskFileJobEntity;
|
||||
import org.apache.ibatis.builder.MapperBuilderAssistant;
|
||||
import org.junit.jupiter.api.BeforeAll;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.test.util.ReflectionTestUtils;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.anyLong;
|
||||
@@ -19,6 +24,7 @@ import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.ArgumentMatchers.isNull;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.times;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
@@ -37,6 +43,9 @@ class TaskInPlaceRetryServiceTest {
|
||||
FileTaskEntity.class);
|
||||
TableInfoHelper.initTableInfo(new MapperBuilderAssistant(new MybatisConfiguration(), ""),
|
||||
FileResultEntity.class);
|
||||
// 「继续」的作业复位走 TaskFileJobEntity 的 lambda 条件更新,同样要注册元数据
|
||||
TableInfoHelper.initTableInfo(new MapperBuilderAssistant(new MybatisConfiguration(), ""),
|
||||
TaskFileJobEntity.class);
|
||||
}
|
||||
|
||||
private static FileTaskEntity failedTask() {
|
||||
@@ -52,7 +61,15 @@ class TaskInPlaceRetryServiceTest {
|
||||
|
||||
private static TaskInPlaceRetryService service(FileTaskMapper mapper, FileResultMapper results,
|
||||
TaskFileJobService jobs) {
|
||||
TaskInPlaceRetryService svc = new TaskInPlaceRetryService(mapper, results, jobs);
|
||||
// 2026-11-03 起「继续」多带两枚依赖:作业 mapper(复位中断已交付的 SUCCESS 作业)
|
||||
// 与 handler 注册表(清模块补检预算)。失败重试路径不触这两枚,mock 即可。
|
||||
return service(mapper, results, jobs, mock(TaskFileJobMapper.class), mock(ResultFileJobHandlerRegistry.class));
|
||||
}
|
||||
|
||||
private static TaskInPlaceRetryService service(FileTaskMapper mapper, FileResultMapper results,
|
||||
TaskFileJobService jobs, TaskFileJobMapper jobMapper,
|
||||
ResultFileJobHandlerRegistry registry) {
|
||||
TaskInPlaceRetryService svc = new TaskInPlaceRetryService(mapper, results, jobs, jobMapper, registry);
|
||||
ReflectionTestUtils.setField(svc, "fileTaskMapper", mapper);
|
||||
return svc;
|
||||
}
|
||||
@@ -89,4 +106,77 @@ class TaskInPlaceRetryServiceTest {
|
||||
assertFalse(ok);
|
||||
verify(jobs, never()).resetTerminalFailedForRecovery(anyLong(), any(), anyLong());
|
||||
}
|
||||
|
||||
// ---- 「继续」(2026-11-03):已中断任务在原任务上复位 ----
|
||||
|
||||
@Test
|
||||
void 继续把已中断任务复位并清直链复位已交付作业() {
|
||||
FileTaskMapper mapper = mock(FileTaskMapper.class);
|
||||
FileResultMapper results = mock(FileResultMapper.class);
|
||||
TaskFileJobService jobs = mock(TaskFileJobService.class);
|
||||
TaskFileJobMapper jobMapper = mock(TaskFileJobMapper.class);
|
||||
ResultFileJobHandler handler = mock(ResultFileJobHandler.class);
|
||||
ResultFileJobHandlerRegistry registry = mock(ResultFileJobHandlerRegistry.class);
|
||||
when(registry.asMap()).thenReturn(java.util.Map.of("APPEARANCE_PATENT", handler));
|
||||
when(mapper.update(isNull(), any())).thenReturn(1);
|
||||
FileResultEntity result = new FileResultEntity();
|
||||
result.setId(36102L);
|
||||
when(results.selectOne(any())).thenReturn(result);
|
||||
when(jobMapper.selectOne(any())).thenReturn(deliveredJob());
|
||||
|
||||
FileTaskEntity task = failedTask();
|
||||
task.setStatus("CANCELLED");
|
||||
task.setErrorMessage("用户中断任务,已完成部分可下载");
|
||||
boolean ok = service(mapper, results, jobs, jobMapper, registry).retryInPlace(task);
|
||||
|
||||
assertTrue(ok);
|
||||
// 先清模块补检预算:中断交付前往往已烧满,不清则继续后的第一轮就按部分表收尾
|
||||
verify(handler).onTaskResumed(eq(32967L));
|
||||
// 结果行两次 update:清部分结果直链(让位给新表)+清旧错误文案(既有行为)
|
||||
verify(results, times(2)).update(isNull(), any());
|
||||
verify(jobMapper).update(isNull(), any());
|
||||
// 终态失败的复位路径照旧在册
|
||||
verify(jobs).resetTerminalFailedForRecovery(eq(32967L), eq("APPEARANCE_PATENT"), anyLong());
|
||||
}
|
||||
|
||||
@Test
|
||||
void 失败任务重试不触发模块补检预算钩子() {
|
||||
FileTaskMapper mapper = mock(FileTaskMapper.class);
|
||||
FileResultMapper results = mock(FileResultMapper.class);
|
||||
TaskFileJobService jobs = mock(TaskFileJobService.class);
|
||||
ResultFileJobHandler handler = mock(ResultFileJobHandler.class);
|
||||
ResultFileJobHandlerRegistry registry = mock(ResultFileJobHandlerRegistry.class);
|
||||
when(registry.asMap()).thenReturn(java.util.Map.of("APPEARANCE_PATENT", handler));
|
||||
when(mapper.update(isNull(), any())).thenReturn(1);
|
||||
when(results.selectOne(any())).thenReturn(new FileResultEntity());
|
||||
|
||||
service(mapper, results, jobs, mock(TaskFileJobMapper.class), registry).retryInPlace(failedTask());
|
||||
|
||||
// 失败重试的既有行为一字不动:分片没被交付清理过,补检预算本来就没烧
|
||||
verify(handler, never()).onTaskResumed(anyLong());
|
||||
}
|
||||
|
||||
@Test
|
||||
void 成功任务不可继续() {
|
||||
FileTaskMapper mapper = mock(FileTaskMapper.class);
|
||||
FileTaskEntity task = failedTask();
|
||||
task.setStatus("SUCCESS");
|
||||
when(mapper.selectById(32967L)).thenReturn(task);
|
||||
|
||||
TaskInPlaceRetryService svc = service(mapper, mock(FileResultMapper.class), mock(TaskFileJobService.class));
|
||||
|
||||
BusinessException ex = assertThrows(BusinessException.class,
|
||||
() -> svc.retryFailedTask(32967L, 1293L, "APPEARANCE_PATENT"));
|
||||
assertEquals("只有失败或已中断的任务可以继续", ex.getMessage());
|
||||
}
|
||||
|
||||
private static TaskFileJobEntity deliveredJob() {
|
||||
TaskFileJobEntity job = new TaskFileJobEntity();
|
||||
job.setId(23815L);
|
||||
job.setTaskId(32967L);
|
||||
job.setModuleType("APPEARANCE_PATENT");
|
||||
job.setJobType("ASSEMBLE_RESULT");
|
||||
job.setStatus("SUCCESS");
|
||||
return job;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user