From 2542669346f8951798b85acdc02f0b50122647f9 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:02:09 +0800 Subject: [PATCH] =?UTF-8?q?refactor(phase-3):=203B=20=E7=9A=84=20+20=20?= =?UTF-8?q?=E6=8C=89=E3=80=8C=E7=9C=9F=E6=8B=86=E8=96=84=E3=80=8D=E6=B8=85?= =?UTF-8?q?=E8=B4=A6=E2=80=94=E2=80=94=E6=94=AF=E5=86=85=E5=8E=BB=E9=87=8D?= =?UTF-8?q?=2040=20=E8=A1=8C=EF=BC=8C=E5=9F=BA=E7=BA=BF=E4=B8=80=E6=A0=BC?= =?UTF-8?q?=E6=9C=AA=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 用户拍板「不改基线、不代登记,在本支内再找可沉件」。棘轮读数 3216→3176, 回到在册 3196 以下 20 行,docs/readability-baseline.json 一字未动。 五处支内去重(逐条等价,非"顺手统一"): - persistTaskJson 的落库尾部(setResultJson + syncSnapshotTables)改调 persistSnapshotJson,两段落库收尾并成一枚本地件。异常包装面不变:外层 catch 仍在,updateById 仍在 try 内(把下游异常放出去就是改线协议,Phase 2 记过这句)。 - registerUploadedObjectRollback 接进 registerRollbackObjectCleanup:两者只有 「无事务时它删、这里不删」一格之差,用 isSynchronizationActive() 守卫包住即等价。 - loadDailyMemberData 的内联成员排序换成已有的 sortedDailyMembers(逐字同形)。 - applyPartialSuccessToSnapshot 并为 applySuccessToSnapshot 的重载,两个调用点 显式传 PARTIAL_RESULT_MESSAGE(与紧邻的 markResultPartialSuccess 同源常量)。 - 删 loadTaskMap(List):私有、五棵树零调用、自 e453e822c (2026-07-28「菜单修改优化」)引入起就是死件——不是本轮迁移造出来的。 六条 golden(本支两条+孪生两支四条)逐字节相等:git status -- src/test/resources 整轮一字未动。CatchSilence 9 例/TaskLifecycleDebt 3 例/WiringSlice 5 例全绿, 定向批 330 例只剩 ShopDataCrawlTemplateLargeWorkbookTest:193 那格 5000ms 耗时断言 判红(读到 1,486,511ms),单跑 16 例复绿(31s)——与 Phase 2、首迁同一对第三记, 是本机被并发抢核,不在本笔面上。 --- .../service/ShopDataCrawlTaskService.java | 60 ++++--------------- 1 file changed, 10 insertions(+), 50 deletions(-) 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) {