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:
2026-11-03 02:07:48 +08:00
parent 37f51df37d
commit f43ed6f116
17 changed files with 917 additions and 44 deletions
@@ -40,6 +40,13 @@ public class AppearancePatentResultFileJobHandler implements ResultFileJobHandle
return appearancePatentTaskService.fallbackAssembleResultFile(job);
}
@Override
public void onTaskResumed(Long taskId) {
// 「继续」在原任务上复位后:清交付缺口补检的轮次预算。中断交付路径会把预算烧满,
// 不复位的话继续后的第一轮就按部分表收尾,剩余行永远轮不到补检。
appearancePatentTaskService.resetRecheckBudgetForResume(taskId);
}
@Override
public boolean supportsAsyncOffload() {
return true;
@@ -199,6 +199,18 @@ public class AppearancePatentTaskCacheService extends AbstractPendingRowTaskCach
countRowInspectionRound(taskId, List.of(RECHECK_ROUND_KEY));
}
/**
* 「继续」(中断任务在原任务上复位)专用:清交付缺口补检的轮次预算,让复位后的任务
* 重新有补检轮可用。刻意不吞 Redis 异常(静默 catch 台账只许减):失败即中止继续,
* 调用方在任务 CAS 之前调用本方法,此刻任务一行未动。
*/
public void resetRecheckRounds(Long taskId) {
if (taskId == null || taskId <= 0) {
return;
}
stringRedisTemplate.delete(rowRoundsKey(taskId, RECHECK_ROUND_KEY));
}
private String rowRoundsKey(Long taskId, String rowKey) {
return "appearance-patent:task:row-rounds:" + taskId + ":" + rowKey;
}
@@ -85,6 +85,14 @@ public class AppearancePatentTaskService extends AbstractFileTaskPipeline<Appear
public TaskProgressLightBatchVo progressLight(List<Long> taskIds, Long userId) {
return progressSupport().progressLight(taskIds, userId);
}
/**
* 「继续」(中断任务在原任务上复位)专用:清交付缺口补检的轮次预算。Redis 异常刻意不吞
* (静默 catch 台账只许减)——失败即中止继续,此刻任务一行未动,用户重按一次即可。
*/
public void resetRecheckBudgetForResume(Long taskId) {
taskCacheService.resetRecheckRounds(taskId);
}
private static final String STATUS_RUNNING = "RUNNING";
private static final String STATUS_SUCCESS = "SUCCESS";
private static final String STATUS_FAILED = "FAILED";
@@ -173,6 +173,14 @@ public class AppearancePatentLlmBatchPipeline {
int batchIndex = 1;
String fatalLlmMessage = null;
for (int i = 0; i < submitLimit; i += batchSize) {
if (taskFileJobService.isOwningTaskTerminal(task.getId())) {
// 用户中断(CANCELLED)或其它终态:本批已跑完、结果已合并,剩余批不再发——
// 继续发只会白扣用户 LLM 次数。逐批点查(每批一次主键读,批次本身是分钟级)
// 换「中断后不再多扣一批」;跳出后由 completeLlmFileJob 按已有行账出部分表。
log.warn("[appearance-patent] 任务已终态,停止后续 LLM 批次 taskId={} jobId={} batch={}/{} remainingRows={}",
task.getId(), job.getId(), batchIndex, batchTotal, Math.max(0, submitLimit - i));
return;
}
List<AppearancePatentResultRowDto> batchRows = candidates.subList(i, Math.min(i + batchSize, submitLimit));
taskFileJobService.touchRunning(job.getId());
List<String> batchRowKeys = batchRows.stream().map(this::rowKey).filter(key -> !key.isBlank()).toList();
@@ -414,13 +414,21 @@ public class AppearancePatentResultJobSupport {
int llmWorkUnits = llmBatchPipeline.countLlmWorkUnits(chunks, Math.max(1, properties.getLlmBatchSize()));
int plannedLlmUnits = Math.max(1, llmWorkUnits);
int totalProgressUnits = Math.max(3, plannedLlmUnits + 3);
progressSupport.saveFileBuildProgress(task, job, totalProgressUnits, 0, "正在提交检测");
llmBatchPipeline.submitLlmBatches(task, result, job, chunks);
if (STATUS_RUNNING.equals(task.getStatus()) && !isResultSubmissionComplete(task.getId())) {
taskFileJobService.touchRunning(job.getId());
activityToucher.touch(task.getId());
progressSupport.saveFileBuildProgress(task, job, totalProgressUnits, Math.max(1, plannedLlmUnits), "等待 Python 继续回传数据");
return false;
if (TaskStatuses.FileTask.CANCELLED.equals(task.getStatus())) {
// 用户中断:不再收集候选、不再发任何 LLM 批(发一批就是白扣一次密钥),
// 直接按已有行账出部分结果;缺口由 completeLlmFileJob 的中断分支写进行账文案。
// WAIT_LLM 等待分支同样不进——中断的单不该再等 Python 回传。
log.warn("[appearance-patent] 任务已被用户中断,跳过检测按已有行账出部分结果 taskId={} jobId={}",
task.getId(), job.getId());
} else {
progressSupport.saveFileBuildProgress(task, job, totalProgressUnits, 0, "正在提交检测");
llmBatchPipeline.submitLlmBatches(task, result, job, chunks);
if (STATUS_RUNNING.equals(task.getStatus()) && !isResultSubmissionComplete(task.getId())) {
taskFileJobService.touchRunning(job.getId());
activityToucher.touch(task.getId());
progressSupport.saveFileBuildProgress(task, job, totalProgressUnits, Math.max(1, plannedLlmUnits), "等待 Python 继续回传数据");
return false;
}
}
return completeLlmFileJob(task, result, job, totalProgressUnits);
}
@@ -429,24 +437,32 @@ public class AppearancePatentResultJobSupport {
FileResultEntity result,
TaskFileJobEntity job,
int totalProgressUnits) {
// 中断任务(CANCELLED)不补检、不问覆盖率:用户已经点了「不要再检」,此刻拦下成品
// 只会让已完成的行困在作业里。直接按已有行账出部分表,缺口写进行账文案。
boolean interrupted = TaskStatuses.FileTask.CANCELLED.equals(task.getStatus());
int assembleProgress = Math.max(1, totalProgressUnits - 2);
progressSupport.saveFileBuildProgress(task, job, totalProgressUnits, assembleProgress, "正在组装 xlsx");
// 补检决定必须做在出表之前:assembleResultWorkbook 一跑完就把 xlsx 传上 OSS 并挂好
// resultFileUrl,那时才发现缺口,半张表已经在用户的下载列表里了。
AppearancePatentRowOutcome.Facts gap = deliverySupport.measureDeliveryFacts(task, result);
if (deliverySupport.requestRecheckForMissingRows(task, job, gap)) {
// 半张表先不发出去:撤销未完成行的检测标记、把作业排回队列补检一轮,
// 上限由行级轮次闸(llmRowMaxRounds)与补检轮次闸(recheckMaxRounds)共同兜住。
// 进度消息同步换掉「正在组装 xlsx」:补检一轮常要几十分钟,卡片停在 92% 假死
// (task 31769 实录),用户要看得见是在补检、不是卡死。百分比由快照棘轮保持不回退。
progressSupport.saveFileBuildProgress(task, job, totalProgressUnits, assembleProgress,
"有 " + gap.missingRows() + " 行未完成检测,补检中");
return false;
if (!interrupted) {
// 补检决定必须做在出表之前:assembleResultWorkbook 一跑完就把 xlsx 传上 OSS 并挂好
// resultFileUrl,那时才发现缺口,半张表已经在用户的下载列表里了。
AppearancePatentRowOutcome.Facts gap = deliverySupport.measureDeliveryFacts(task, result);
if (deliverySupport.requestRecheckForMissingRows(task, job, gap)) {
// 半张表先不发出去:撤销未完成行的检测标记、把作业排回队列补检一轮,
// 上限由行级轮次闸(llmRowMaxRounds)与补检轮次闸(recheckMaxRounds)共同兜住。
// 进度消息同步换掉「正在组装 xlsx」:补检一轮常要几十分钟,卡片停在 92% 假死
// (task 31769 实录),用户要看得见是在补检、不是卡死。百分比由快照棘轮保持不回退。
progressSupport.saveFileBuildProgress(task, job, totalProgressUnits, assembleProgress,
"有 " + gap.missingRows() + " 行未完成检测,补检中");
return false;
}
}
AppearancePatentRowOutcome.Facts deliveryFacts = assembleResultWorkbook(task, result);
AppearancePatentRowOutcome.Facts deliveryFacts = assembleResultWorkbook(task, result, interrupted);
progressSupport.saveFileBuildProgress(task, job, totalProgressUnits, totalProgressUnits - 1, "正在上传结果文件");
fileResultMapper.updateById(result);
String existingError = task.getErrorMessage();
if (interrupted) {
return finalizeInterruptedDelivery(task, job, totalProgressUnits, existingError, deliveryFacts);
}
boolean taskAlreadyFailed = STATUS_FAILED.equals(task.getStatus());
boolean failed = shouldFailAfterAssembly(taskAlreadyFailed, existingError,
deliveryFacts.expectedRows(), deliveryFacts.coverage(),
@@ -464,6 +480,23 @@ public class AppearancePatentResultJobSupport {
return true;
}
/**
* 中断任务的收尾:状态保持 CANCELLED 一字不动(那是用户亲手落的终态,出表不得改写——
* 与铁律 14「出表不改写任务结论」同一口径),只把行账缺口补进消息,用户看得见哪几行没检完。
* 下载按钮挂 result_file_url,与任务状态无关(前端 canDownload)。包私有仅供用例直测。
*/
boolean finalizeInterruptedDelivery(FileTaskEntity task, TaskFileJobEntity job, int totalProgressUnits,
String existingError, AppearancePatentRowOutcome.Facts deliveryFacts) {
task.setErrorMessage(deliverySupport.appendDeliveryGapMessage(existingError, deliveryFacts));
task.setUpdatedAt(LocalDateTime.now());
fileTaskMapper.updateById(task);
taskCacheService.deleteTaskCache(task.getId());
progressSupport.saveFileBuildProgress(task, job, totalProgressUnits, totalProgressUnits, "结果文件已生成");
log.info("[appearance-patent] interrupted task delivered partial result taskId={} jobId={} expectedRows={} judgedRows={} missingRows={}",
task.getId(), job.getId(), deliveryFacts.expectedRows(), deliveryFacts.judgedRows(), deliveryFacts.missingRows());
return true;
}
/**
* 出表后的最终状态判定:已判死 / 覆盖率低于下限 / 非部分缺口的错误 → FAILED。
*
@@ -585,6 +618,16 @@ public class AppearancePatentResultJobSupport {
if (job == null || job.getTaskId() == null) {
return;
}
FileTaskEntity cancellingTask = fileTaskMapper.selectById(job.getTaskId());
if (cancellingTask != null && TaskStatuses.FileTask.CANCELLED.equals(cancellingTask.getStatus())) {
// 用户中断交付的部分结果:分片载荷是「继续」的续跑点(已检结论就在分片里,
// 剩余行靠它们重新入候选),删了它继续就只能从零重跑。保留到任务被删除、
// 或用户点「继续」跑完整表走正常 SUCCESS 清理为止。「已交付跳过重复组装」闸
// 挡住重跑,保留不构成重复组装风险。
log.info("[appearance-patent] interrupted task keeps chunks as resume point taskId={} jobId={}",
job.getTaskId(), job.getId());
return;
}
payloadSupport.deleteTransientTaskPayloads(job.getTaskId());
taskChunkMapper.delete(new LambdaQueryWrapper<TaskChunkEntity>()
.eq(TaskChunkEntity::getTaskId, job.getTaskId())
@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@RestController
@@ -42,6 +43,21 @@ public class TaskHeartbeatController {
return ApiResponse.success(taskHeartbeatService.heartbeat(taskId, request));
}
@PostMapping("/{taskId}/interrupt")
@Operation(
summary = "用户中断任务",
description = "把在跑/待跑的文件任务落 CANCELLED:停检测与采集,已完成部分按部分结果出表供下载,"
+ "之后可在原任务上「继续」。与 /interrupted(客户端崩溃上报)不同:本端点是用户主动动作,"
+ "普通账号只能中断自己名下的任务,终态任务重按是幂等 no-op。")
public ApiResponse<TaskHeartbeatVo> interrupt(
@Parameter(description = "任务 ID", required = true, example = "200") @PathVariable Long taskId,
@Parameter(description = "当前用户 ID,必须与任务归属一致。", required = true)
@RequestParam("user_id") Long userId,
HttpServletRequest httpRequest) {
Long requesterUid = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
return ApiResponse.success(taskHeartbeatService.markCancelledByUser(taskId, requesterUid));
}
@PostMapping("/{taskId}/interrupted")
@Operation(
summary = "上报客户端异常中断",
@@ -46,6 +46,15 @@ public interface ResultFileJobHandler {
return null;
}
/**
* 「继续」(中断任务在原任务上复位)钩子:任务复位成 PENDING 之前调用。模块据此清掉
* 自己的交付缺口补检预算(中断交付前往往已烧满,不清则继续后的第一轮就按部分表收尾,
* 剩余行永远轮不到补检)。实现允许抛异常——调用方在任务 CAS 之前调用,失败即中止继续,
* 不留半截状态。
*/
default void onTaskResumed(Long taskId) {
}
default boolean supportsAsyncOffload() {
return false;
}
@@ -3,6 +3,7 @@ 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.exception.BusinessException;
import com.nanri.aiimage.common.task.TaskStatuses;
import com.nanri.aiimage.modules.task.mapper.FileTaskMapper;
import com.nanri.aiimage.modules.task.model.dto.TaskHeartbeatRequest;
import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity;
@@ -200,6 +201,56 @@ public class TaskHeartbeatService {
return TaskHeartbeatVo.notAlive(null, null, "task not found");
}
/**
* 用户中断(2026-11-03「中断+继续」):把在跑/待跑的文件任务落 CANCELLED 终态,
* 已完成部分照常出表。与 {@link #markInterrupted}(客户端崩溃上报,RUNNING→FAILED)的三点差别:
* 状态是 CANCELLED(取消词表的既有值,不发明新词);可中断态是 ACTIVE 三态
* (PENDING/RUNNING/SCHEDULED,排队中的单也能撤);终态一行不动(幂等,重按安全)。
*
* <p>任务一落终态,{@code touchFileTaskIfRunning} 对它返回 notAlive——客户端心跳线程据此置
* stop_requested 协作停止(amazon/main.py),Linux ap_worker 下一跳收手,采集侧无需发版。
* 结果作业侧:ASSEMBLE_RESULT 是纯出表作业(P1-13),父任务终态不拦它——执行中的作业跑完
* 当前批即按已有行账出部分表,排队中的作业下一轮 claim 照常接手,下载按钮随 result_file_url 出现。
*
* <p>品牌任务不在本轮射程:biz_file_task 查不到就明确报「任务不存在」,让前端说得清,
* 而不是静默按「任务不存活」返回。
*/
public TaskHeartbeatVo markCancelledByUser(Long taskId, Long requesterUid) {
if (taskId == null || taskId <= 0) {
log.warn("[task-cancel] ignored invalid taskId={}", taskId);
return TaskHeartbeatVo.notAlive(null, null, "invalid taskId");
}
FileTaskEntity fileTask = selectFullFileTask(taskId);
if (fileTask == null) {
throw new BusinessException("任务不存在");
}
assertInterruptOwnership("file", taskId, fileTask.getUserId(), requesterUid);
String message = "用户中断任务,已完成部分可下载";
int updated = fileTaskMapper.update(null, new LambdaUpdateWrapper<FileTaskEntity>()
.eq(FileTaskEntity::getId, taskId)
.in(FileTaskEntity::getStatus, TaskStatuses.FileTask.ACTIVE_ORDERED)
.set(FileTaskEntity::getStatus, TaskStatuses.FileTask.CANCELLED)
.set(FileTaskEntity::getErrorMessage, message)
.set(FileTaskEntity::getFinishedAt, LocalDateTime.now()));
if (updated > 0) {
log.warn("[task-cancel] file task cancelled by user taskId={} moduleType={}",
taskId, fileTask.getModuleType());
fileTask.setStatus(TaskStatuses.FileTask.CANCELLED);
fileTask.setErrorMessage(message);
fileTask.setFinishedAt(LocalDateTime.now());
} else {
log.info("[task-cancel] file task not in active state, skipped taskId={} status={}",
taskId, fileTask.getStatus());
}
// 与 markInterrupted 同一口径:成功落终态要刷缓存/快照,否则前端一直按 RUNNING 渲染;
// 终态残留旧缓存时也按 DB 现值自愈。
syncTerminalState(fileTask, fileTask.getStatus(), fileTask.getErrorMessage());
return TaskHeartbeatVo.notAlive(fileTask.getModuleType(), fileTask.getStatus(),
TaskStatuses.FileTask.CANCELLED.equals(fileTask.getStatus())
? "cancelled by user"
: "task is not running");
}
/** 归属闸:只有普通登录账号(requesterUid 非空)且任务有明确归属时才比对。 */
private void assertInterruptOwnership(String kind, Long taskId, Long ownerUserId, Long requesterUid) {
if (requesterUid == null || ownerUserId == null || requesterUid.equals(ownerUserId)) {
@@ -5,8 +5,10 @@ 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.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 lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -14,18 +16,28 @@ import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
/**
* 失败任务「在原任务上重试」的唯一出口(2026-11-01 用户拍板)。
* 失败/中断任务「在原任务上重试/继续」的唯一出口(2026-11-01 用户拍板失败重试;
* 2026-11-03 放宽到已中断任务,「继续」)。
*
* <p>用户口径:失败任务不再克隆重试——克隆会让同一份输入在界面上变成好几行结果
* (现网 32967→33001→33017 就是这样:三代克隆、三行「结果文件生成多次失败」)。
* 重试必须落在**原任务**上:保留解析载荷、已收分片、已检测标记,把状态从 FAILED 复位成
* PENDING 让执行方接着跑——这就是断点续传,而不是从头再采一遍。
*
* <p>只动三样东西:
* <p>中断任务的「继续」同走这条出口(状态放宽到 CANCELLED):中断交付的部分结果只清
* result_file_url 让位给即将重新生成的完整结果,组装作业从 SUCCESS 复位成 PENDING;
* 分片在中断交付时被刻意保留(见 {@code AppearancePatentResultJobSupport#cleanupResultFileJob}
* 的中断守卫),已检测结论就挂在分片载荷里,剩余行重新入候选,不重发已检过的行。
*
* <p>只动四样东西:
* <ul>
* <li>任务头:FAILED → PENDING,清 error_message / finished_at,代数 +1;</li>
* <li>结果行:清上一次的错误文案(结果文件 URL 保留,新文件生成后会覆盖;</li>
* <li>组装作业:终态失败的 ASSEMBLE_RESULT 复位成 PENDING(含卡死重排计数清零)。</li>
* <li>任务头:FAILED/CANCELLED → PENDING,清 error_message / finished_at,代数 +1;</li>
* <li>结果行:清上一次的错误文案(结果文件 URL 保留,新文件生成后会覆盖;
* 中断交付的场景由 {@link #clearDeliveredResultUrl} 显式清直链);</li>
* <li>组装作业:终态失败复位 PENDING(含卡死重排计数清零);中断已交付的 SUCCESS 作业
* 同样复位,否则「已交付跳过重复组装」闸会让复位后的作业空转;</li>
* <li>模块补检预算:从中断恢复时经 {@code ResultFileJobHandler#onTaskResumed} 清零
* (AP 的补检轮次在中断交付前往往已烧满,不清则继续后的第一轮就按部分表收尾)。</li>
* </ul>
* 分片、scope 状态、解析载荷一律不动——它们就是续跑点。
*/
@@ -36,38 +48,56 @@ public class TaskInPlaceRetryService {
private static final String STATUS_FAILED = "FAILED";
private static final String STATUS_PENDING = "PENDING";
private static final String STATUS_CANCELLED = TaskStatuses.FileTask.CANCELLED;
private final FileTaskMapper fileTaskMapper;
private final FileResultMapper fileResultMapper;
private final TaskFileJobService taskFileJobService;
private final TaskFileJobMapper taskFileJobMapper;
private final ResultFileJobHandlerRegistry resultFileJobHandlers;
/**
* 把一条失败任务复位成待执行。幂等:只有当前状态确实是 FAILED 才动作。
* 把一条失败/已中断任务复位成待执行。幂等:只有当前状态确实是 FAILED/CANCELLED 才动作。
*
* @return true=已复位;false=状态已不是 FAILED(并发或已重试过)
* @return true=已复位;false=状态已不是 FAILED/CANCELLED(并发或已重试过)
*/
public boolean retryInPlace(FileTaskEntity task) {
if (task == null || task.getId() == null) {
return false;
}
if (STATUS_CANCELLED.equals(task.getStatus())) {
// 「继续」前先清模块补检预算:失败即中止(此刻任务一行未动,用户重按即可)。
// 刻意不包 try/catch——本仓静默 catch 台账只许减,且放在 CAS 之前不会留下
// 「任务已复位、预算没清」的半截状态。
ResultFileJobHandler handler = resultFileJobHandlers.asMap().get(task.getModuleType());
if (handler != null) {
handler.onTaskResumed(task.getId());
}
}
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)
.in(FileTaskEntity::getStatus, STATUS_FAILED, STATUS_CANCELLED)
.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());
log.info("[task-retry] 状态已不是 FAILED/CANCELLED,跳过复位 taskId={}", task.getId());
return false;
}
if (STATUS_CANCELLED.equals(task.getStatus())) {
// 中断已交付过部分结果:先清直链再复位作业,顺序反了会出现「作业已 PENDING、
// 已交付闸还短着」的一轮空转。直链清掉后下载按钮收起,新一轮组装完成再挂新文件。
clearDeliveredResultUrl(task.getId(), task.getModuleType());
resetDeliveredAssembleJob(task.getId(), task.getModuleType());
}
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()));
log.info("[task-retry] 已在原任务上复位重试 taskId={} moduleType={} 代数={} 上次状态={} 上次失败={}",
task.getId(), task.getModuleType(), attempt + 1, task.getStatus(), abbreviate(task.getErrorMessage()));
return true;
}
@@ -86,9 +116,9 @@ public class TaskInPlaceRetryService {
}
/**
* 用户点「重试」的入口:校验归属与状态后原地复位。
* 用户点「重试/继续」的入口:校验归属与状态后原地复位。
*
* @throws com.nanri.aiimage.common.exception.BusinessException 任务不存在 / 不是失败态 / 状态已变
* @throws com.nanri.aiimage.common.exception.BusinessException 任务不存在 / 不是可续跑态 / 状态已变
*/
public void retryFailedTask(Long taskId, Long userId, String moduleType) {
FileTaskEntity task = fileTaskMapper.selectById(taskId);
@@ -96,8 +126,8 @@ public class TaskInPlaceRetryService {
|| !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 (!STATUS_FAILED.equals(task.getStatus()) && !STATUS_CANCELLED.equals(task.getStatus())) {
throw new com.nanri.aiimage.common.exception.BusinessException("只有失败或已中断的任务可以继续");
}
if (!retryInPlace(task)) {
throw new com.nanri.aiimage.common.exception.BusinessException("任务状态已变化,请刷新后再试");
@@ -135,6 +165,56 @@ public class TaskInPlaceRetryService {
}
}
/**
* 只清直链(下载按钮随之收起),文件本体仍在对象存储;新一轮组装完成后覆盖挂新直链。
* 刻意不吞异常(静默 catch 台账只许减):它与任务 CAS 同库先后执行,失败即让用户重按,
* 不做「半截继续」。
*/
private void clearDeliveredResultUrl(Long taskId, String moduleType) {
fileResultMapper.update(null, new LambdaUpdateWrapper<FileResultEntity>()
.eq(FileResultEntity::getTaskId, taskId)
.eq(FileResultEntity::getModuleType, moduleType)
.isNotNull(FileResultEntity::getResultFileUrl)
.ne(FileResultEntity::getResultFileUrl, "")
.set(FileResultEntity::getResultFileUrl, null)
.set(FileResultEntity::getResultFileSize, 0L)
.set(FileResultEntity::getUpdatedAt, LocalDateTime.now()));
}
/**
* 中断已交付的 SUCCESS 组装作业复位成 PENDING(retryCount/stuckRequeueCount 清零,
* 与 {@link TaskFileJobService#resetTerminalFailedForRecovery} 同一条纪律)。作业不是
* SUCCESS 时不动——终态失败的复位由 {@link #resetAssembleJob} 负责。
*
* <p>这一格不与 {@code TaskFileJobService} 共用方法:那支文件当前有另一会话的在飞改动,
* 本服务直连 mapper 做条件更新,不动别人的在飞件(并发安全边界)。
*/
private void resetDeliveredAssembleJob(Long taskId, String moduleType) {
TaskFileJobEntity job = taskFileJobMapper.selectOne(new LambdaQueryWrapper<TaskFileJobEntity>()
.eq(TaskFileJobEntity::getTaskId, taskId)
.eq(TaskFileJobEntity::getModuleType, moduleType)
.eq(TaskFileJobEntity::getJobType, TaskFileJobService.JOB_TYPE_ASSEMBLE_RESULT)
.eq(TaskFileJobEntity::getStatus, TaskStatuses.Job.SUCCESS)
.orderByDesc(TaskFileJobEntity::getId)
.last("limit 1"));
if (job == null) {
return;
}
LocalDateTime now = LocalDateTime.now();
taskFileJobMapper.update(null, new LambdaUpdateWrapper<TaskFileJobEntity>()
.eq(TaskFileJobEntity::getId, job.getId())
.eq(TaskFileJobEntity::getStatus, TaskStatuses.Job.SUCCESS)
.set(TaskFileJobEntity::getStatus, TaskStatuses.Job.PENDING)
.set(TaskFileJobEntity::getRetryCount, 0)
.set(TaskFileJobEntity::getStuckRequeueCount, 0)
.set(TaskFileJobEntity::getErrorMessage, null)
.set(TaskFileJobEntity::getUpdatedAt, now)
.set(TaskFileJobEntity::getFinishedAt, null)
.set(TaskFileJobEntity::getTerminalCallbackAt, null));
log.info("[task-retry] delivered assemble job reset for interrupted resume jobId={} taskId={} moduleType={}",
job.getId(), taskId, moduleType);
}
private static String abbreviate(String text) {
if (text == null) {
return "";
@@ -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;
}
}
@@ -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;
}
}
@@ -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));
}
}
@@ -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;
}
}