diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentSheetBuilder.java b/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentSheetBuilder.java index bb1b61003..7fea497ac 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentSheetBuilder.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentSheetBuilder.java @@ -241,9 +241,19 @@ public final class AppearancePatentSheetBuilder { return resolveResultStatus(conclusion); } + /** + * 状态列口径:商标维度与外观维度都给出有效判定才算「成功」。 + * 结论列只有在两个维度都成功时才会产出「侵权」/「无侵权」(见 AppearancePatentLlmClient#buildConclusion), + * 两者都含「侵权」二字;而「商标查询失败」(品牌检测上游查询失败)、「外观识别异常」、 + * LLM 技术性失败、空白都表示这一行没得出完整结论,一律判「失败」。 + * 历史缺陷:曾按「结论非空即成功」,于是结论列写着"商标查询失败"、状态列却写"成功"。 + */ public static String resolveResultStatus(String conclusion) { String normalized = conclusion == null ? "" : conclusion.trim(); - return normalized.isBlank() ? "失败" : "成功"; + if (normalized.isBlank() || isTechnicalLlmFailure(normalized)) { + return "失败"; + } + return normalized.contains("侵权") ? "成功" : "失败"; } public static boolean isTechnicalLlmFailure(String value) { 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 7f8d27013..40acdde58 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 @@ -363,7 +363,8 @@ class AppearancePatentTaskServiceDelegationTest { row.setTitleRisk("coze 调用超时"); row.setConclusion(""); assertEquals("coze 调用超时", AppearancePatentSheetBuilder.userFacingLlmCellValue(row, row.getTitleRisk())); - assertEquals("成功", AppearancePatentSheetBuilder.userFacingStatus(row)); + assertEquals("失败", AppearancePatentSheetBuilder.userFacingStatus(row), + "LLM 技术失败没得出判定 → 状态失败(旧口径按结论非空误判为成功)"); } @Test diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentSheetBuilderTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentSheetBuilderTest.java index 68c7c1ef1..e0ecee4c7 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentSheetBuilderTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentSheetBuilderTest.java @@ -209,11 +209,47 @@ class AppearancePatentSheetBuilderTest { Row data = wb.getSheet("外观专利检测结果").getRow(1); assertEquals("coze 工作流节点执行超限", data.getCell(9).getStringCellValue(), "LLM 技术失败展示错误信息"); - assertEquals("成功", data.getCell(12).getStringCellValue(), - "结论回退错误信息后非空即成功(与现状一致)"); + assertEquals("失败", data.getCell(12).getStringCellValue(), + "LLM 技术失败没得出判定,状态判失败"); } } + /** + * 结论列写「商标查询失败」时状态列必须判失败: + * 历史缺陷是按「结论非空即成功」推状态,于是结论写着"商标查询失败"、状态却写"成功",自相矛盾。 + */ + @Test + void test_sheet_builder_brand_query_failed_row_status_failed() throws Exception { + try (Workbook wb = new XSSFWorkbook()) { + AppearancePatentParsedRowVo p = parsedRow("2_1", "B01A", "US", "t", "", ""); + AppearancePatentResultRowDto r = resultRow("2_1", "B01A", "US"); + r.setTitleRisk("商标查询失败"); + r.setAppearanceRisk("无侵权"); + r.setConclusion("商标查询失败"); + AppearancePatentSheetBuilder.buildResultSheet(wb, List.of(p), Map.of( + AppearancePatentSheetBuilder.rowKey(r), r)); + + Row data = wb.getSheet("外观专利检测结果").getRow(1); + assertEquals("商标查询失败", data.getCell(9).getStringCellValue(), "标题维度保留查询失败文案"); + assertEquals("商标查询失败", data.getCell(11).getStringCellValue(), "结论列保留查询失败文案"); + assertEquals("失败", data.getCell(12).getStringCellValue(), "商标没成功 → 状态失败"); + } + } + + @Test + void test_sheet_builder_status_requires_both_dimensions_succeed() { + // 两个维度都给出有效判定 → 成功 + assertEquals("成功", AppearancePatentSheetBuilder.resolveResultStatus("侵权")); + assertEquals("成功", AppearancePatentSheetBuilder.resolveResultStatus("无侵权")); + assertEquals("成功", AppearancePatentSheetBuilder.resolveResultStatus("已侵权")); + // 商标没成功 / 外观识别异常 / 技术失败 / 空白 → 失败 + assertEquals("失败", AppearancePatentSheetBuilder.resolveResultStatus("商标查询失败")); + assertEquals("失败", AppearancePatentSheetBuilder.resolveResultStatus("外观识别异常")); + assertEquals("失败", AppearancePatentSheetBuilder.resolveResultStatus("LLM http 503: overloaded")); + assertEquals("失败", AppearancePatentSheetBuilder.resolveResultStatus(" ")); + assertEquals("失败", AppearancePatentSheetBuilder.resolveResultStatus(null)); + } + @Test void test_sheet_builder_blank_asin_reason_row_skipped() throws Exception { try (Workbook wb = new XSSFWorkbook()) {