feat(task-retry): 失败任务改为原任务上重试 + 重试按钮(用户拍板)

用户口径(2026-11-01):失败不再自动克隆(一单失败几次就多几行结果),
改成「删除」旁边的「重试」按钮,在原任务上断点续传;自动重试也只复位原任务。

- 新增 TaskInPlaceRetryService:FAILED→PENDING,清错误/终态时间,代数+1,
  保留分片/解析载荷/已检测标记;结果行清错误、组装作业复位(含卡死重排计数清零)
- TaskResumeService 自动重试改为调用原地复位(不再 cloneForRetry)
- TaskRetryEligibility 新增 DELIVERY(结果文件生成多次失败/卡死重排不重试)
- 新端点 POST /api/appearance-patent/tasks/{id}/retry;前端失败任务显示重试按钮
- ⚠ 本笔的 BrandAppearancePatentTab.vue 里另含他路在飞的「删除失败任务时一并删任务行」
  两小段(同一文件无法分块提交),随本笔一并入库
- 用例:TaskInPlaceRetryServiceTest 2、TaskResumeServiceTest 19、Eligibility 9、
  契约 8、前端 catch 棘轮 4,均绿
This commit is contained in:
2026-11-01 00:30:51 +08:00
parent 0dfd385c4c
commit 0a467793ac
10 changed files with 329 additions and 30 deletions
@@ -81,7 +81,7 @@ class ResultSuccessTimingContractTest {
doAnswer(invocation -> null)
.when(appearancePatentTaskService).submitResult(eq(TASK_ID), any(AppearancePatentSubmitResultRequest.class));
ApiResponse<Void> response = new AppearancePatentController(appearancePatentTaskService, new TaskProgressOwnershipSupport(null), null)
ApiResponse<Void> response = new AppearancePatentController(appearancePatentTaskService, new TaskProgressOwnershipSupport(null), null, null)
.result(TASK_ID, new AppearancePatentSubmitResultRequest(), mock(HttpServletResponse.class));
assertTrue(response.isSuccess(), "success=true");
@@ -154,7 +154,7 @@ class ResultSuccessTimingContractTest {
order.add("service-submit");
return null;
}).when(appearancePatentTaskService).submitResult(eq(TASK_ID), any(AppearancePatentSubmitResultRequest.class));
AppearancePatentController controller = new AppearancePatentController(appearancePatentTaskService, new TaskProgressOwnershipSupport(null), null);
AppearancePatentController controller = new AppearancePatentController(appearancePatentTaskService, new TaskProgressOwnershipSupport(null), null, null);
ApiResponse<Void> response = controller.result(TASK_ID, new AppearancePatentSubmitResultRequest(),
mock(HttpServletResponse.class));
@@ -0,0 +1,92 @@
package com.nanri.aiimage.modules.task.service;
import com.baomidou.mybatisplus.core.MybatisConfiguration;
import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
import com.nanri.aiimage.modules.task.mapper.FileResultMapper;
import com.nanri.aiimage.modules.task.mapper.FileTaskMapper;
import com.nanri.aiimage.modules.task.model.entity.FileResultEntity;
import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity;
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.assertFalse;
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.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
/**
* 失败任务「在原任务上重试」(2026-11-01 用户拍板):不再克隆新任务。
*
* <p>现网 32967→33001→33017 是克隆重试链:同一份输入失败一次就多一行结果,用户看到
* 「失败一次出一个结果」。本用例钉住新口径:复位的是**同一条任务行**,分片/解析载荷不动,
* 组装作业一并复位;只有 FAILED 才动作,重复点击幂等。
*/
class TaskInPlaceRetryServiceTest {
@BeforeAll
static void initMybatisPlusTableInfo() {
TableInfoHelper.initTableInfo(new MapperBuilderAssistant(new MybatisConfiguration(), ""),
FileTaskEntity.class);
TableInfoHelper.initTableInfo(new MapperBuilderAssistant(new MybatisConfiguration(), ""),
FileResultEntity.class);
}
private static FileTaskEntity failedTask() {
FileTaskEntity task = new FileTaskEntity();
task.setId(32967L);
task.setModuleType("APPEARANCE_PATENT");
task.setUserId(1293L);
task.setStatus("FAILED");
task.setErrorMessage("已收到 73 个结果分片,但结果文件生成多次失败,任务已自动结束");
task.setResumeAttempt(0);
return task;
}
private static TaskInPlaceRetryService service(FileTaskMapper mapper, FileResultMapper results,
TaskFileJobService jobs) {
TaskInPlaceRetryService svc = new TaskInPlaceRetryService(mapper, results, jobs);
ReflectionTestUtils.setField(svc, "fileTaskMapper", mapper);
return svc;
}
@Test
void 失败任务必须原地复位而不是新建任务() {
FileTaskMapper mapper = mock(FileTaskMapper.class);
FileResultMapper results = mock(FileResultMapper.class);
TaskFileJobService jobs = mock(TaskFileJobService.class);
when(mapper.update(isNull(), any())).thenReturn(1);
FileResultEntity result = new FileResultEntity();
result.setId(35888L);
when(results.selectOne(any())).thenReturn(result);
boolean ok = service(mapper, results, jobs).retryInPlace(failedTask());
assertTrue(ok);
// 复位的是原任务行:没有 insert,只有一次条件更新(FAILED → PENDING)
verify(mapper, never()).insert(any(FileTaskEntity.class));
verify(mapper).update(isNull(), any());
// 组装作业一并复位,否则上一次「连续 20 次卡死重排」会立刻把重试再判死
verify(jobs).resetTerminalFailedForRecovery(eq(32967L), eq("APPEARANCE_PATENT"), eq(35888L));
}
@Test
void 状态已不是FAILED时不动_重复点击幂等() {
FileTaskMapper mapper = mock(FileTaskMapper.class);
FileResultMapper results = mock(FileResultMapper.class);
TaskFileJobService jobs = mock(TaskFileJobService.class);
when(mapper.update(isNull(), any())).thenReturn(0);
boolean ok = service(mapper, results, jobs).retryInPlace(failedTask());
assertFalse(ok);
verify(jobs, never()).resetTerminalFailedForRecovery(anyLong(), any(), anyLong());
}
}
@@ -68,7 +68,22 @@ class TaskResumeServiceTest {
private static TaskResumeService service(FileTaskMapper mapper, TaskFileJobService jobs,
List<ClientTaskRetrySpi> handlers,
boolean enabled, int maxAttempt) {
TaskResumeService service = new TaskResumeService(mapper, jobs, handlers);
return service(mapper, jobs, handlers, enabled, maxAttempt, true);
}
private static TaskResumeService service(FileTaskMapper mapper, TaskFileJobService jobs,
List<ClientTaskRetrySpi> handlers,
boolean enabled, int maxAttempt, boolean retrySucceeds) {
TaskInPlaceRetryService inPlace = mock(TaskInPlaceRetryService.class);
when(inPlace.retryInPlace(any())).thenReturn(retrySucceeds);
return service(mapper, jobs, inPlace, handlers, enabled, maxAttempt);
}
private static TaskResumeService service(FileTaskMapper mapper, TaskFileJobService jobs,
TaskInPlaceRetryService inPlace,
List<ClientTaskRetrySpi> handlers,
boolean enabled, int maxAttempt) {
TaskResumeService service = new TaskResumeService(mapper, jobs, inPlace, handlers);
ReflectionTestUtils.setField(service, "enabled", enabled);
ReflectionTestUtils.setField(service, "maxAttempt", maxAttempt);
ReflectionTestUtils.setField(service, "windowMinutes", 30L);
@@ -98,15 +113,13 @@ class TaskResumeServiceTest {
when(mapper.selectCount(any())).thenReturn(0L);
ClientTaskRetrySpi spi = mock(ClientTaskRetrySpi.class);
when(spi.moduleType()).thenReturn("SIMILAR_ASIN");
when(spi.cloneForRetry(any())).thenReturn(9001L);
TaskResumeService service = service(mapper, List.of(spi), true, 3);
TaskResumeService.ResumeStats stats = service.resumeInterruptedTasks();
assertEquals(1, stats.scannedTaskCount);
assertEquals(1, stats.resumedTaskCount);
assertEquals(List.of(9001L), stats.retriedTaskIds);
verify(spi).cloneForRetry(any());
assertEquals(List.of(28587L), stats.retriedTaskIds);
}
@Test
@@ -125,7 +138,6 @@ class TaskResumeServiceTest {
assertEquals(2, stats.scannedTaskCount);
assertEquals(2, stats.forceMajeureSkippedCount);
assertEquals(0, stats.resumedTaskCount);
verify(spi, never()).cloneForRetry(any());
}
@Test
@@ -143,7 +155,6 @@ class TaskResumeServiceTest {
assertEquals(1, stats.skippedTaskCount);
assertEquals(0, stats.resumedTaskCount);
verify(spi, never()).cloneForRetry(any());
}
/**
@@ -169,7 +180,6 @@ class TaskResumeServiceTest {
assertEquals(1, stats.scannedTaskCount);
assertEquals(1, stats.skippedTaskCount);
assertEquals(0, stats.resumedTaskCount);
verify(spi, never()).cloneForRetry(any());
}
@Test
@@ -186,7 +196,6 @@ class TaskResumeServiceTest {
TaskResumeService.ResumeStats stats = service.resumeInterruptedTasks();
assertEquals(1, stats.skippedTaskCount);
verify(spi, never()).cloneForRetry(any());
}
@Test
@@ -212,15 +221,18 @@ class TaskResumeServiceTest {
}
@Test
void 克隆失败只计入失败数不抛出() {
void 复位失败只计入失败数不抛出() {
FileTaskMapper mapper = mock(FileTaskMapper.class);
when(mapper.selectList(any())).thenReturn(List.of(
failedTask(28587L, "SIMILAR_ASIN", "任务心跳超时,已自动失败")));
when(mapper.selectCount(any())).thenReturn(0L);
ClientTaskRetrySpi spi = mock(ClientTaskRetrySpi.class);
when(spi.moduleType()).thenReturn("SIMILAR_ASIN");
doThrow(new RuntimeException("库挂了")).when(spi).cloneForRetry(any());
TaskResumeService service = service(mapper, List.of(spi), true, 3);
RuntimeException boom = new RuntimeException("库挂了");
TaskInPlaceRetryService inPlace = mock(TaskInPlaceRetryService.class);
when(inPlace.retryInPlace(any())).thenThrow(boom);
TaskResumeService service = service(mapper, mock(TaskFileJobService.class), inPlace,
List.of(spi), true, 3);
TaskResumeService.ResumeStats stats = service.resumeInterruptedTasks();
@@ -255,7 +267,6 @@ class TaskResumeServiceTest {
TaskResumeService.ResumeStats stats = service.resumeInterruptedTasks();
assertEquals(1, stats.skippedTaskCount);
verify(spi, never()).cloneForRetry(any());
}
/** 开关关着时,统计必须说"本轮没跑",不能长得像"跑了但没活"。 */
@@ -310,7 +321,6 @@ class TaskResumeServiceTest {
assertTrue(stats.dryRun);
assertEquals(List.of(28587L), stats.candidateTaskIds);
assertEquals(0, stats.resumedTaskCount);
verify(spi, never()).cloneForRetry(any());
}
@Test
@@ -321,13 +331,12 @@ class TaskResumeServiceTest {
when(mapper.selectCount(any())).thenReturn(0L);
ClientTaskRetrySpi spi = mock(ClientTaskRetrySpi.class);
when(spi.moduleType()).thenReturn("SIMILAR_ASIN");
when(spi.cloneForRetry(any())).thenReturn(9001L);
TaskResumeService service = service(mapper, List.of(spi), false, 3);
TaskResumeService.ResumeStats stats = service.retryFailedTasks(36, 200, false, null);
assertEquals(1, stats.resumedTaskCount);
assertEquals(List.of(9001L), stats.retriedTaskIds);
assertEquals(List.of(28587L), stats.retriedTaskIds);
}
private static FileTaskEntity liveChild(Long id, Long originId, String status) {
@@ -369,7 +378,6 @@ class TaskResumeServiceTest {
assertEquals(1, stats.stoppedDuplicateChildCount);
verify(mapper).update(any(), any());
verify(spi, never()).cloneForRetry(any());
}
/** 反向对照:原件还是老实的 FAILED(重试的正常形态)时,一条都不许停——否则整个重试机制自己把自己掐了。 */