From e265c188f789c4434372b596cc32c468ae7ee841 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Sun, 25 Oct 2026 21:28:26 +0800 Subject: [PATCH] =?UTF-8?q?fix(appearance-patent):=20=E4=BB=A3=E7=90=86?= =?UTF-8?q?=E7=BC=BA=E5=A4=B1=E5=9B=9E=E5=A1=AB=E4=B8=8E=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=89=8D=E7=BD=AE=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 本地代理回填兼容旧版全局 proxy_url,补报成功后重拉服务端快照 - 创建任务前检查服务端代理,缺失时弹窗拦截并引导配置 - 商标查询失败的真实原因写入结果原因列,不再只显示查询失败 --- .../client/AppearancePatentLlmClient.java | 8 +- .../AppearancePatentBrandBatchTest.java | 30 +++++++ .../components/BrandAppearancePatentTab.vue | 27 +++++- .../components/ApiSecretSettingsPanel.vue | 9 +- .../src/shared/utils/api-secret-store.ts | 86 ++++++++++++++---- .../appearance-patent-failed-status.test.ts | 13 +++ frontend-vue/tests/secret-store.test.ts | 88 +++++++++++++++++++ 7 files changed, 239 insertions(+), 22 deletions(-) diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/client/AppearancePatentLlmClient.java b/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/client/AppearancePatentLlmClient.java index f063614d4..99c460038 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/client/AppearancePatentLlmClient.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/client/AppearancePatentLlmClient.java @@ -1156,7 +1156,13 @@ public class AppearancePatentLlmClient { row.setPatentRisk(result.patent()); row.setConclusion(buildConclusion(row.getTitleRisk(), row.getAppearanceRisk(), result.result())); row.setStatus(result.status()); - row.setTitleReason(result.titleReason()); + // 商标查询失败时把上游给的真实原因(如「用户未配置代理」「品牌检测服务不可达」) + // 落进「原因」sheet:只写「商标查询失败」时,用户和运维都看不出该去配代理还是等上游恢复。 + String titleReason = result.titleReason(); + if ((titleReason == null || titleReason.isBlank()) && isBrandQueryFailed(row.getTitleRisk())) { + titleReason = brandCheck == null ? "" : brandCheck.reason(); + } + row.setTitleReason(titleReason); row.setAppearanceReason(result.appearanceReason()); row.setPatentReason(result.patentReason()); row.setScore(result.score()); diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/appearancepatent/client/AppearancePatentBrandBatchTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/appearancepatent/client/AppearancePatentBrandBatchTest.java index 794d4b12e..e84d017fa 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/appearancepatent/client/AppearancePatentBrandBatchTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/appearancepatent/client/AppearancePatentBrandBatchTest.java @@ -78,6 +78,36 @@ class AppearancePatentBrandBatchTest { assertThat(merged.get(1).getTitleRisk()).as("干净行不得继承别行的侵权词").isEqualTo("无侵权"); } + /** + * 商标查询失败时,上游给的真实原因要落进行级原因,不能只留一句「商标查询失败」。 + * 2026-10-25 账号 1210 的 32300/32309 整批就是这个形状:服务端缺代理, + * 交付表上每行只有「商标查询失败」,用户和运维都看不出该去配代理。 + */ + @Test + void brandQueryFailureReasonIsKeptForTheResult() throws Exception { + when(brandCheckClient.checkTitleTexts(anyList(), eq("Terms"), any())).thenAnswer(invocation -> { + List titles = invocation.getArgument(0); + List results = new ArrayList<>(); + for (String title : titles) { + results.add(new BrandCheckClient.BrandCheckBatchResult( + List.of(title), List.of(), List.of(title), "用户未配置代理")); + } + return results; + }); + List rows = List.of(row("1")); + String dataText = """ + {"data":[{"row_id":"1","title":"小米","appearance":"无侵权","result":"无侵权"}]} + """; + + List merged = client.mergeRowsFromDataText(rows, dataText); + + assertThat(merged.get(0).getTitleRisk()).startsWith("商标查询失败"); + assertThat(merged.get(0).getConclusion()).isEqualTo("外观无侵权·商标待复核"); + assertThat(merged.get(0).getTitleReason()) + .as("原因列要能直接告诉用户/运维缺的是代理") + .isEqualTo("用户未配置代理"); + } + @Test void batchWithNothingToCheckSendsNoBrandQueryAtAll() throws Exception { List rows = List.of(row("1")); diff --git a/frontend-vue/src/pages/brand/components/BrandAppearancePatentTab.vue b/frontend-vue/src/pages/brand/components/BrandAppearancePatentTab.vue index ef3e6737c..cb90006c0 100644 --- a/frontend-vue/src/pages/brand/components/BrandAppearancePatentTab.vue +++ b/frontend-vue/src/pages/brand/components/BrandAppearancePatentTab.vue @@ -73,7 +73,7 @@