From 21508057b58d28b7da0f4d45bbb98dcda617daa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Tue, 20 Oct 2026 01:01:02 +0800 Subject: [PATCH] =?UTF-8?q?fix(appearance-patent):=20=E5=B7=B2=E4=BA=A4?= =?UTF-8?q?=E4=BB=98=E7=9A=84=E4=BD=9C=E4=B8=9A=E4=B8=8D=E5=86=8D=E8=A2=AB?= =?UTF-8?q?=E9=87=8D=E6=8A=95=E5=90=8E=E7=A9=BA=E8=BD=AC=E7=83=A7=E9=A2=84?= =?UTF-8?q?=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 现网读数(2026-10-19 任务 31527):结果文件 23:02:35 已交付、任务已 SUCCESS, 组装作业却被事件重投后又跑五次(23:02:40→23:03:20,每 10 秒一次),每次读到 0 行 连抛「外观专利检测结果为空」。分片在交付时已被 cleanupResultFileJob 删掉,重跑无事可做, 只把 retry 预算和 ERROR 日志一起刷满。 worker 那三处守卫(TaskResultFileJobWorker:226/252/301)只认 SUCCESS 状态,挡不住 "文件已挂上、作业被重投"这一格;补上兜底出口早就有的那枚幂等闸:resultFileUrl 非空即收工。 边界查过,不误伤补传恢复:maybeRecoverTerminalFailedAssemble 自带 hasSuccessfulAssembleJob 早退,而交付之后任务已终态、迟到分片被 rejectNotRunning 拒掉,没有合法的第二轮组装。 顺带登记一处本会话前一笔的读数不实:3c662389 的 message 写「AP 3048→3121」, 对着 git show 复核实际提交态是 3122,差一行。不 amend(已入库),在此留案。 本笔之后 AP 为 3135 行,基线在册 3458,只许降这格仍满足。 门禁:后端整量 mvn -o test 4551 例/0 红/0 错/16 skipped,BUILD SUCCESS。 ⚠ 同树第一次整量另有一枚 collectdata 用例判红 (CollectDataBrandBatchFilterTest.test_cached_verdict_..._after_budget_exhausted): 单跑 12/12 绿、CollectData* 整包 260 例绿、同树复跑整量绿——该用例把 Thread.sleep(30) 对上一枚 1ms 的 chunk 预算,判的是墙钟过没过,属机器被并发拖慢就翻的时间窗用例, 与本笔面上无关,与本仓已登记过的 DuplicateCheckRefreshSchedulerTest:41 同一形状。 只登记,不顺手改(那是 3C 在飞的支)。 定向:AppearancePatent* 258 例/0 红。 --- .../service/AppearancePatentTaskService.java | 13 +++++++++++ .../AppearancePatentFallbackAssembleTest.java | 23 ++++++++++++++++++- 2 files changed, 35 insertions(+), 1 deletion(-) 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 be414c845..2522cf70a 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 @@ -1663,6 +1663,19 @@ public class AppearancePatentTaskService extends AbstractFileTaskPipeline chunks = taskChunkMapper.selectList(new LambdaQueryWrapper() .eq(TaskChunkEntity::getTaskId, task.getId()) .eq(TaskChunkEntity::getModuleType, MODULE_TYPE) diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentFallbackAssembleTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentFallbackAssembleTest.java index 832266f1c..8cd5c4196 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentFallbackAssembleTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentFallbackAssembleTest.java @@ -28,6 +28,7 @@ import org.springframework.transaction.PlatformTransactionManager; 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.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -37,7 +38,8 @@ import static org.mockito.Mockito.when; * 失败兜底组装的守卫与幂等(2026-10-18,线上任务 31302/31354 死因修复)。 * *

组装作业重试耗尽判死后,用户要「起码失败了也可以下载」:兜底用已有分片/结论出 - * 部分结果文件。本类钉住兜底入口的分支语义;组装主体(xlsx 生成/上传)由 + * 部分结果文件。本类钉住兜底入口的分支语义,外加常规交付入口的同一枚幂等闸 + * ({@link #deliveredResultFileShortCircuitsARedeliveredAssembleJob});组装主体(xlsx 生成/上传)由 * AppearancePatentSheetBuilderTest/AppearancePatentResultFormatTest/交付闸门测试覆盖。 */ class AppearancePatentFallbackAssembleTest { @@ -129,6 +131,25 @@ class AppearancePatentFallbackAssembleTest { verify(fileResultMapper, never()).updateById(any(FileResultEntity.class)); } + @Test + void deliveredResultFileShortCircuitsARedeliveredAssembleJob() { + // 兜底那枚幂等闸的同一条道理,落在常规交付入口上:worker 的三处 SUCCESS 守卫只认状态, + // 挡不住"文件已挂上、作业被事件重投"这一格。重投后分片已被 cleanup 删光,重跑只能读到 + // 0 行、连抛「结果为空」烧掉 retry 预算(2026-10-19 任务 31527 实测五次,每 10 秒一次)。 + FileTaskEntity task = new FileTaskEntity(); + task.setId(TASK_ID); + task.setModuleType("APPEARANCE_PATENT"); + task.setStatus("RUNNING"); + when(fileTaskMapper.selectById(TASK_ID)).thenReturn(task); + when(fileResultMapper.selectById(RESULT_ID)).thenReturn(result("appearance-patent/delivered.xlsx")); + when(taskDistributedLockService.acquire(any(), any(), any(), anyLong())) + .thenReturn(mock(TaskDistributedLockService.LockHandle.class)); + + assertTrue(service.processResultFileJob(job()), "已交付即视为作业完成"); + verify(taskChunkMapper, never()).selectList(any()); + verify(llmClient, never()).inspectRows(any(), any(), any()); + } + @Test void missingTaskRecordReturnsFalse() { when(fileResultMapper.selectById(RESULT_ID)).thenReturn(result(null));