From 3471a4429fee7b2aef94e37b0d7b4a2054480194 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Mon, 19 Oct 2026 09:07:29 +0800 Subject: [PATCH] =?UTF-8?q?refactor(phase-3):=203A=20=E6=8B=86=E8=96=84?= =?UTF-8?q?=E7=AC=AC=E4=B8=80=E7=AC=94=E2=80=94=E2=80=94appearancepatent?= =?UTF-8?q?=20=E7=9A=84=E6=AD=BB=20Excel=20=E8=AF=BB=E5=8F=96=E4=BB=B6?= =?UTF-8?q?=E5=87=BA=E4=BB=93=2070=20=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit AppearancePatentTaskService 棘轮读数 3458→3388。删的是八枚私有件: readHeaders/readRowValues/buildHeaderMap/findRequiredHeader/ findOptionalHeader/findOptionalHeaderExact/normalizeHeaderAlias/cell, 连同因此悬空的两个 POI import(DataFormatter、Row)。 判据不是"看着没人用":这八枚是 AppearancePatentExcelParser 抽走解析本体后的残留, 逐条数过文件内出现次数=1(只有定义行),src/test 全树零命中,跨五棵树的同名 命中全在别的模块自己的 parser 里(SimilarAsinExcelParser/SplitRunService/ AppearancePatentExcelParser 各有一份,不是对本支的引用)。私有方法没有反射、 DI、动态路由面(§1 铁律 2 五路复扫)。同段落里 isAppearanceResultWorkbook/ hasHeader/shouldInspectRow/baseId/normalizeDisplayId 仍在用,一个没碰。 门禁:AppearancePatent*Test 236 例全绿(含 parse-snapshot golden 那支), mvn -o compile 干净。golden 文件一字未动。 --- .../service/AppearancePatentTaskService.java | 70 ------------------- 1 file changed, 70 deletions(-) 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 cfe914cad..714d8b102 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 @@ -59,8 +59,6 @@ import com.nanri.aiimage.modules.task.service.TaskProgressSnapshotService; import com.nanri.aiimage.modules.task.service.TransientPayloadStorageService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.poi.ss.usermodel.DataFormatter; -import org.apache.poi.ss.usermodel.Row; import org.apache.poi.xssf.streaming.SXSSFWorkbook; import org.springframework.dao.DuplicateKeyException; import org.springframework.stereotype.Service; @@ -2847,23 +2845,6 @@ public class AppearancePatentTaskService { } } - private List readHeaders(Row header, DataFormatter formatter) { - List headers = new ArrayList<>(); - for (int i = 0; i < header.getLastCellNum(); i++) { - String val = normalize(formatter.formatCellValue(header.getCell(i))); - headers.add(val.isBlank() ? "列" + (i + 1) : val); - } - return headers; - } - - private Map readRowValues(Row row, List headers, DataFormatter formatter) { - Map values = new LinkedHashMap<>(); - for (int i = 0; i < headers.size(); i++) { - values.put(headers.get(i), cell(row, i, formatter)); - } - return values; - } - private boolean isAppearanceResultWorkbook(List headers) { return hasHeader(headers, "状态") && (hasHeader(headers, "结论") @@ -2894,57 +2875,6 @@ public class AppearancePatentTaskService { return row != null && (!normalize(row.getTitle()).isBlank() || !normalize(row.getUrl()).isBlank()); } - private Map buildHeaderMap(Row header, DataFormatter formatter) { - Map map = new LinkedHashMap<>(); - for (int i = 0; i < header.getLastCellNum(); i++) { - String val = normalize(formatter.formatCellValue(header.getCell(i))); - if (!val.isBlank()) { - map.putIfAbsent(val.toLowerCase(Locale.ROOT), i); - } - } - return map; - } - - private int findRequiredHeader(Map map, String... names) { - int idx = findOptionalHeader(map, names); - if (idx < 0) { - throw new BusinessException("缺少必要表头: " + String.join("/", names)); - } - return idx; - } - - private int findOptionalHeader(Map map, String... names) { - for (Map.Entry entry : map.entrySet()) { - for (String name : names) { - if (entry.getKey().contains(name.toLowerCase(Locale.ROOT))) { - return entry.getValue(); - } - } - } - return -1; - } - - private int findOptionalHeaderExact(Map map, String... names) { - for (Map.Entry entry : map.entrySet()) { - String normalizedHeader = normalizeHeaderAlias(entry.getKey()); - for (String name : names) { - if (normalizedHeader.equals(normalizeHeaderAlias(name))) { - return entry.getValue(); - } - } - } - return -1; - } - - private String normalizeHeaderAlias(String value) { - String normalized = normalize(value).toLowerCase(Locale.ROOT); - return normalized.replaceAll("[\\s_\\-()()\\[\\]{}::/\\\\]+", ""); - } - - private String cell(Row row, int col, DataFormatter formatter) { - return col < 0 ? "" : normalize(formatter.formatCellValue(row.getCell(col))); - } - private String baseId(String id) { String s = normalize(id); int idx = s.indexOf('_');