From 3a22267b0d5795187c349575c210a534a088fe2d 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 16:49:59 +0800 Subject: [PATCH] =?UTF-8?q?refactor(phase-3):=203A=20=E6=8B=86=E8=96=84?= =?UTF-8?q?=E7=AC=AC=E5=8D=81=E7=AC=94=E2=80=94=E2=80=94AP=20=E4=BA=A4?= =?UTF-8?q?=E4=BB=98=E9=97=B8=E9=97=A8=E4=B8=8E=E8=A1=A5=E6=A3=80=E5=87=BA?= =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E6=9C=8D=E5=8A=A1=201942=E2=86=921827?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/AppearancePatentTaskService.java | 157 ++------- .../AppearancePatentDeliverySupport.java | 297 ++++++++++++++++++ .../aiimage/testutil/SourceScanTest.java | 19 +- 3 files changed, 328 insertions(+), 145 deletions(-) create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentDeliverySupport.java 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 a23937499..42896505d 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 @@ -10,6 +10,7 @@ import com.nanri.aiimage.common.exception.BusinessException; import com.nanri.aiimage.modules.appearancepatent.service.support.AppearancePatentChunkSubmissionSupport; import com.nanri.aiimage.modules.appearancepatent.service.support.AppearancePatentChunkSubmissionSupport.PreparedSubmittedChunk; import com.nanri.aiimage.modules.appearancepatent.service.support.AppearancePatentChunkSubmissionSupport.SubmitContext; +import com.nanri.aiimage.modules.appearancepatent.service.support.AppearancePatentDeliverySupport; import com.nanri.aiimage.modules.appearancepatent.service.support.AppearancePatentExcelParser; import com.nanri.aiimage.common.service.DistributedJobLockService; import com.nanri.aiimage.common.util.GroupResultPropagator; @@ -661,6 +662,20 @@ public class AppearancePatentTaskService extends AbstractFileTaskPipeline splitRowsBySourceFile(parsed, rows, fallback), + rowReader()::loadPersistedResultRowsForRowsWithRetry, + rowReader()::findResultRow, + this::firstNonBlank, this::normalize); + } + /** * D 聚类(分片回传与范围状态)住在 {@link AppearancePatentChunkSubmissionSupport} * (3A 拆薄第九笔)。任务准入、归属、分组展开、行计数、载荷写入、序列化与收尾由本类回调交出。 @@ -1151,24 +1166,7 @@ public class AppearancePatentTaskService extends AbstractFileTaskPipeline keys = facts.missingKeys(); - // 只有这条出口允许连完成标记一起撤:结果落过库却又读不回来的行,不撤就永远补不回来。 - // 代价(该行可能被重发一次 LLM、多扣一次次数)是这一档修法里用户点名要付的。 - taskCacheService.releaseRowInspection(task.getId(), keys, true); - boolean requeued = taskFileJobService.requeue(job.getId(), - "有 " + facts.missingRows() + " 行未完成检测,补检一轮后重新组装结果文件"); - if (requeued) { - log.warn("[appearance-patent] 交付缺口触发补检轮 taskId={} jobId={} missingRows={} keys={} noDataRows={}", - task.getId(), job.getId(), facts.missingRows(), keys.size(), facts.noDataRows()); - return true; - } - log.warn("[appearance-patent] 交付缺口补检排不上队,转失败兜底出口按补检预算处置 taskId={} jobId={} missingRows={}", - task.getId(), job.getId(), facts.missingRows()); - throw new BusinessException("有 " + facts.missingRows() + " 行未完成检测,等待补检轮"); + return deliverySupport().requestRecheckForMissingRows(task, job, facts); } /** @@ -1177,18 +1175,7 @@ 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 = - rowReader().loadPersistedResultRowsForRowsWithRetry(task.getId(), item.rows()); - facts = facts.plus(AppearancePatentRowOutcome.summarize( - item.rows(), row -> rowReader().findResultRow(row, resultMap))); - } - return facts; + return deliverySupport().measureDeliveryFacts(task, result); } /** @@ -1204,33 +1191,7 @@ public class AppearancePatentTaskService extends AbstractFileTaskPipeline= 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; + return deliverySupport().scheduleFallbackRecheck(task, result, facts); } private boolean completeLlmFileJob(FileTaskEntity task, @@ -1571,83 +1532,12 @@ public class AppearancePatentTaskService extends AbstractFileTaskPipeline parsedRows, Map resultMap, boolean allowPartial) { - if (parsedRows == null || parsedRows.isEmpty()) { - return AppearancePatentRowOutcome.Facts.EMPTY; - } - AppearancePatentRowOutcome.Facts facts = - AppearancePatentRowOutcome.summarize(parsedRows, row -> rowReader().findResultRow(row, resultMap)); - FileTaskEntity task = fileTaskMapper.selectById(taskId); - boolean taskAlreadyFailed = task != null && STATUS_FAILED.equals(task.getStatus()); - if (facts.missingRows() > 0 || facts.noDataRows() > 0) { - log.warn("[appearance-patent] 交付行账不完整 taskId={} expectedRows={} judgedRows={} missingRows={} noDataRows={} coverage={} taskFailed={} samples={}", - taskId, facts.expectedRows(), facts.judgedRows(), facts.missingRows(), facts.noDataRows(), - String.format("%.2f%%", facts.coverage() * 100), taskAlreadyFailed, - sampleAsins(parsedRows, resultMap, facts)); - } - double minCoverage = properties.getLlmCoverageMinRatio(); - // 已判失败的任务走的是"按已有分片出部分结果"这条既有口径,这里再抛会把成品彻底拿掉; - // 失败兜底路径(allowPartial=true,作业已判死)同理放行。 - // 两者都不再静默:上面的行账锚点必打,缺口由调用方写进任务错误信息,用户看得到「N 行没检测」。 - if (!taskAlreadyFailed && !allowPartial && minCoverage > 0 && facts.expectedRows() > 0 - && facts.coverage() + 1e-9 < minCoverage) { - throw new BusinessException("LLM 结果不完整:仅 " + facts.judgedRows() + "/" + facts.expectedRows() - + " 行拿到检测结论(低于 " + Math.round(minCoverage * 100) + "% 覆盖率下限)" - + noDataSuffix(facts) + ",请重新运行任务"); - } - return facts; - } - - private List sampleAsins(List parsedRows, - Map resultMap, - AppearancePatentRowOutcome.Facts facts) { - List samples = new ArrayList<>(5); - if (facts.missingRows() <= 0) { - return samples; - } - for (AppearancePatentParsedRowVo parsedRow : parsedRows) { - if (samples.size() >= 5) { - break; - } - if (parsedRow == null) { - continue; - } - if (AppearancePatentRowOutcome.classify(parsedRow, rowReader().findResultRow(parsedRow, resultMap)) - != AppearancePatentRowOutcome.Kind.NOT_INSPECTED) { - continue; - } - samples.add(firstNonBlank(parsedRow.getAsin(), - firstNonBlank(parsedRow.getDisplayId(), ""))); - } - return samples; - } - - private String noDataSuffix(AppearancePatentRowOutcome.Facts facts) { - return facts.noDataRows() > 0 - ? ";另有 " + facts.noDataRows() + " 行未采集到数据、无法检测" - : ""; + return deliverySupport().validateCompleteLlmCoverage(taskId, parsedRows, resultMap, allowPartial); } /** 交付缺口写进任务错误信息:让后台列表与用户端都能看到「N 行没检测完」,而不是只有一张半空表。 */ private String appendDeliveryGapMessage(String existingError, AppearancePatentRowOutcome.Facts facts) { - if (facts == null || (facts.missingRows() <= 0 && facts.noDataRows() <= 0)) { - return existingError; - } - StringBuilder gap = new StringBuilder(); - if (facts.missingRows() > 0) { - gap.append("有 ").append(facts.missingRows()).append(" 行未完成检测"); - } - if (facts.noDataRows() > 0) { - if (gap.length() > 0) { - gap.append("、"); - } - gap.append("有 ").append(facts.noDataRows()).append(" 行未采集到数据"); - } - gap.append("(结果文件中这些行已单独标注)"); - String existing = firstNonBlank(existingError, ""); - if (existing.contains("未完成检测") || existing.contains("未采集到数据")) { - return existing; - } - return existing.isBlank() ? gap.toString() : existing + ";" + gap; + return deliverySupport().appendDeliveryGapMessage(existingError, facts); } @@ -1667,12 +1557,7 @@ public class AppearancePatentTaskService extends AbstractFileTaskPipeline原样搬移 + * (3A 拆薄第十笔):覆盖率判定、交付行账、缺口写消息、两条补检预算(回传链路与失败兜底出口)。 + * + *

