diff --git a/backend-java/src/main/java/com/nanri/aiimage/config/AppearancePatentProperties.java b/backend-java/src/main/java/com/nanri/aiimage/config/AppearancePatentProperties.java index 76f9b6690..8d334971c 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/config/AppearancePatentProperties.java +++ b/backend-java/src/main/java/com/nanri/aiimage/config/AppearancePatentProperties.java @@ -98,4 +98,15 @@ public class AppearancePatentProperties { * 分母口径已改为「会写进结果文件的行集」,判据见 AppearancePatentRowOutcome。 */ private double llmCoverageMinRatio = 0.95D; + + /** + * 交付缺口最多允许再补检几轮(<=0 关闭补检)。 + * + *

它存在的理由是「补检不能借用作业重试那条预算」:组装作业重排走 {@code requeue}, + * 而 {@code requeue} 的 WHERE 带 {@code retry_count < MAX_RETRY_COUNT}——恰恰是"还没检完" + * 这件事把 retry_count 抛满的(覆盖率抛、空结果抛),于是越慢越补不上。 + * 2026-10-19 现网读数:{@code 补检排不上队,按已有结果交付} 四例 missingRows=112/455/1471/2110, + * 作业全部 retry_count=5。 + */ + private int recheckMaxRounds = 2; } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentTaskCacheService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentTaskCacheService.java index c62eda027..ae408e08a 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentTaskCacheService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentTaskCacheService.java @@ -28,6 +28,9 @@ public class AppearancePatentTaskCacheService extends AbstractPendingRowTaskCach private static final long TTL_HOURS = 24; + /** 补检轮次借用的那枚哨兵键,见 {@link #recheckRounds(Long)}。 */ + private static final String RECHECK_ROUND_KEY = "__recheck__"; + public AppearancePatentTaskCacheService(StringRedisTemplate stringRedisTemplate, ObjectMapper objectMapper) { super("appearance-patent", AppearancePatentResultRowDto.class, stringRedisTemplate, objectMapper); @@ -177,6 +180,25 @@ public class AppearancePatentTaskCacheService extends AbstractPendingRowTaskCach } } + /** + * 交付缺口补检已经排过几轮。 + * + *

刻意复用行级轮次那套计数(同 24h TTL、同「Redis 降级按 0 计」口径)而不是另抄一遍: + * 另抄就是两处新的「异常到此为止、外面看不见」,正是 {@code CatchSilenceRatchetTest} + * 只许减的那本账。哨兵键撞不上真行——行键恒为 {@code id::ASIN::国家},必带 {@code "::"}。 + */ + public long recheckRounds(Long taskId) { + return rowInspectionRounds(taskId, RECHECK_ROUND_KEY); + } + + /** 排上一轮补检时记一次。 */ + public void countRecheckRound(Long taskId) { + if (taskId == null || taskId <= 0) { + return; + } + countRowInspectionRound(taskId, List.of(RECHECK_ROUND_KEY)); + } + private String rowRoundsKey(Long taskId, String rowKey) { return "appearance-patent:task:row-rounds:" + taskId + ":" + rowKey; } 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 fd277d754..be414c845 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 @@ -1685,9 +1685,15 @@ public class AppearancePatentTaskService extends AbstractFileTaskPipeline不会无限补检:作业重排受 {@code TaskFileJobService} 的 MAX_RETRY_COUNT 约束(requeue 返回 - * false 时这里就放行出文件),行级重发次数受 {@code llmRowMaxRounds} 约束(到顶的行会被判死并 - * 写上「重发轮次已达上限」的结论,从此不再是空行)。 + *

