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 296863c70..07004001d 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 @@ -786,7 +786,7 @@ public class ShopDataCrawlTaskService extends AbstractFileTaskPipeline loadDailyMemberData(ShopDataCrawlDailyFileEntity dailyFile, Set removedResultIds) { - List memberRows = dailyFileService.listMembers(dailyFile.getId()); - List members = new ArrayList<>( - memberRows == null ? List.of() : memberRows); - members.removeIf(Objects::isNull); - members.sort(Comparator - .comparing(ShopDataCrawlDailyMemberEntity::getCreatedAt, - Comparator.nullsLast(Comparator.naturalOrder())) - .thenComparing(ShopDataCrawlDailyMemberEntity::getId, - Comparator.nullsLast(Comparator.naturalOrder()))); + List members = sortedDailyMembers(dailyFileService.listMembers(dailyFile.getId())); Map resultById = new HashMap<>(); List keptResultIds = new ArrayList<>(); for (ShopDataCrawlDailyMemberEntity member : members) { @@ -1259,24 +1251,6 @@ public class ShopDataCrawlTaskService extends AbstractFileTaskPipeline loadTaskMap(List entities) { - List taskIds = entities.stream() - .map(FileResultEntity::getTaskId) - .filter(id -> id != null && id > 0) - .distinct() - .toList(); - Map taskMap = new LinkedHashMap<>(); - if (taskIds.isEmpty()) { - return taskMap; - } - for (FileTaskEntity task : selectTasksByIdsInBatches(taskIds)) { - if (task != null && MODULE_TYPE.equals(task.getModuleType())) { - taskMap.put(task.getId(), task); - } - } - return taskMap; - } - private Map loadHistoryTaskMap(List entities) { List taskIds = entities.stream() .map(FileResultEntity::getTaskId) @@ -1383,8 +1357,7 @@ public class ShopDataCrawlTaskService extends AbstractFileTaskPipeline uploadedObjectKeys) { - if (uploadedObjectKeys == null || uploadedObjectKeys.isEmpty() - || !TransactionSynchronizationManager.isSynchronizationActive()) { - return; + if (TransactionSynchronizationManager.isSynchronizationActive()) { + registerRollbackObjectCleanup(uploadedObjectKeys); } - Set uploaded = new HashSet<>(uploadedObjectKeys); - TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() { - @Override - public void afterCompletion(int status) { - if (status != STATUS_COMMITTED) { - uploaded.forEach(ShopDataCrawlTaskService.this::deleteObjectQuietly); - } - } - }); } private void deleteObjectQuietly(String objectKey) {