From 4c1a2a9ffb317b01e62acbe6de7383c6cb6fa8d3 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 11:34:37 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E7=9B=B8=E4=BC=BCASIN):=20=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E4=B8=BA=E7=A9=BA=E6=97=B6=E6=8A=8A=E7=9C=9F=E5=9B=A0?= =?UTF-8?q?=E5=86=99=E8=BF=9B=E5=A4=B1=E8=B4=A5=E6=96=87=E6=A1=88=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E5=86=8D=E5=BB=BA=E8=AE=AE=E9=87=8D=E8=AF=95=E7=94=9F?= =?UTF-8?q?=E6=88=90=E7=BB=93=E6=9E=9C=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 装配失败时原本只剩一句「请稍后重试生成结果文件」:同一份数据重跑只会得到同一份 空结果,这句建议做不到;而客户端上报的 error、行级 error/reason、分片读取失败本来 都在,只是被丢掉了。bounded/unbounded 两条路径现在都带上这些原因,并去掉做不到的 重试建议。新增归纳规则的纯函数单测,另加出口接线守卫防止文案退回。 --- .../support/SimilarAsinResultTextSupport.java | 105 +++++++++++++++ .../SimilarAsinResultWorkbookAssembler.java | 35 +++-- .../SimilarAsinChineseMessageGuardTest.java | 19 ++- .../SimilarAsinResultTextSupportTest.java | 122 ++++++++++++++++++ 4 files changed, 266 insertions(+), 15 deletions(-) create mode 100644 backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinResultTextSupportTest.java diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinResultTextSupport.java b/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinResultTextSupport.java index 8bf77d4ac..c33ccd773 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinResultTextSupport.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinResultTextSupport.java @@ -4,8 +4,10 @@ import com.nanri.aiimage.modules.similarasin.model.dto.SimilarAsinResultRowDto; import java.util.ArrayList; import java.util.Collection; +import java.util.LinkedHashMap; import java.util.List; import java.util.Locale; +import java.util.Map; import java.util.regex.Pattern; /** @@ -34,6 +36,12 @@ public final class SimilarAsinResultTextSupport { private static final Pattern DETERMINISTIC_INPUT_FAILURE_PATTERN = Pattern.compile( "fields\\s+cannot\\s+be\\s+extracted\\s+from\\s+null\\s+values" + "|\\b720712000\\b"); + /** 行级原因最多列几类:文案种类可能很多,全列会把 error_message(1000) 撑爆。 */ + private static final int MAX_ROW_CAUSE_KINDS = 3; + private static final int MAX_ROW_CAUSE_CHARS = 80; + private static final int MAX_CLIENT_ERROR_CHARS = 200; + /** biz_file_task.error_message 是 VARCHAR(1000),给外层前缀留余量。 */ + private static final int MAX_FAILURE_DETAIL_CHARS = 900; private SimilarAsinResultTextSupport() { } @@ -203,6 +211,103 @@ public final class SimilarAsinResultTextSupport { return "另有 " + blankCells + " 个图片单元格未能嵌入(图片源站响应过慢),数据列不受影响"; } + /** + * 把「结果为空」时已回传行的 error/reason 归纳成一句人能读的原因。 + * + *

线上 25 单空结果(2026-10-16~20)界面上只有一句「请稍后重试生成结果文件」: + * 真实原因本来就随行回传了(扩展不可用、商品页抓取失败等),却在装配阶段被丢掉。 + * 这里按出现次数取前几类,长文案截断,避免把 error_message 撑爆。 + */ + public static String summarizeRowFailures(Collection rows) { + if (rows == null || rows.isEmpty()) { + return ""; + } + Map causes = new LinkedHashMap<>(); + int rowsWithoutCause = 0; + for (SimilarAsinResultRowDto row : rows) { + if (row == null) { + continue; + } + String cause = SimilarAsinRowNormalizer.normalize(row.getError()); + if (cause.isBlank()) { + cause = SimilarAsinRowNormalizer.normalize(row.getReason()); + } + if (cause.isBlank()) { + rowsWithoutCause++; + continue; + } + causes.merge(abbreviate(cause, MAX_ROW_CAUSE_CHARS), 1, Integer::sum); + } + List> topCauses = causes.entrySet().stream() + .sorted(Map.Entry.comparingByValue().reversed()) + .limit(MAX_ROW_CAUSE_KINDS) + .toList(); + StringBuilder summary = new StringBuilder(); + for (Map.Entry cause : topCauses) { + if (summary.length() > 0) { + summary.append('、'); + } + summary.append('「').append(cause.getKey()).append('」') + .append(cause.getValue()).append(" 行"); + } + if (causes.size() > topCauses.size()) { + if (summary.length() > 0) { + summary.append('、'); + } + summary.append("等 ").append(causes.size()).append(" 类"); + } + if (rowsWithoutCause > 0) { + if (summary.length() > 0) { + summary.append(";"); + } + summary.append("另有 ").append(rowsWithoutCause).append(" 行没带错误信息"); + } + return summary.toString(); + } + + /** + * 「结果为空」的失败详情:行数账 + 客户端上报的原因 + 行级原因 + 分片读取失败。 + * + *

不再附「请稍后重试生成结果文件」:同一份数据重跑装配只会得到同一份空结果, + * 这句建议做不到,等于把用户拖进无意义的重复提交。 + */ + public static String emptyResultFailureDetail(int parsedRows, + int persistedRows, + String clientError, + String rowFailureSummary, + String chunkReadFailureSummary) { + String clientCause = abbreviate(SimilarAsinRowNormalizer.normalize(clientError), + MAX_CLIENT_ERROR_CHARS); + StringBuilder detail = new StringBuilder() + .append("上传解析 ").append(parsedRows) + .append(" 行,客户端回传 ").append(persistedRows) + .append(" 行,可导出 0 行"); + if (!clientCause.isBlank()) { + detail.append(";客户端报告:").append(clientCause); + } + if (rowFailureSummary != null && !rowFailureSummary.isBlank()) { + detail.append(";行级原因:").append(rowFailureSummary.trim()); + } + if (chunkReadFailureSummary != null && !chunkReadFailureSummary.isBlank()) { + detail.append(";").append(chunkReadFailureSummary.trim()); + } + if (clientCause.isBlank() + && (rowFailureSummary == null || rowFailureSummary.isBlank()) + && (chunkReadFailureSummary == null || chunkReadFailureSummary.isBlank())) { + detail.append(persistedRows == 0 + ? ";客户端没有回传任何结果行,任务可能没有真正执行,请查看客户端任务日志" + : ";回传的行没有标题、图片等可导出字段,也没有错误信息,请查看客户端任务日志"); + } + return abbreviate(detail.toString(), MAX_FAILURE_DETAIL_CHARS); + } + + private static String abbreviate(String text, int maxChars) { + if (text == null) { + return ""; + } + return text.length() <= maxChars ? text : text.substring(0, maxChars) + "…"; + } + public static boolean isExportableResultRow(SimilarAsinResultRowDto row) { if (row == null) { return false; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinResultWorkbookAssembler.java b/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinResultWorkbookAssembler.java index 7d09533bf..990b1563e 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinResultWorkbookAssembler.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinResultWorkbookAssembler.java @@ -140,7 +140,9 @@ public class SimilarAsinResultWorkbookAssembler { List sourceRows = splitRowsBySourceFile( parsed, parsedRows, result.getSourceFilename()); if (sourceRows.isEmpty()) { - throw new BusinessException("这份文件没有解析到可导出的行,请稍后重试生成结果文件"); + // 同一份文件重跑装配不会多出行来:这里只能让用户回去检查上传内容,不能建议重试装配 + throw new BusinessException("这份文件没有解析到可导出的行(解析到 " + + parsedRows.size() + " 行),请检查上传文件是否有数据行、模板列名是否正确,然后重新提交任务"); } File outputDir = new File(storageProperties.getLocalTempDir(), "similar-asin-result"); @@ -175,6 +177,7 @@ public class SimilarAsinResultWorkbookAssembler { Map sourceResultMap = loadPersistedResultRowsForRowsWithRetry(task.getId(), captured.rows()); int persistedRows = sourceResultMap.size(); + String rowFailureSummary = SimilarAsinResultTextSupport.summarizeRowFailures(sourceResultMap.values()); sourceResultMap.entrySet().removeIf(entry -> !SimilarAsinResultTextSupport.isExportableResultRow(entry.getValue())); long resolvedRows = captured.rows().stream() .filter(row -> SimilarAsinChunkMergeSupport.findResultRow(row, sourceResultMap) != null) @@ -197,7 +200,8 @@ public class SimilarAsinResultWorkbookAssembler { ensureResultAssemblyNotInterrupted(); return new SourceResultWorkbook( xlsx, filename, captured.rows().size(), persistedRows, - sourceResultMap.size(), resolvedRows, conformPropagated, undeliveredRows); + sourceResultMap.size(), resolvedRows, conformPropagated, undeliveredRows, + rowFailureSummary); })); } try { @@ -253,10 +257,13 @@ public class SimilarAsinResultWorkbookAssembler { resolvedRows, conformPropagated, undeliveredRows, sourceRows.size(), System.currentTimeMillis() - assembleStart); if (resultRows == 0) { - String failureSummary = chunkPayloadSupport.collectChunkReadFailureSummary(task.getId()); - throw new BusinessException(failureSummary.isBlank() - ? "相似ASIN检测结果为空,请稍后重试生成结果文件" - : "相似ASIN检测结果为空(" + failureSummary + "),请稍后重试生成结果文件"); + String rowFailureSummary = workbooks.stream() + .map(SourceResultWorkbook::rowFailureSummary) + .filter(summary -> summary != null && !summary.isBlank()) + .collect(java.util.stream.Collectors.joining(";")); + throw new BusinessException("相似ASIN检测结果为空:" + SimilarAsinResultTextSupport.emptyResultFailureDetail( + parsedRows.size(), persistedResultRows, task.getErrorMessage(), rowFailureSummary, + chunkPayloadSupport.collectChunkReadFailureSummary(task.getId()))); } taskImageCache.clear(); @@ -310,6 +317,7 @@ public class SimilarAsinResultWorkbookAssembler { List parsedRows = SimilarAsinPayloadSupport.resolveAllRows(parsed); Map resultMap = loadPersistedResultRowsWithRetry(task.getId(), parsedRows.size()); int persistedResultRows = resultMap.size(); + String rowFailureSummary = SimilarAsinResultTextSupport.summarizeRowFailures(resultMap.values()); resultMap.entrySet().removeIf(entry -> !SimilarAsinResultTextSupport.isExportableResultRow(entry.getValue())); long resolvedRows = parsedRows.stream() .filter(row -> SimilarAsinChunkMergeSupport.findResultRow(row, resultMap) != null) @@ -319,10 +327,9 @@ public class SimilarAsinResultWorkbookAssembler { if (!parsedRows.isEmpty() && resultMap.isEmpty()) { // P1-4:检查是否有 chunk-read-failed 标记,把 chunk index 列表附在错误信息里。 String chunkReadFailureSummary = chunkPayloadSupport.collectChunkReadFailureSummary(task.getId()); - if (!chunkReadFailureSummary.isBlank()) { - throw new BusinessException("相似ASIN检测结果为空(" + chunkReadFailureSummary + "),请稍后重试生成结果文件"); - } - throw new BusinessException("相似ASIN检测结果为空,请稍后重试生成结果文件"); + throw new BusinessException("相似ASIN检测结果为空:" + SimilarAsinResultTextSupport.emptyResultFailureDetail( + parsedRows.size(), persistedResultRows, task.getErrorMessage(), rowFailureSummary, + chunkReadFailureSummary)); } // 公共分组处理:同 baseId 连续行视为一组(如 1、1_1、1_2),组内任一行的"是否符合类目" // 命中"不符合"(包含匹配),则组内所有行的"是否符合类目"统一为标准值"不符合"。 @@ -416,7 +423,8 @@ public class SimilarAsinResultWorkbookAssembler { // 主动清空,让 GC 尽早回收图片字节,避免 zip 阶段还占着堆。 taskImageCache.clear(); if (workbooks.isEmpty()) { - throw new BusinessException("相似ASIN检测结果为空,请稍后重试生成结果文件"); + throw new BusinessException("相似ASIN检测结果为空:上传解析 " + parsedRows.size() + + " 行,但没有可生成的结果行,请检查上传文件内容后重新提交任务"); } File uploadFile; @@ -1098,9 +1106,10 @@ public class SimilarAsinResultWorkbookAssembler { int resultRows, long resolvedRows, int conformPropagated, - long undeliveredRows) { + long undeliveredRows, + String rowFailureSummary) { private SourceResultWorkbook(File file, String filename, int rowCount) { - this(file, filename, rowCount, 0, 0, 0L, 0, 0L); + this(file, filename, rowCount, 0, 0, 0L, 0, 0L, ""); } } diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinChineseMessageGuardTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinChineseMessageGuardTest.java index a6a931566..6b6df0ef9 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinChineseMessageGuardTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinChineseMessageGuardTest.java @@ -37,8 +37,12 @@ class SimilarAsinChineseMessageGuardTest { "modules/similarasin/service/SimilarAsinTaskService.java", "modules/similarasin/service/support/SimilarAsinResultWorkbookAssembler.java"); - /** 2026-10-09 实测:TaskService 42 个出口 + Assembler 20 个出口。新增/删除出口要同步改这里。 */ - private static final int SCANNED_SITE_COUNT = 62; + /** + * 2026-10-09 实测:TaskService 42 个出口 + Assembler 20 个出口。 + * 2026-10-20 空结果的两条 throw 合并成一条(文案带真因)→ Assembler 19,合计 61。 + * 新增/删除出口要同步改这里。 + */ + private static final int SCANNED_SITE_COUNT = 61; /** 文案来自变量、字面量判据覆盖不到的出口,按构造点名(行号会漂)。 */ private static final List VARIABLE_FED_OUTLETS = List.of( @@ -71,6 +75,17 @@ class SimilarAsinChineseMessageGuardTest { } } + @Test + void emptyResultFailuresMustCarryTheRealCause() throws IOException { + String source = readSource("modules/similarasin/service/support/SimilarAsinResultWorkbookAssembler.java"); + assertThat(source) + .as("「请稍后重试生成结果文件」在空结果场景做不到:同一份数据重跑装配还是同一份空结果") + .doesNotContain("请稍后重试生成结果文件"); + assertThat(source) + .as("空结果出口必须接上真因归纳(客户端上报 + 行级 error/reason + 分片读取失败)") + .contains("emptyResultFailureDetail"); + } + @Test void everyMessageOutletStartsWithChinese() throws IOException { List offenders = new ArrayList<>(); diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinResultTextSupportTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinResultTextSupportTest.java new file mode 100644 index 000000000..17dcd9d61 --- /dev/null +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinResultTextSupportTest.java @@ -0,0 +1,122 @@ +package com.nanri.aiimage.modules.similarasin.service.support; + +import static org.assertj.core.api.Assertions.assertThat; + +import com.nanri.aiimage.modules.similarasin.model.dto.SimilarAsinResultRowDto; +import java.util.ArrayList; +import java.util.List; +import org.junit.jupiter.api.Test; + +/** + * 空结果失败文案:真因必须写进 error_message,且不能超过 VARCHAR(1000)。 + * + *

线上 25 单(2026-10-16~20)只看到「请稍后重试生成结果文件」——同一份数据重跑装配 + * 只会得到同一份空结果,这句建议做不到;而客户端上报的原因、行级 error/reason 本来都在, + * 只是装配阶段丢掉了。这里把归纳规则钉死。 + */ +class SimilarAsinResultTextSupportTest { + + @Test + void summarizeRowFailures_countsErrorAndFallsBackToReason() { + List rows = new ArrayList<>(); + rows.add(row("aiprice 未登录", "")); + rows.add(row("aiprice 未登录", "")); + rows.add(row("", "商品页抓取超时")); + rows.add(row("", "")); + rows.add(null); + + String summary = SimilarAsinResultTextSupport.summarizeRowFailures(rows); + + assertThat(summary) + .contains("「aiprice 未登录」2 行") + .contains("「商品页抓取超时」1 行") + .contains("另有 1 行没带错误信息"); + } + + @Test + void summarizeRowFailures_keepsTopThreeKindsAndCountsTheRest() { + List rows = new ArrayList<>(); + for (int i = 0; i < 5; i++) { + rows.add(row("原因A", "")); + } + for (int i = 0; i < 4; i++) { + rows.add(row("原因B", "")); + } + for (int i = 0; i < 3; i++) { + rows.add(row("原因C", "")); + } + for (int i = 0; i < 2; i++) { + rows.add(row("原因D", "")); + } + + String summary = SimilarAsinResultTextSupport.summarizeRowFailures(rows); + + assertThat(summary).contains("「原因A」5 行").contains("「原因B」4 行").contains("「原因C」3 行"); + assertThat(summary).doesNotContain("原因D", "只列前 3 类,否则长任务会把 error_message 撑爆"); + assertThat(summary).contains("等 4 类"); + } + + @Test + void summarizeRowFailures_truncatesLongCause() { + String longCause = "扩展注入失败".repeat(40); + + String summary = SimilarAsinResultTextSupport.summarizeRowFailures(List.of(row(longCause, ""))); + + assertThat(summary).contains("…"); + assertThat(summary.length()).isLessThan(longCause.length() + 20); + } + + @Test + void emptyResultFailureDetail_carriesClientErrorRowCausesAndChunkFailures() { + String detail = SimilarAsinResultTextSupport.emptyResultFailureDetail( + 112, 112, "相似ASIN环境不可用:扩展注入失败", "「aiprice 未登录」112 行", "第 3 分片读取失败"); + + assertThat(detail) + .contains("上传解析 112 行,客户端回传 112 行,可导出 0 行") + .contains("客户端报告:相似ASIN环境不可用:扩展注入失败") + .contains("行级原因:「aiprice 未登录」112 行") + .contains("第 3 分片读取失败"); + } + + @Test + void emptyResultFailureDetail_neverAdvisesAnImpossibleRetry() { + String withCause = SimilarAsinResultTextSupport.emptyResultFailureDetail( + 10, 10, "扩展注入失败", "「aiprice 未登录」10 行", ""); + String withoutCause = SimilarAsinResultTextSupport.emptyResultFailureDetail( + 10, 0, "", "", ""); + + assertThat(withCause).doesNotContain("请稍后重试"); + assertThat(withoutCause).doesNotContain("请稍后重试"); + } + + @Test + void emptyResultFailureDetail_explainsWhenClientUploadedNothing() { + String detail = SimilarAsinResultTextSupport.emptyResultFailureDetail(0, 0, "", "", ""); + + assertThat(detail).contains("客户端没有回传任何结果行"); + } + + @Test + void emptyResultFailureDetail_explainsWhenRowsHaveNoExportableFields() { + String detail = SimilarAsinResultTextSupport.emptyResultFailureDetail(10, 10, "", "", ""); + + assertThat(detail).contains("回传的行没有标题、图片等可导出字段"); + } + + @Test + void emptyResultFailureDetail_fitsErrorMessageColumn() { + String huge = "x".repeat(5000); + + String detail = SimilarAsinResultTextSupport.emptyResultFailureDetail(9999, 9999, huge, huge, huge); + + assertThat(detail.length()).isLessThanOrEqualTo(901); + assertThat(detail).endsWith("…"); + } + + private static SimilarAsinResultRowDto row(String error, String reason) { + SimilarAsinResultRowDto row = new SimilarAsinResultRowDto(); + row.setError(error); + row.setReason(reason); + return row; + } +}