diff --git a/backend-java/pom.xml b/backend-java/pom.xml index 04e0720cc..b41259e05 100644 --- a/backend-java/pom.xml +++ b/backend-java/pom.xml @@ -19,7 +19,6 @@ 21 4.5.0 3.5.7 - 1.5.5.Final 4.0.3 5.8.36 2.3.5 @@ -135,11 +134,6 @@ lombok true - - org.mapstruct - mapstruct - ${mapstruct.version} - org.springframework.boot spring-boot-configuration-processor @@ -177,11 +171,6 @@ lombok 1.18.36 - - org.mapstruct - mapstruct-processor - ${mapstruct.version} - 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 0dd846c9c..b6cdaabb7 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 @@ -2561,11 +2561,6 @@ public class AppearancePatentTaskService { return result; } - private Map loadPersistedResultRowsForResultRows( - Long taskId, List requestedRows) { - Set requestedKeys = resultLookupKeysForResultRows(requestedRows); - return loadPersistedResultRowsForKeys(taskId, requestedKeys); - } private Map loadPersistedResultRowsForKeys( Long taskId, Set requestedKeys) { @@ -2651,15 +2646,6 @@ public class AppearancePatentTaskService { } } - private AppearancePatentResultRowDto findPersistedResultRow( - AppearancePatentResultRowDto row, - Map resultMap) { - if (row == null || resultMap == null || resultMap.isEmpty()) { - return null; - } - AppearancePatentResultRowDto result = resultMap.get(rowKey(row)); - return result == null ? resultMap.get(legacyRowKey(row)) : result; - } private void sleepBeforeResultRowsRetry(int attempt) { try { @@ -2683,25 +2669,6 @@ public class AppearancePatentTaskService { } } - private AppearancePatentResultRowDto findResultRowByAsin(String asin, Map resultMap) { - String normalizedAsin = normalize(asin).toUpperCase(Locale.ROOT); - if (normalizedAsin.isBlank() || resultMap == null || resultMap.isEmpty()) { - return null; - } - AppearancePatentResultRowDto fallback = null; - for (AppearancePatentResultRowDto row : resultMap.values()) { - if (row == null || !normalizedAsin.equals(normalize(row.getAsin()).toUpperCase(Locale.ROOT))) { - continue; - } - if (hasResolvedLlmFields(row) || hasReasonFields(row)) { - return row; - } - if (fallback == null) { - fallback = row; - } - } - return fallback; - } private boolean hasReasonFields(AppearancePatentResultRowDto row) { if (row == null) { @@ -3124,10 +3091,6 @@ public class AppearancePatentTaskService { return transientPayloadStorageService.storeChunkPayloadVersioned(MODULE_TYPE, taskId, scopeHash, chunkIndex, payloadJson); } - private String storeSharedLlmBatchPayload(Long taskId, String scopeHash, String payloadJson) { - requireSharedTransientPayloadStorage("llm batch payload"); - return transientPayloadStorageService.storeParsedPayloadFast(MODULE_TYPE, taskId, scopeHash, payloadJson, true); - } private void requireSharedTransientPayloadStorage(String payloadType) { if (!transientPayloadStorageService.isSharedWriteEnabled()) { diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/dedupe/service/DedupeTotalDataService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/dedupe/service/DedupeTotalDataService.java index 1cca2e6ff..a104416e9 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/dedupe/service/DedupeTotalDataService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/dedupe/service/DedupeTotalDataService.java @@ -1201,12 +1201,6 @@ public class DedupeTotalDataService { return dedupeTotalDataMapper.selectOne(query) != null; } - private int deleteByDataValue(String dataValue, AccessScope scope, Long groupId) { - LambdaQueryWrapper query = new LambdaQueryWrapper() - .eq(DedupeTotalDataEntity::getDataValue, dataValue); - applyGroupScope(query, scope, groupId); - return dedupeTotalDataMapper.delete(query); - } /** 批量删除大小:单事务 IN 删除的阈值,兼顾锁窗口与事务日志。 */ private static final int DELETE_BATCH_SIZE = 500; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/service/DeleteBrandRunService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/service/DeleteBrandRunService.java index b66077313..c2bda4e15 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/service/DeleteBrandRunService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/deletebrand/service/DeleteBrandRunService.java @@ -2094,37 +2094,6 @@ public class DeleteBrandRunService { ); } - private File buildResultWorkbook(Long taskId, - DeleteBrandParsedFileCacheDto parsedFile, - MergedDeleteBrandFile mergedFile) { - File outputDir = FileUtil.mkdir(FileUtil.file(System.getProperty("java.io.tmpdir"), "delete-brand-result", String.valueOf(taskId))); - File outputFile = buildNamedOutputFile(outputDir, blankToDefault(parsedFile.getSourceFilename(), "delete-brand-result.xlsx")); - - try (SXSSFWorkbook workbook = new SXSSFWorkbook(200); - FileOutputStream outputStream = new FileOutputStream(outputFile)) { - workbook.setCompressTempFiles(true); - Sheet sheet = workbook.createSheet("删除品牌结果"); - Row headerRow = sheet.createRow(0); - headerRow.createCell(0).setCellValue("国家"); - headerRow.createCell(1).setCellValue("删除ASIN"); - headerRow.createCell(2).setCellValue("状态"); - - int rowIndex = 1; - for (DeleteBrandProcessedCountryDto country : mergedFile.countries()) { - for (DeleteBrandCountryResultItemDto item : country.getItems()) { - Row row = sheet.createRow(rowIndex++); - createTextCell(row, 0, country.getCountry()); - createTextCell(row, 1, item.getAsin()); - createTextCell(row, 2, item.getStatus()); - } - } - applyDeleteBrandColumnWidths(sheet, 3); - workbook.write(outputStream); - return outputFile; - } catch (Exception ex) { - throw new BusinessException("生成删除品牌结果文件失败: " + parsedFile.getSourceFilename()); - } - } private File buildResultWorkbookPreserveLayout(Long taskId, DeleteBrandParsedFileCacheDto parsedFile, diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/patroldelete/service/PatrolDeleteTaskService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/patroldelete/service/PatrolDeleteTaskService.java index 144caed08..ab80d9bd2 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/patroldelete/service/PatrolDeleteTaskService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/patroldelete/service/PatrolDeleteTaskService.java @@ -521,11 +521,6 @@ public class PatrolDeleteTaskService { taskCacheService.saveTaskCache(task); } - private void cleanupTaskAuxiliaryData(Long taskId) { - taskResultItemService.deleteTaskItems(taskId, MODULE_TYPE); - taskProgressSnapshotService.delete(taskId, MODULE_TYPE); - taskFileJobService.deleteTaskJobs(taskId, MODULE_TYPE); - } private void cleanupTaskAuxiliaryDataFast(Long taskId) { taskResultItemService.deleteTaskItemsRowsOnly(taskId, MODULE_TYPE); @@ -534,10 +529,6 @@ public class PatrolDeleteTaskService { taskFileJobService.deleteTaskJobs(taskId, MODULE_TYPE); } - private void cleanupResultAuxiliaryData(Long taskId, Long resultId) { - taskResultItemService.deleteResultItem(taskId, MODULE_TYPE, resultId); - taskFileJobService.deleteResultJobs(taskId, MODULE_TYPE, resultId); - } private void cleanupResultAuxiliaryDataFast(Long taskId, Long resultId) { taskResultItemService.deleteResultItemRowsOnly(taskId, MODULE_TYPE, resultId); diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/publish/service/PublishWorkbookService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/publish/service/PublishWorkbookService.java index d27dc9b37..314735888 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/publish/service/PublishWorkbookService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/publish/service/PublishWorkbookService.java @@ -175,22 +175,6 @@ public class PublishWorkbookService { return row; } - private Map> groupByCountry(List rows) { - Map> grouped = new LinkedHashMap<>(); - if (rows != null) { - for (PublishRowDto row : rows) { - if (row == null) { - continue; - } - String country = countrySheetName(row.getCountry()); - grouped.computeIfAbsent(country, ignored -> new ArrayList<>()).add(row); - } - } - if (grouped.isEmpty()) { - grouped.put("空数据", List.of()); - } - return grouped; - } private void writeSheet(Sheet sheet, List rows, diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/service/QueryAsinTaskService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/service/QueryAsinTaskService.java index 469b5a644..acaca5e4f 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/service/QueryAsinTaskService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/queryasin/service/QueryAsinTaskService.java @@ -880,33 +880,6 @@ public class QueryAsinTaskService { return new ArrayList<>(map.values()); } - private List mergeCountryAsins(List base, List incoming) { - Map map = new LinkedHashMap<>(); - for (QueryAsinCountryAsinsDto item : copyCountryAsins(base)) { - map.put(item.getCountry(), item); - } - for (QueryAsinCountryAsinsDto item : copyCountryAsins(incoming)) { - String country = normalizeCountry(item.getCountry()); - if (blank(country)) { - continue; - } - item.setCountry(country); - QueryAsinCountryAsinsDto existing = map.get(country); - if (existing == null) { - map.put(country, item); - continue; - } - List merged = new ArrayList<>(existing.getAsins() == null ? List.of() : existing.getAsins()); - for (String asin : item.getAsins() == null ? List.of() : item.getAsins()) { - String normalized = normalizeAsin(asin); - if (!normalized.isEmpty() && !merged.contains(normalized)) { - merged.add(normalized); - } - } - existing.setAsins(merged); - } - return new ArrayList<>(map.values()); - } private boolean hasAnyPayloadData(QueryAsinShopPayloadDto payload) { if (payload == null) { diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/service/ShopDataCrawlTaskService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/service/ShopDataCrawlTaskService.java index a56669164..7d27ae97c 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/service/ShopDataCrawlTaskService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopdatacrawl/service/ShopDataCrawlTaskService.java @@ -2419,15 +2419,6 @@ public class ShopDataCrawlTaskService { return false; } - private boolean sameDailyFileState(ShopDataCrawlDailyFileEntity expected, - ShopDataCrawlDailyFileEntity actual) { - if (expected == null || actual == null) { - return expected == actual; - } - return Objects.equals(expected.getId(), actual.getId()) - && Objects.equals(expected.getVersion(), actual.getVersion()) - && Objects.equals(expected.getResultFileUrl(), actual.getResultFileUrl()); - } private ShopDataCrawlDailyFileEntity findExistingDailyMembership(Long resultId) { List members = dailyFileService.findMembersByResultId(resultId); diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopmatch/service/ShopMatchTaskService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopmatch/service/ShopMatchTaskService.java index fe3badd63..fc955f2da 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/shopmatch/service/ShopMatchTaskService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopmatch/service/ShopMatchTaskService.java @@ -1241,10 +1241,6 @@ public class ShopMatchTaskService { return stages; } - private LocalDateTime loadScheduledAt(Long taskId) { - FileTaskEntity task = loadTaskForExecution(taskId); - return task == null ? null : task.getScheduledAt(); - } private void mergeQueueFieldsFromRequest(ProductRiskResultItemVo vo, Long taskId) { FileTaskEntity task = loadTaskForExecution(taskId); diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/client/ZiniaoClientImpl.java b/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/client/ZiniaoClientImpl.java index 1ca4dcf60..642779f1b 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/client/ZiniaoClientImpl.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/client/ZiniaoClientImpl.java @@ -210,27 +210,6 @@ public class ZiniaoClientImpl implements ZiniaoClient { return raw; } - private String postWithAuthorization(String path, String authorization, Map body, String action) { - String token = requireText(authorization, "紫鸟授权 token 未配置"); - RestClient.RequestBodySpec request = getRestClient().post() - .uri(joinUrl(ziniaoProperties.getBaseUrl(), path)) - .headers(headers -> { - if (token.regionMatches(true, 0, "Bearer ", 0, 7)) { - headers.set("Authorization", token); - } else { - headers.setBearerAuth(token); - } - headers.setContentType(MediaType.APPLICATION_JSON); - }); - if (body != null) { - request.body(body); - } - String raw = request - .retrieve() - .body(String.class); - validateSuccess(raw, action, path); - return raw; - } private void applyAuthorization(org.springframework.http.HttpHeaders headers, String apiKey) { String token = requireText(apiKey, "紫鸟 apiKey 未配置");