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:
+7
@@ -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;
|
||||
|
||||
+12
@@ -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;
|
||||
}
|
||||
|
||||
+8
@@ -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";
|
||||
|
||||
+8
@@ -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();
|
||||
|
||||
+62
-19
@@ -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())
|
||||
|
||||
Reference in New Issue
Block a user