排不上队时**不许**退化成"按已有结果交付"。现网(2026-10-19)四例 + * {@code 交付缺口补检排不上队,按已有结果交付} 的 missingRows 是 112/455/1471/2110, + * 作业全部 {@code retry_count=5}——把预算抛满的恰恰是"还没检完"(覆盖率抛、空结果抛), + * 于是 {@code requeue} 那条 {@code retry_count < MAX} 的闸自我锁死:越慢越补不上。 + * 这里改吃抛:让作业走到终态失败,由 {@link #fallbackAssembleResultFile} 按**补检自己的** + * 预算({@code recheckMaxRounds})决定重排还是放行,两条预算不再互相占用。 + * + *

行级重发次数仍受 {@code llmRowMaxRounds} 约束(到顶的行会被判死并写上 + * 「重发轮次已达上限」的结论,从此不再是空行),所以这条不会无限循环。 */ private boolean requestRecheckForMissingRows(FileTaskEntity task, TaskFileJobEntity job, AppearancePatentRowOutcome.Facts facts) { @@ -1701,13 +1707,75 @@ public class AppearancePatentTaskService extends AbstractFileTaskPipeline parsedRows = parsed.getAllItems() == null + ? List.of() : parsed.getAllItems(); + AppearancePatentRowOutcome.Facts facts = AppearancePatentRowOutcome.Facts.EMPTY; + for (AppearancePatentResultPackager.SourceRows item + : splitRowsBySourceFile(parsed, parsedRows, result.getSourceFilename())) { + Map resultMap = + loadPersistedResultRowsForRowsWithRetry(task.getId(), item.rows()); + facts = facts.plus(AppearancePatentRowOutcome.summarize( + item.rows(), row -> findResultRow(row, resultMap))); + } + return facts; + } + + /** + * 判死出口上的第二条补检预算。 + * + *

{@link #fallbackAssembleResultFile} 的注释原来断言「作业已判死,缺口不再有补齐窗口」, + * 现网读数证明它是假的:底座早就有 {@code resetTerminalFailedForRecovery}(终态失败且 retry + * 到顶 ⇒ retryCount 清零、重回 PENDING、重派发),补传恢复那条路一直在用它,只有交付缺口 + * 这条路没接上。轮次上限走 Redis 的 {@code recheckMaxRounds},与作业重试预算彻底分开—— + * 「因为慢而抛满重试」不再等于「永远补不了」。 + * + *

预算耗尽、或重排没接上时仍按已有结果出表:「起码失败了也可以下载」那条保证不变。 + */ + private boolean scheduleFallbackRecheck(FileTaskEntity task, FileResultEntity result, + AppearancePatentRowOutcome.Facts facts) { + int maxRounds = properties.getRecheckMaxRounds(); + if (task == null || task.getId() == null || result == null || result.getId() == null + || facts == null || maxRounds <= 0) { return false; } - log.warn("[appearance-patent] 交付缺口触发补检轮 taskId={} jobId={} missingRows={} keys={} noDataRows={}", - task.getId(), job.getId(), facts.missingRows(), keys.size(), facts.noDataRows()); + long done = taskCacheService.recheckRounds(task.getId()); + if (done >= maxRounds) { + log.warn("[appearance-patent] 补检预算已耗尽,按已有结果交付 taskId={} rounds={}/{}", + task.getId(), done, maxRounds); + return false; + } + if (facts.missingRows() <= 0 || facts.missingKeys().isEmpty()) { + return false; + } + taskCacheService.releaseRowInspection(task.getId(), facts.missingKeys(), true); + TaskFileJobEntity reset = taskFileJobService.resetTerminalFailedForRecovery( + task.getId(), MODULE_TYPE, result.getId()); + if (reset == null || !"PENDING".equals(reset.getStatus())) { + log.warn("[appearance-patent] 判死出口补检重排未接上,按已有结果交付 taskId={} resultId={} jobStatus={}", + task.getId(), result.getId(), reset == null ? "ABSENT" : reset.getStatus()); + return false; + } + // 轮次只在重排真的接上之后才记:否则"没接上"也要扣一轮,预算会被失败的重排自己吃光 + taskCacheService.countRecheckRound(task.getId()); + log.warn("[appearance-patent] 判死出口触发补检轮 taskId={} jobId={} round={}/{} missingRows={} keys={}", + task.getId(), reset.getId(), done + 1, maxRounds, facts.missingRows(), facts.missingKeys().size()); return true; } @@ -1717,12 +1785,14 @@ public class AppearancePatentTaskService extends AbstractFileTaskPipeline rows = sheetRows(2); AppearancePatentRowOutcome.Facts facts = summarize(rows, submittedRows(rows, 1, true)); when(taskFileJobService.requeue(anyLong(), any())).thenReturn(false); - assertFalse(requestRecheck(task("SUCCESS"), job(500L), facts)); + BusinessException ex = assertThrows(BusinessException.class, + () -> requestRecheck(task("SUCCESS"), job(500L), facts)); + assertTrue(ex.getMessage().contains("1 行未完成检测"), ex.getMessage()); verify(taskCacheService).releaseRowInspection(eq(TASK_ID), anyList(), eq(true)); } @@ -324,6 +361,55 @@ class AppearancePatentDeliveryGateTest { verify(taskFileJobService, never()).requeue(anyLong(), any()); } + // ---------- 判死出口的补检预算 ---------- + + @Test + void deadJobWithGapIsRequeuedOnItsOwnBudgetInsteadOfShipping() throws Exception { + List rows = sheetRows(2); + AppearancePatentRowOutcome.Facts facts = summarize(rows, submittedRows(rows, 1, true)); + when(taskCacheService.recheckRounds(TASK_ID)).thenReturn(0L); + when(taskFileJobService.resetTerminalFailedForRecovery(TASK_ID, "APPEARANCE_PATENT", 700L)) + .thenReturn(pendingJob(500L)); + + assertTrue(scheduleFallbackRecheck(task("FAILED"), result(700L), facts)); + verify(taskCacheService).releaseRowInspection(eq(TASK_ID), anyList(), eq(true)); + verify(taskCacheService).countRecheckRound(TASK_ID); + } + + @Test + void exhaustedRecheckBudgetShipsWhatWeHave() throws Exception { + List rows = sheetRows(2); + AppearancePatentRowOutcome.Facts facts = summarize(rows, submittedRows(rows, 1, true)); + when(taskCacheService.recheckRounds(TASK_ID)).thenReturn(2L); + + assertFalse(scheduleFallbackRecheck(task("FAILED"), result(700L), facts)); + verify(taskFileJobService, never()).resetTerminalFailedForRecovery(anyLong(), any(), anyLong()); + } + + @Test + void deadJobWithoutGapShipsImmediately() throws Exception { + List rows = sheetRows(2); + when(taskCacheService.recheckRounds(TASK_ID)).thenReturn(0L); + + assertFalse(scheduleFallbackRecheck(task("FAILED"), result(700L), + summarize(rows, submittedRows(rows, 2, true)))); + verify(taskFileJobService, never()).resetTerminalFailedForRecovery(anyLong(), any(), anyLong()); + } + + @Test + void failedRequeueDoesNotBurnARecheckRound() throws Exception { + // 重排没接上(作业不在"FAILED 且 retry 到顶"那格)时不能扣轮次: + // 否则一轮没补成的重排会把预算自己吃光,缺口行连一次补齐机会都没有就出表 + List rows = sheetRows(2); + AppearancePatentRowOutcome.Facts facts = summarize(rows, submittedRows(rows, 1, true)); + when(taskCacheService.recheckRounds(TASK_ID)).thenReturn(0L); + when(taskFileJobService.resetTerminalFailedForRecovery(TASK_ID, "APPEARANCE_PATENT", 700L)) + .thenReturn(job(500L)); + + assertFalse(scheduleFallbackRecheck(task("FAILED"), result(700L), facts)); + verify(taskCacheService, never()).countRecheckRound(anyLong()); + } + // ---------- 任务消息 ---------- @Test