diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentTaskService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentTaskService.java index 677b9ccdb..52cbbacb0 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentTaskService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentTaskService.java @@ -95,20 +95,41 @@ public class AppearancePatentTaskService extends AbstractFileTaskPipeline只清补检预算是不够的——那行 SUCCESS 还留在原地的话,Python 超时恢复每 2 分钟走到 - * {@code enqueueAssembleResult} 都会原样拿回它、据此跳过发批,于是补检永远不会被排上 - * (2026-11-04 现网 33228 就是这个形状:表 11-03 已出、作业恒 SUCCESS、10 行"等待补检轮")。 - * 界面确认框本来就承诺「当前已生成的部分结果文件会被替换」,所以这里重排出表是兑现承诺, - * 不是绕过 {@code TaskFileJobService.retry} 那条"不许悄悄替换成品"的保护——那是给没人要求重做时的。 + *

「是否已交付」这一个判定必须被恢复探针与「继续」复位共用:两者判的不是同一样东西的话, + * 刚点过继续的任务会立刻被探针当成已交付而收尾(33228 的死胡同换个方向再演一遍)。 */ - public boolean rearmDeliveredAssembleJobForResume(Long taskId) { - boolean rearmed = taskFileJobService.rearmDeliveredAssembleJob(taskId, MODULE_TYPE); - if (rearmed) { - log.info("[appearance-patent] 继续:已复位上一轮出表作业,剩余行将重新出表 taskId={}", taskId); - } - return rearmed; + private List deliveredAssembleJobs(Long taskId) { + return taskFileJobService.findAssembleJobsByTaskIds(MODULE_TYPE, List.of(taskId)).values().stream() + .filter(job -> job != null && STATUS_SUCCESS.equals(job.getStatus())) + .toList(); + } + + private boolean hasDeliveredAssembleJob(Long taskId) { + return !deliveredAssembleJobs(taskId).isEmpty(); + } + + /** + * 「继续」的第二半:摘掉上一轮**已交付**的出表作业,让剩余行重新排得上补检。 + * + *

只清补检预算不够——那行 SUCCESS 留在原地时,Python 超时恢复每 2 分钟走到 + * {@code enqueueAssembleResult} 都原样拿回它(底座的 SUCCESS 早退是刻意的:没人要求重做时不许 + * 替换用户可能已下载的成品),据此跳过发批,交付闸门于是永远不被评估(2026-11-04 现网 33228: + * 表 11-03 10:50 就出好了、作业恒 SUCCESS、10 行"等待补检轮"、{@code updated_at} 却常新)。 + * + *

删行而不是 UPDATE 回 PENDING:{@code enqueueAssembleResult} 在 {@code existing == null} + * 的分支里本就建 PENDING、算 owner 并补发派发事件,走现成那条路比在底座之外再抄一遍派发形状稳。 + * 结果行 {@code biz_file_result} 与它的直链一行不动,下一轮出表覆盖它——界面确认框承诺的 + * 「当前已生成的部分结果文件会被替换」就是这一格。 + */ + public void rearmDeliveredAssembleJobForResume(Long taskId) { + deliveredAssembleJobs(taskId).forEach(job -> { + taskFileJobService.deleteResultJobs(taskId, MODULE_TYPE, job.getResultId()); + log.warn("[appearance-patent] 继续:已摘除上一轮交付的出表作业,剩余行将重新出表 taskId={} jobId={} resultId={}", + taskId, job.getId(), job.getResultId()); + }); } private static final String STATUS_RUNNING = "RUNNING"; private static final String STATUS_SUCCESS = "SUCCESS"; @@ -564,7 +585,7 @@ public class AppearancePatentTaskService extends AbstractFileTaskPipeline rowCounter; private final Predicate submissionComplete; private final Predicate persistedRowsPresent; + private final Predicate deliveredAssembleJob; private final Function markSubmissionComplete; private final Function> submittedChunksLoader; private final Function, Integer> uninspectedRowCounter; @@ -47,6 +48,7 @@ public class AppearancePatentStaleTaskFinalizer { Function rowCounter, Predicate submissionComplete, Predicate persistedRowsPresent, + Predicate deliveredAssembleJob, Function markSubmissionComplete, Function> submittedChunksLoader, Function, Integer> uninspectedRowCounter, @@ -59,6 +61,7 @@ public class AppearancePatentStaleTaskFinalizer { this.rowCounter = rowCounter; this.submissionComplete = submissionComplete; this.persistedRowsPresent = persistedRowsPresent; + this.deliveredAssembleJob = deliveredAssembleJob; this.markSubmissionComplete = markSubmissionComplete; this.submittedChunksLoader = submittedChunksLoader; this.uninspectedRowCounter = uninspectedRowCounter; @@ -119,10 +122,10 @@ public class AppearancePatentStaleTaskFinalizer { // 日志、activeAssembleJobs 恒 0、updated_at 常新、表其实 11-03 10:50 就出好了、10 行永远"等待补检轮"。 // 交回 finalizeStaleTask 按已有行账收尾:缺口由行级文案标在表里 // (未采集到数据/未完成检测/未取得检测结果是三句不同的话),是否成功仍由 statusResolver 按覆盖率判。 - // ⚠ 这一格依赖「继续」会把已交付的作业复位(rearmDeliveredAssembleJob):不复位的话, + // ⚠ 这一格依赖「继续」把已交付的作业摘掉(rearmDeliveredAssembleJobForResume 删行, + // 下一轮 enqueueAssembleResult 找不到既有作业,自然重建 PENDING 并补发派发事件):不复位的话, // 刚点过继续的任务会在这里被当成已交付而直接收尾,剩余行永远轮不到补检。 - if (uploadComplete && activeAssembleJobs == 0 - && taskFileJobService.hasDeliveredAssembleJob(taskId, moduleType)) { + if (uploadComplete && activeAssembleJobs == 0 && deliveredAssembleJob.test(taskId)) { log.warn("[appearance-patent] stale recovery 已交付不再恢复:按已有行账收尾 taskId={}", taskId); return false; } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskFileJobService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskFileJobService.java index 3e5ff891c..59fbe42d8 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskFileJobService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskFileJobService.java @@ -1006,66 +1006,6 @@ public class TaskFileJobService { .isNotNull(TaskFileJobEntity::getTerminalCallbackAt)) > 0; } - /** - * 该任务是否已经有一支**出表成功**的组装作业(33228 那类 spin 的判据之一)。 - * - *

与 {@link #hasExhaustedAssembleJob} 是两种不同的"恢复已经试过了":那一格看的是重试耗尽, - * 这一格看的是成品已交付。交付过的任务再让 Python 超时恢复空转一轮,既没有作业可重排 - * ({@link #retry(Long)} 刻意不许把 SUCCESS 翻回 PENDING——不能悄悄替换用户可能已下载的表), - * 也没有批可发({@code enqueueAssembleResult} 原样拿回那行 SUCCESS,调用方据此跳过发批)。 - */ - public boolean hasDeliveredAssembleJob(Long taskId, String moduleType) { - if (taskId == null || taskId <= 0 || moduleType == null || moduleType.isBlank()) { - return false; - } - return taskFileJobMapper.selectCount(new LambdaQueryWrapper() - .eq(TaskFileJobEntity::getTaskId, taskId) - .eq(TaskFileJobEntity::getModuleType, moduleType) - .eq(TaskFileJobEntity::getJobType, JOB_TYPE_ASSEMBLE_RESULT) - .eq(TaskFileJobEntity::getStatus, "SUCCESS")) > 0; - } - - /** - * 「继续」在一支已交付的组装作业上复位:把它翻回 PENDING 并清掉终态痕迹。 - * - *

这不是 {@link #retry(Long)} 的例外,而是它的对偶:{@code retry} 守的是"没人要求重做时 - * 不许悄悄替换已下载的成品",而这里**用户刚刚明确要求重做**——界面确认框写的是 - * 「继续将重新检测剩余行并生成新的完整结果:当前已生成的部分结果文件会被替换,请先下载留存」。 - * 不复位的话,那行 SUCCESS 会让 {@code enqueueAssembleResult} 原样返回、恢复链路据此跳过发批, - * 任务于是每 2 分钟被探针刷一次 {@code updated_at} 却一步都不走(2026-11-04 现网 33228: - * {@code activeAssembleJobs=0} 恒 0、表早在 11-03 10:50 就出过、10 行永远等不到补检轮)。 - * - * @return 是否真的复位了一支 SUCCESS 作业(没有 SUCCESS 作业时返回 false,不新建) - */ - public boolean rearmDeliveredAssembleJob(Long taskId, String moduleType) { - if (taskId == null || taskId <= 0 || moduleType == null || moduleType.isBlank()) { - return false; - } - int updated = taskFileJobMapper.update(null, new LambdaUpdateWrapper() - .eq(TaskFileJobEntity::getTaskId, taskId) - .eq(TaskFileJobEntity::getModuleType, moduleType) - .eq(TaskFileJobEntity::getJobType, JOB_TYPE_ASSEMBLE_RESULT) - .eq(TaskFileJobEntity::getStatus, "SUCCESS") - .set(TaskFileJobEntity::getStatus, "PENDING") - .set(TaskFileJobEntity::getRetryCount, 0) - .set(TaskFileJobEntity::getStuckRequeueCount, 0) - .set(TaskFileJobEntity::getErrorMessage, null) - .set(TaskFileJobEntity::getUpdatedAt, LocalDateTime.now()) - .set(TaskFileJobEntity::getFinishedAt, null) - .set(TaskFileJobEntity::getTerminalCallbackAt, null)); - if (updated > 0) { - // 复位后必须把派发事件补发出去,否则这行 PENDING 只能等下一轮扫描(最长一个 stuck 周期) - taskFileJobMapper.selectList(new LambdaQueryWrapper() - .eq(TaskFileJobEntity::getTaskId, taskId) - .eq(TaskFileJobEntity::getModuleType, moduleType) - .eq(TaskFileJobEntity::getJobType, JOB_TYPE_ASSEMBLE_RESULT) - .eq(TaskFileJobEntity::getStatus, "PENDING")) - .forEach(this::publishDispatchEvent); - return true; - } - return false; - } - public TaskFileJobEntity findAssembleJob(Long taskId, String moduleType, Long resultId) { return findJob(taskId, moduleType, resultId, JOB_TYPE_ASSEMBLE_RESULT); } diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentTaskServiceDelegationTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentTaskServiceDelegationTest.java index 4cc30463a..80cc6c182 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentTaskServiceDelegationTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentTaskServiceDelegationTest.java @@ -22,6 +22,7 @@ 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.TaskChunkEntity; +import com.nanri.aiimage.modules.task.model.entity.TaskFileJobEntity; import com.nanri.aiimage.modules.task.service.TaskDistributedLockService; import com.nanri.aiimage.modules.task.service.TaskFileJobService; import com.nanri.aiimage.modules.task.service.TaskProgressLightAssembler; @@ -54,6 +55,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -396,6 +398,43 @@ class AppearancePatentTaskServiceDelegationTest { assertEquals("A", AppearancePatentRowNormalizer.firstNonBlank(null, "A")); } + // ---------- 8 「继续」摘掉已交付的出表作业(33228 那类 spin 的复位半边) ---------- + + @Test + void 继续必须摘掉已交付的出表作业让剩余行重排补检() { + TaskFileJobEntity delivered = assembleJob(7777L, 6600L, "SUCCESS"); + when(taskFileJobService.findAssembleJobsByTaskIds( + AppearancePatentTaskService.MODULE_TYPE, List.of(33228L))) + .thenReturn(Map.of(33228L, delivered)); + + service.rearmDeliveredAssembleJobForResume(33228L); + + // 只删作业行、不动结果行:下一轮 enqueueAssembleResult 走 existing==null 分支重建 PENDING 并补发派发事件 + verify(taskFileJobService).deleteResultJobs(33228L, AppearancePatentTaskService.MODULE_TYPE, 6600L); + } + + @Test + void 继续不许摘掉正在产出表的出表作业() { + when(taskFileJobService.findAssembleJobsByTaskIds( + AppearancePatentTaskService.MODULE_TYPE, List.of(33228L))) + .thenReturn(Map.of(33228L, assembleJob(7778L, 6600L, "RUNNING"))); + + service.rearmDeliveredAssembleJobForResume(33228L); + + verify(taskFileJobService, never()) + .deleteResultJobs(any(), anyString(), any()); + } + + private static TaskFileJobEntity assembleJob(Long jobId, Long resultId, String status) { + TaskFileJobEntity job = new TaskFileJobEntity(); + job.setId(jobId); + job.setTaskId(33228L); + job.setModuleType(AppearancePatentTaskService.MODULE_TYPE); + job.setResultId(resultId); + job.setStatus(status); + return job; + } + // ---------- 私有门面反射调用 ---------- private void invokeWriteResultWorkbook(File out, AppearancePatentParsedRowVo row, diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentStaleTaskFinalizerDeliveredGuardTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentStaleTaskFinalizerDeliveredGuardTest.java index 5f51c052c..1ce5c53c5 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentStaleTaskFinalizerDeliveredGuardTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentStaleTaskFinalizerDeliveredGuardTest.java @@ -21,7 +21,6 @@ import java.util.function.Predicate; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.when; /** @@ -36,7 +35,7 @@ import static org.mockito.Mockito.when; * 而紧随其后的 touch 又让陈旧扫描永远看不见这一行——既不失败也不完成。 * *

反向同样要钉死:**刚点过「继续」的任务不能被这一格当成已交付直接收尾**,否则剩余行 - * 永远轮不到补检。这条靠 resume 复位那行 SUCCESS({@code rearmDeliveredAssembleJobForResume}) + * 永远轮不到补检。这条靠 resume 摘掉那行 SUCCESS({@code rearmDeliveredAssembleJobForResume}) * 保证,所以这里断言的是"没有已交付作业时必须照常恢复"。 */ @ExtendWith(MockitoExtension.class) @@ -70,11 +69,11 @@ class AppearancePatentStaleTaskFinalizerDeliveredGuardTest { when(fileTaskMapper.selectById(TASK_ID)).thenReturn(runningTask); when(taskFileJobService.countActiveAssembleJobs(TASK_ID, MODULE_TYPE)).thenReturn(activeAssembleJobs); when(taskFileJobService.hasExhaustedAssembleJob(TASK_ID, MODULE_TYPE)).thenReturn(false); - // 这一格是短路求值(uploadComplete=false 或有在飞作业时根本不会问),严格 stub 会判多余 - lenient().when(taskFileJobService.hasDeliveredAssembleJob(TASK_ID, MODULE_TYPE)).thenReturn(delivered); Predicate submissionComplete = taskId -> uploadComplete; Predicate persistedRowsPresent = taskId -> true; + // 「是否已交付」由服务侧单一判定注入(恢复探针与「继续」复位共用它),本类不自行读底座 + Predicate deliveredAssembleJob = taskId -> delivered; Function markSubmissionComplete = taskId -> 1; Function> chunksLoader = taskId -> List.of(); Function, Integer> uninspectedRowCounter = chunks -> 10; @@ -83,8 +82,8 @@ class AppearancePatentStaleTaskFinalizerDeliveredGuardTest { BiConsumer finalizer = (task, error) -> finalized.set(true); new AppearancePatentStaleTaskFinalizer(MODULE_TYPE, fileTaskMapper, taskFileJobService, - task -> 154, submissionComplete, persistedRowsPresent, markSubmissionComplete, - chunksLoader, uninspectedRowCounter, llmSubmitter, toucher, finalizer) + task -> 154, submissionComplete, persistedRowsPresent, deliveredAssembleJob, + markSubmissionComplete, chunksLoader, uninspectedRowCounter, llmSubmitter, toucher, finalizer) .finalizeStaleTask(TASK_ID, "有 10 行未完成检测,等待补检轮"); }