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
@@ -36,6 +36,7 @@ import java.net.URI;
import java.nio.charset.StandardCharsets;
import com.nanri.aiimage.modules.task.model.dto.TaskProgressLightRequest;
import com.nanri.aiimage.modules.task.model.vo.TaskProgressLightBatchVo;
import com.nanri.aiimage.modules.task.service.TaskInPlaceRetryService;
import com.nanri.aiimage.modules.task.service.TaskProgressOwnershipSupport;
@RestController
@@ -47,6 +48,7 @@ public class AppearancePatentController {
private final AppearancePatentTaskService service;
private final TaskProgressOwnershipSupport progressOwnershipSupport;
private final TaskInPlaceRetryService taskRetryService;
private final AdminAuthSupport adminAuthSupport;
@PostMapping("/parse")
@@ -153,6 +155,21 @@ public class AppearancePatentController {
return ApiResponse.success(null);
}
@PostMapping("/tasks/{taskId}/retry")
@Operation(summary = "重试失败任务",
description = "在原任务上复位重试:保留已收结果分片、解析载荷与已检测标记(断点续传),"
+ "不创建新任务。只有 FAILED 状态可重试。")
public ApiResponse<Void> retryTask(
@Parameter(description = "外观专利检测任务 ID。", required = true, example = "3938")
@PathVariable Long taskId,
@Parameter(description = "当前用户 ID,必须与创建任务的用户一致。", required = true, example = "1")
@RequestParam("user_id") Long userId,
HttpServletRequest httpRequest) {
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
taskRetryService.retryFailedTask(taskId, userId, AppearancePatentTaskService.MODULE_TYPE);
return ApiResponse.success(null);
}
@DeleteMapping("/history/{resultId}")
@Operation(summary = "删除历史记录", description = "删除当前用户的一条外观专利检测历史记录。只删除 biz_file_result 记录,不主动删除任务主记录。")
public ApiResponse<Void> deleteHistory(
@@ -146,6 +146,9 @@ public class TaskFileJobService {
.eq(TaskFileJobEntity::getId, existing.getId())
.set(TaskFileJobEntity::getStatus, "PENDING")
.set(TaskFileJobEntity::getRetryCount, 0)
// 卡死重排计数一并清零:不清的话,上一次「连续 20 次卡死重排」会把刚复位的
// 作业立刻再判死(2026-11-01 用户重试按钮的现场就是这条计数打满)。
.set(TaskFileJobEntity::getStuckRequeueCount, 0)
.set(TaskFileJobEntity::getErrorMessage, null)
.set(TaskFileJobEntity::getFinishedAt, null)
.set(TaskFileJobEntity::getTerminalCallbackAt, null)
@@ -0,0 +1,131 @@
package com.nanri.aiimage.modules.task.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.nanri.aiimage.common.task.TaskStatuses;
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 lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
/**
* 失败任务「在原任务上重试」的唯一出口(2026-11-01 用户拍板)。
*
* <p>用户口径:失败任务不再克隆重试——克隆会让同一份输入在界面上变成好几行结果
* (现网 32967→33001→33017 就是这样:三代克隆、三行「结果文件生成多次失败」)。
* 重试必须落在**原任务**上:保留解析载荷、已收分片、已检测标记,把状态从 FAILED 复位成
* PENDING 让执行方接着跑——这就是断点续传,而不是从头再采一遍。
*
* <p>只动三样东西:
* <ul>
* <li>任务头:FAILED → PENDING,清 error_message / finished_at,代数 +1;</li>
* <li>结果行:清上一次的错误文案(结果文件 URL 保留,新文件生成后会覆盖;</li>
* <li>组装作业:终态失败的 ASSEMBLE_RESULT 复位成 PENDING(含卡死重排计数清零)。</li>
* </ul>
* 分片、scope 状态、解析载荷一律不动——它们就是续跑点。
*/
@Slf4j
@Service
@RequiredArgsConstructor
public class TaskInPlaceRetryService {
private static final String STATUS_FAILED = "FAILED";
private static final String STATUS_PENDING = "PENDING";
private final FileTaskMapper fileTaskMapper;
private final FileResultMapper fileResultMapper;
private final TaskFileJobService taskFileJobService;
/**
* 把一条失败任务复位成待执行。幂等:只有当前状态确实是 FAILED 才动作。
*
* @return true=已复位;false=状态已不是 FAILED(并发或已重试过)
*/
public boolean retryInPlace(FileTaskEntity task) {
if (task == null || task.getId() == null) {
return false;
}
int attempt = task.getResumeAttempt() == null ? 0 : task.getResumeAttempt();
LocalDateTime now = LocalDateTime.now();
int updated = fileTaskMapper.update(null, new LambdaUpdateWrapper<FileTaskEntity>()
.eq(FileTaskEntity::getId, task.getId())
.eq(FileTaskEntity::getStatus, STATUS_FAILED)
.set(FileTaskEntity::getStatus, STATUS_PENDING)
.set(FileTaskEntity::getErrorMessage, null)
.set(FileTaskEntity::getFinishedAt, null)
.set(FileTaskEntity::getResumeAttempt, attempt + 1)
.set(FileTaskEntity::getUpdatedAt, now));
if (updated == 0) {
log.info("[task-retry] 状态已不是 FAILED,跳过复位 taskId={}", task.getId());
return false;
}
clearResultError(task.getId(), task.getModuleType());
resetAssembleJob(task.getId(), task.getModuleType());
log.info("[task-retry] 已在原任务上复位重试 taskId={} moduleType={} 代数={} 上次失败={}",
task.getId(), task.getModuleType(), attempt + 1, abbreviate(task.getErrorMessage()));
return true;
}
/**
* 用户点「重试」的入口:校验归属与状态后原地复位。
*
* @throws com.nanri.aiimage.common.exception.BusinessException 任务不存在 / 不是失败态 / 状态已变
*/
public void retryFailedTask(Long taskId, Long userId, String moduleType) {
FileTaskEntity task = fileTaskMapper.selectById(taskId);
if (task == null || !moduleType.equals(task.getModuleType())
|| !java.util.Objects.equals(userId, task.getUserId())) {
throw new com.nanri.aiimage.common.exception.BusinessException("任务不存在");
}
if (!STATUS_FAILED.equals(task.getStatus())) {
throw new com.nanri.aiimage.common.exception.BusinessException("只有失败的任务可以重试");
}
if (!retryInPlace(task)) {
throw new com.nanri.aiimage.common.exception.BusinessException("任务状态已变化,请刷新后再试");
}
}
/** 结果行只清错误文案:URL 留着(上一份可能已经可用),新文件生成后自然覆盖。 */
private void clearResultError(Long taskId, String moduleType) {
try {
fileResultMapper.update(null, new LambdaUpdateWrapper<FileResultEntity>()
.eq(FileResultEntity::getTaskId, taskId)
.eq(FileResultEntity::getModuleType, moduleType)
.set(FileResultEntity::getErrorMessage, null)
.set(FileResultEntity::getUpdatedAt, LocalDateTime.now()));
} catch (RuntimeException ex) {
// 结果行清不掉不阻断重试:它只影响界面旧文案,任务本身照样能重跑
log.warn("[task-retry] 清理结果行错误失败(忽略) taskId={} err={}", taskId, ex.getMessage());
}
}
/** 组装作业复位:终态失败的那条(retryCount 打满)重新排队,卡死重排计数一并清零。 */
private void resetAssembleJob(Long taskId, String moduleType) {
try {
FileResultEntity result = fileResultMapper.selectOne(new LambdaQueryWrapper<FileResultEntity>()
.eq(FileResultEntity::getTaskId, taskId)
.eq(FileResultEntity::getModuleType, moduleType)
.orderByAsc(FileResultEntity::getId)
.last("limit 1"));
if (result == null) {
return;
}
taskFileJobService.resetTerminalFailedForRecovery(taskId, moduleType, result.getId());
} catch (RuntimeException ex) {
log.warn("[task-retry] 复位组装作业失败(忽略) taskId={} err={}", taskId, ex.getMessage());
}
}
private static String abbreviate(String text) {
if (text == null) {
return "";
}
String one = text.replace('\n', ' ').trim();
return one.length() <= 80 ? one : one.substring(0, 80) + "…";
}
}
@@ -70,8 +70,10 @@ public class TaskResumeService {
* {@link TaskFileJobService#hasUnfinishedAssembleJob(Long)}。
*/
private final TaskFileJobService taskFileJobs;
/** moduleType → 克隆重试实现;只有注册了本 SPI 的模块才会自动重试。 */
/** moduleType → 克隆重试实现;只有注册了本 SPI 的模块才会自动重试(SPI 现在只作「支持重试」白名单用)。 */
private final Map<String, ClientTaskRetrySpi> retryHandlers;
/** 原任务原地复位(2026-11-01 用户拍板:不再克隆,重试必须落在原任务上)。 */
private final TaskInPlaceRetryService inPlaceRetry;
/**
* 续跑总开关。默认值必须与 {@code application.yml} 的
@@ -93,9 +95,11 @@ public class TaskResumeService {
public TaskResumeService(FileTaskMapper fileTaskMapper,
TaskFileJobService taskFileJobs,
TaskInPlaceRetryService inPlaceRetry,
List<ClientTaskRetrySpi> retrySpiHandlers) {
this.fileTaskMapper = fileTaskMapper;
this.taskFileJobs = taskFileJobs;
this.inPlaceRetry = inPlaceRetry;
Map<String, ClientTaskRetrySpi> retryIndex = new LinkedHashMap<>();
if (retrySpiHandlers != null) {
for (ClientTaskRetrySpi handler : retrySpiHandlers) {
@@ -243,21 +247,22 @@ public class TaskResumeService {
continue;
}
try {
Long childTaskId = handler.cloneForRetry(original);
if (childTaskId == null) {
// 2026-11-01 用户拍板:不再克隆新任务,重试落回原任务(保留分片/解析/检测标记
// = 断点续传)。克隆会让同一份输入在界面上多出好几行(现网 32967→33001→33017)。
if (!inPlaceRetry.retryInPlace(original)) {
stats.cloneFailedCount++;
log.warn("[task-resume] 克隆返回空(缺解析输入) taskId={} moduleType={}",
log.warn("[task-resume] 原任务复位未生效(状态已变) taskId={} moduleType={}",
original.getId(), original.getModuleType());
continue;
}
stats.resumedTaskCount++;
stats.retriedTaskIds.add(childTaskId);
log.warn("[task-resume] 已克隆重试任务 original={} new={} moduleType={} userId={} 代数={}/{} 失败原因={}",
original.getId(), childTaskId, original.getModuleType(), original.getUserId(),
stats.retriedTaskIds.add(original.getId());
log.warn("[task-resume] 已在原任务上复位重试 taskId={} moduleType={} userId={} 代数={}/{} 失败原因={}",
original.getId(), original.getModuleType(), original.getUserId(),
attempt + 1, maxAttempt, abbreviate(original.getErrorMessage()));
} catch (Exception ex) {
stats.cloneFailedCount++;
log.error("[task-resume] 克隆重试任务失败 taskId={} moduleType={} err={}",
log.error("[task-resume] 复位重试原任务失败 taskId={} moduleType={} err={}",
original.getId(), original.getModuleType(), ex.getMessage(), ex);
}
}
@@ -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(重试的正常形态)时,一条都不许停——否则整个重试机制自己把自己掐了。 */