无状态、按调用现取(与 {@code historyAssembler()} 同一先例),不新增 Spring bean。 + * 行读取、载荷读取、分片切分与首非空归一由宿主以回调交出,本件不直接持有那些件。 + */ +@Slf4j +public class AppearancePatentDeliverySupport { + + private static final String STATUS_FAILED = TaskStatuses.FileTask.FAILED; + + private final String moduleType; + private final AppearancePatentProperties properties; + private final AppearancePatentTaskCacheService taskCacheService; + private final TaskFileJobService taskFileJobService; + private final FileTaskMapper fileTaskMapper; + private final PayloadReader payloadReader; + private final RowSplitter rowSplitter; + private final ResultRowLoader resultRowLoader; + private final ResultRowFinder resultRowFinder; + private final FirstNonBlank firstNonBlank; + private final Normalizer normalizer; + + public interface PayloadReader { + AppearancePatentParsedPayloadDto read(FileTaskEntity task); + } + + public interface RowSplitter { + List split(AppearancePatentParsedPayloadDto parsed, + List rows, + String fallbackFilename); + } + + public interface ResultRowLoader { + Map load(Long taskId, List rows); + } + + public interface ResultRowFinder { + AppearancePatentResultRowDto find(AppearancePatentParsedRowVo row, + Map resultMap); + } + + public interface FirstNonBlank { + String pick(String preferred, String fallback); + } + + public interface Normalizer { + String normalize(String value); + } + + public AppearancePatentDeliverySupport(String moduleType, + AppearancePatentProperties properties, + AppearancePatentTaskCacheService taskCacheService, + TaskFileJobService taskFileJobService, + FileTaskMapper fileTaskMapper, + PayloadReader payloadReader, + RowSplitter rowSplitter, + ResultRowLoader resultRowLoader, + ResultRowFinder resultRowFinder, + FirstNonBlank firstNonBlank, + Normalizer normalizer) { + this.moduleType = moduleType; + this.properties = properties; + this.taskCacheService = taskCacheService; + this.taskFileJobService = taskFileJobService; + this.fileTaskMapper = fileTaskMapper; + this.payloadReader = payloadReader; + this.rowSplitter = rowSplitter; + this.resultRowLoader = resultRowLoader; + this.resultRowFinder = resultRowFinder; + this.firstNonBlank = firstNonBlank; + this.normalizer = normalizer; + } + + /** + * 有行没跑完就先别把半张表当成品发:撤销这些行的检测标记(完成态与处理中都要撤, + * 否则 {@code beginRowInspection} 下一轮仍然申领不到它们),把作业排回队列补检一轮。 + * + *

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

行级重发次数仍受 {@code llmRowMaxRounds} 约束(到顶的行会被判死并写上 + * 「重发轮次已达上限」的结论,从此不再是空行),所以这条不会无限循环。 + */ + public boolean requestRecheckForMissingRows(FileTaskEntity task, TaskFileJobEntity job, + AppearancePatentRowOutcome.Facts facts) { + if (task == null || job == null || job.getId() == null || facts == null + || facts.missingRows() <= 0 || facts.missingKeys().isEmpty()) { + return false; + } + List keys = facts.missingKeys(); + // 只有这条出口允许连完成标记一起撤:结果落过库却又读不回来的行,不撤就永远补不回来。 + // 代价(该行可能被重发一次 LLM、多扣一次次数)是这一档修法里用户点名要付的。 + taskCacheService.releaseRowInspection(task.getId(), keys, true); + boolean requeued = taskFileJobService.requeue(job.getId(), + "有 " + facts.missingRows() + " 行未完成检测,补检一轮后重新组装结果文件"); + if (requeued) { + log.warn("[appearance-patent] 交付缺口触发补检轮 taskId={} jobId={} missingRows={} keys={} noDataRows={}", + task.getId(), job.getId(), facts.missingRows(), keys.size(), facts.noDataRows()); + return true; + } + log.warn("[appearance-patent] 交付缺口补检排不上队,转失败兜底出口按补检预算处置 taskId={} jobId={} missingRows={}", + task.getId(), job.getId(), facts.missingRows()); + throw new BusinessException("有 " + facts.missingRows() + " 行未完成检测,等待补检轮"); + } + + /** + * 只量行账、不出表。补检的决定必须做在 {@code assembleResultWorkbook} 之前,而那一跑完就把 + * 成品传上 OSS 并挂好了 {@code resultFileUrl}。判据与出表共用 + * {@link AppearancePatentRowOutcome#summarize},两边不许各判一套。 + */ + public AppearancePatentRowOutcome.Facts measureDeliveryFacts(FileTaskEntity task, FileResultEntity result) { + AppearancePatentParsedPayloadDto parsed = payloadReader.read(task); + List parsedRows = parsed.getAllItems() == null + ? List.of() : parsed.getAllItems(); + AppearancePatentRowOutcome.Facts facts = AppearancePatentRowOutcome.Facts.EMPTY; + for (AppearancePatentResultPackager.SourceRows item + : rowSplitter.split(parsed, parsedRows, result.getSourceFilename())) { + Map resultMap = + resultRowLoader.load(task.getId(), item.rows()); + facts = facts.plus(AppearancePatentRowOutcome.summarize( + item.rows(), row -> resultRowFinder.find(row, resultMap))); + } + return facts; + } + + /** + * 失败兜底出口上的第二条补检预算。 + * + *

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

预算耗尽、或重排没接上时仍按已有结果出表:「起码失败了也可以下载」那条保证不变。 + */ + public 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; + } + 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(), moduleType, 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; + } + + /** + * 覆盖率判定:分母必须是**真正会写进结果文件的那批行**,且"该行有没有数据"要同时看 + * 用户上传表的解析行与客户端回传的结果行——只看解析行,用户表不带标题列时分母恒为 0, + * 闸门对整份文件失明(现网 6 份已交付文件里 20%–51% 空行、零告警就是这么来的)。 + * 判据本身在 {@link AppearancePatentRowOutcome#summarize},与表格文案共用一套,不许两边各判。 + */ + public AppearancePatentRowOutcome.Facts validateCompleteLlmCoverage(Long taskId, + List parsedRows, + Map resultMap) { + return validateCompleteLlmCoverage(taskId, parsedRows, resultMap, false); + } + + public AppearancePatentRowOutcome.Facts validateCompleteLlmCoverage(Long taskId, + List parsedRows, + Map resultMap, + boolean allowPartial) { + if (parsedRows == null || parsedRows.isEmpty()) { + return AppearancePatentRowOutcome.Facts.EMPTY; + } + AppearancePatentRowOutcome.Facts facts = + AppearancePatentRowOutcome.summarize(parsedRows, row -> resultRowFinder.find(row, resultMap)); + FileTaskEntity task = fileTaskMapper.selectById(taskId); + boolean taskAlreadyFailed = task != null && STATUS_FAILED.equals(task.getStatus()); + if (facts.missingRows() > 0 || facts.noDataRows() > 0) { + log.warn("[appearance-patent] 交付行账不完整 taskId={} expectedRows={} judgedRows={} missingRows={} noDataRows={} coverage={} taskFailed={} samples={}", + taskId, facts.expectedRows(), facts.judgedRows(), facts.missingRows(), facts.noDataRows(), + String.format("%.2f%%", facts.coverage() * 100), taskAlreadyFailed, + sampleAsins(parsedRows, resultMap, facts)); + } + double minCoverage = properties.getLlmCoverageMinRatio(); + // 已判失败的任务走的是"按已有分片出部分结果"这条既有口径,这里再抛会把成品彻底拿掉; + // 失败兜底路径(allowPartial=true,作业已判死)同理放行。 + // 两者都不再静默:上面的行账锚点必打,缺口由调用方写进任务错误信息,用户看得到「N 行没检测」。 + if (!taskAlreadyFailed && !allowPartial && minCoverage > 0 && facts.expectedRows() > 0 + && facts.coverage() + 1e-9 < minCoverage) { + throw new BusinessException("LLM 结果不完整:仅 " + facts.judgedRows() + "/" + facts.expectedRows() + + " 行拿到检测结论(低于 " + Math.round(minCoverage * 100) + "% 覆盖率下限)" + + noDataSuffix(facts) + ",请重新运行任务"); + } + return facts; + } + + private List sampleAsins(List parsedRows, + Map resultMap, + AppearancePatentRowOutcome.Facts facts) { + List samples = new ArrayList<>(5); + if (facts.missingRows() <= 0) { + return samples; + } + for (AppearancePatentParsedRowVo parsedRow : parsedRows) { + if (samples.size() >= 5) { + break; + } + if (parsedRow == null) { + continue; + } + if (AppearancePatentRowOutcome.classify(parsedRow, resultRowFinder.find(parsedRow, resultMap)) + != AppearancePatentRowOutcome.Kind.NOT_INSPECTED) { + continue; + } + samples.add(firstNonBlank.pick(parsedRow.getAsin(), + firstNonBlank.pick(parsedRow.getDisplayId(), ""))); + } + return samples; + } + + private String noDataSuffix(AppearancePatentRowOutcome.Facts facts) { + return facts.noDataRows() > 0 + ? ";另有 " + facts.noDataRows() + " 行未采集到数据、无法检测" + : ""; + } + + /** 交付缺口写进任务错误信息:让后台列表与用户端都能看到「N 行没检测完」,而不是只有一张半空表。 */ + public String appendDeliveryGapMessage(String existingError, AppearancePatentRowOutcome.Facts facts) { + if (facts == null || (facts.missingRows() <= 0 && facts.noDataRows() <= 0)) { + return existingError; + } + StringBuilder gap = new StringBuilder(); + if (facts.missingRows() > 0) { + gap.append("有 ").append(facts.missingRows()).append(" 行未完成检测"); + } + if (facts.noDataRows() > 0) { + if (gap.length() > 0) { + gap.append("、"); + } + gap.append("有 ").append(facts.noDataRows()).append(" 行未采集到数据"); + } + gap.append("(结果文件中这些行已单独标注)"); + String existing = firstNonBlank.pick(existingError, ""); + if (existing.contains("未完成检测") || existing.contains("未采集到数据")) { + return existing; + } + return existing.isBlank() ? gap.toString() : existing + ";" + gap; + } + + public boolean hasReasonFields(AppearancePatentResultRowDto row) { + if (row == null) { + return false; + } + return !normalizer.normalize(row.getAppearanceReason()).isBlank() + || !normalizer.normalize(row.getPatentReason()).isBlank() + || !normalizer.normalize(row.getTitleReason()).isBlank(); + } +} diff --git a/backend-java/src/test/java/com/nanri/aiimage/testutil/SourceScanTest.java b/backend-java/src/test/java/com/nanri/aiimage/testutil/SourceScanTest.java index e805b94d3..6f16ca69a 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/testutil/SourceScanTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/testutil/SourceScanTest.java @@ -266,13 +266,13 @@ class SourceScanTest { // ---------------------------------------------------------------- N6 moduleSources @Test - void moduleSources_appearancepatent返回36支含拆分后的support件() { + void moduleSources_appearancepatent返回37支含拆分后的support件() { List files = SourceScan.moduleSources("modules/appearancepatent"); assertThat(files) - .as("真实集成:对真仓目录求值。36 支=1 controller+1 client+1 service 主件+3 spi/cache+" - + "13 service/support+16 model(dto7/vo9),与 find 实测同号") - .hasSize(36); + .as("真实集成:对真仓目录求值。37 支=1 controller+1 client+1 service 主件+3 spi/cache+" + + "14 service/support+16 model(dto7/vo9),与 find 实测同号") + .hasSize(37); assertThat(files.stream().map(p -> p.toString().replace('\\', '/')).toList()) .as("support 目录里的既有件必须在面里——聚合入口存在的理由就是拆分后的新文件要自动被看到") .anyMatch(rel -> rel.endsWith("service/support/AppearancePatentRowNormalizer.java")); @@ -366,18 +366,18 @@ class SourceScanTest { } @Test - void recursive_包含service_support下的既有13件() { + void recursive_包含service_support下的既有14件() { List support = SourceScan.moduleSources("modules/appearancepatent").stream() .map(p -> p.toString().replace('\\', '/')) .filter(rel -> rel.contains("/service/support/")) .toList(); assertThat(support) - .as("真实集成:对真仓 modules/appearancepatent/service/support 求值,实测 13 支(3A 拆薄把归属谓词、陈旧扫描、结果打包、LLM 批管线、载荷读写、结果行读取、进度视图、分片回传抽成八枚 support 件,5→13)。" + .as("真实集成:对真仓 modules/appearancepatent/service/support 求值,实测 14 支(3A 拆薄把归属谓词、陈旧扫描、结果打包、LLM 批管线、载荷读写、结果行读取、进度视图、分片回传、交付闸门抽成九枚 support 件,5→14)。" + "这一格就是聚合入口存在的理由——拆分出去的新文件必须自动进面") - .hasSize(13); + .hasSize(14); assertThat(support) - .as("3A 拆出去的八枚新件必须被逐枚点名扫到:只把分母数字改大,下一回拆件又只剩「数不对」" + .as("3A 拆出去的九枚新件必须被逐枚点名扫到:只把分母数字改大,下一回拆件又只剩「数不对」" + "一记红,证不了「扫得到」这件事") .anyMatch(rel -> rel.endsWith("service/support/AppearancePatentTaskOwnership.java")) .anyMatch(rel -> rel.endsWith("service/support/AppearancePatentStaleTaskScanner.java")) @@ -386,7 +386,8 @@ class SourceScanTest { .anyMatch(rel -> rel.endsWith("service/support/AppearancePatentPayloadSupport.java")) .anyMatch(rel -> rel.endsWith("service/support/AppearancePatentResultRowReader.java")) .anyMatch(rel -> rel.endsWith("service/support/AppearancePatentProgressSupport.java")) - .anyMatch(rel -> rel.endsWith("service/support/AppearancePatentChunkSubmissionSupport.java")); + .anyMatch(rel -> rel.endsWith("service/support/AppearancePatentChunkSubmissionSupport.java")) + .anyMatch(rel -> rel.endsWith("service/support/AppearancePatentDeliverySupport.java")); } @Test