From 695f570d59c4669d82e8fb441d472d3606520014 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 03:02:25 +0800 Subject: [PATCH] =?UTF-8?q?refactor(phase-3):=20ShopDataCrawl=20=E6=8E=A5?= =?UTF-8?q?=E5=85=A5=E5=BA=95=E5=BA=A7=EF=BC=8C=E5=AE=B6=E6=97=8F=E5=B1=82?= =?UTF-8?q?=E6=8C=89=E8=AF=81=E6=8D=AE=E4=B8=8D=E6=8E=A5=E2=80=94=E2=80=94?= =?UTF-8?q?=E4=B8=89=E6=94=AF=E6=8E=A5=E5=BE=97=E4=B8=8A=E3=80=81=E4=B8=A4?= =?UTF-8?q?=E5=A4=84=E6=8E=A5=E4=B8=8D=E4=B8=8A=E5=86=99=E6=AD=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 七支巨石里第三支接进 AbstractFileTaskPipeline。它接的是**底座**、不是 shop-payload 家族层: 家族模板 submitShopScopedResults 要求「按店名自建索引→逐行→changed 闸门→重算」,本支三条都不成立 (索引自建且带「回传店铺与任务不匹配」这道拒、单店合同 resultRows.size()!=1、尾部无 changed 闸门 而是无条件 persistProgressOrSnapshot+tryFinalizeTask)。照家族层套就是替它改行为。 本支复用底座的六件:newTaskHeader/newScopeRow(带显式时刻那一版——建单时刻一枚复用给头行与每一行, 默认时区逐行各取那一版会把这格改掉)、insertTask、listScopeRows(本地 listTaskRows 与孪生两支逐字同形,删)、 requireUserId(本地 validateUserId 逐字同形,删)、requireTaskId、writeJson(第四份同名件并进来, 捕获账净减:RETHROW 386→385 按该尺自述的「逐条点名改基线」处置,出处与授权逐字写进 CatchSilenceRatchetTest 注释;total 1002、不重抛/只 log/空体三格未涨)。 两处「按证据不做」写进代码而不是只留在注释里: 1)准入步序现网先归属后终态,与底座默认序相反 ⇒ 为它把 admitSubmission 拆成 requireSubmissionTask/rejectTerminalSubmission/touchSubmissionHeartbeat 三格、按本支的序复用; 孪生两支走的默认序一个字没动,它们的 golden 就是这条等值的证明。 2)收尾刷结果列走 LambdaUpdateWrapper 批量条件更新(只刷 success=1 的行、不写 success/errorMessage、 objectKey 传 null)⇒ publishResultFile 仍不适用,本地写法保留。 代价要说在白处:显式构造器是继承的结构性成本,本支 23 枚参数(孪生两支 17/15), ShopDataCrawlTaskService 3196→3215 行——这一格在 readability 棘轮上是**涨**, 与 Phase 3「只许降」那条准出标准相冲,不自行改基线判据、留给用户拍板。 对撞证据:本支两条新 golden(建单 14 例/回传 20 例)+孪生两支四条 golden 迁移前后逐字节相等, git status -- src/test/resources 一字未动;后端全量 mvn -o test 绿。 --- .../service/ShopDataCrawlTaskService.java | 196 ++++++++++-------- .../pipeline/AbstractFileTaskPipeline.java | 71 +++++-- .../config/CatchSilenceRatchetTest.java | 10 +- 3 files changed, 169 insertions(+), 108 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 bdb2899a2..296863c70 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 @@ -10,7 +10,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.nanri.aiimage.common.exception.BusinessCodes; import com.nanri.aiimage.common.exception.BusinessException; import com.nanri.aiimage.common.exception.TaskOwnerMismatchException; -import com.nanri.aiimage.common.security.AdminAuthSupport; import com.nanri.aiimage.config.InstanceMetadata; import com.nanri.aiimage.config.TaskPressureProperties; import com.nanri.aiimage.modules.file.service.oss.OssStorageService; @@ -40,6 +39,7 @@ import com.nanri.aiimage.modules.task.model.entity.FileResultEntity; import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity; import com.nanri.aiimage.modules.task.model.entity.TaskFileJobEntity; import com.nanri.aiimage.modules.task.model.entity.TaskScopeStateEntity; +import com.nanri.aiimage.modules.task.service.AbstractModuleTaskCacheService; import com.nanri.aiimage.modules.task.service.TaskDistributedLockService; import com.nanri.aiimage.modules.task.service.TaskFileJobService; import com.nanri.aiimage.modules.task.service.TaskFinalizeSupport; @@ -47,9 +47,9 @@ import com.nanri.aiimage.modules.task.service.TaskHeartbeatPositionService; import com.nanri.aiimage.modules.task.service.TaskProgressSnapshotService; import com.nanri.aiimage.modules.task.service.TaskResultItemService; import com.nanri.aiimage.modules.task.service.TransientPayloadStorageService; +import com.nanri.aiimage.modules.task.service.pipeline.AbstractFileTaskPipeline; import com.nanri.aiimage.modules.ziniao.service.ZiniaoShopSwitchService; import com.nanri.aiimage.modules.ziniao.model.vo.ZiniaoShopMatchResultVo; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.TransactionDefinition; @@ -82,9 +82,8 @@ import com.nanri.aiimage.modules.task.model.vo.TaskProgressLightBatchVo; import com.nanri.aiimage.modules.task.service.TaskProgressLightAssembler; @Service -@RequiredArgsConstructor @Slf4j -public class ShopDataCrawlTaskService { +public class ShopDataCrawlTaskService extends AbstractFileTaskPipeline { private static final String MODULE_TYPE = "SHOP_DATA_CRAWL"; @@ -104,20 +103,17 @@ public class ShopDataCrawlTaskService { private static final String INTERRUPTED_MESSAGE = "Python 在该店铺结果提交完成前中断"; private static final String PARTIAL_RESULT_MESSAGE = "Python 中断,已保留已回传的部分数据"; private static final String RESULT_CHUNK_SCOPE_PREFIX = "result-chunks:"; + /** 锁竞争日志标签:历史值是小写短名,巡检按这句文本数过,不随 {@code MODULE_TYPE} 的大写枚举形走。 */ + private static final String LOCK_LOG_TAG = "shop-data-crawl"; - private final FileTaskMapper fileTaskMapper; - private final FileResultMapper fileResultMapper; private final ShopDataCrawlResolveService shopDataCrawlResolveService; private final ShopDataCrawlExcelAssemblyService excelAssemblyService; private final ShopDataCrawlTaskCacheService taskCacheService; - private final OssStorageService ossStorageService; private final ZiniaoShopSwitchService ziniaoShopSwitchService; private final ObjectMapper objectMapper; private final TaskPressureProperties taskPressureProperties; - private final TaskFileJobService taskFileJobService; private final TaskResultItemService taskResultItemService; private final TaskProgressSnapshotService taskProgressSnapshotService; - private final TaskDistributedLockService taskDistributedLockService; private final TaskChunkMapper taskChunkMapper; private final TaskScopeStateMapper taskScopeStateMapper; private final TransientPayloadStorageService transientPayloadStorageService; @@ -129,6 +125,69 @@ public class ShopDataCrawlTaskService { private final TaskProgressLightAssembler taskProgressLightAssembler; private final TaskHeartbeatPositionService taskHeartbeatPositionService; + /** 参数表顺序=原先 {@code @RequiredArgsConstructor} 按字段声明序生成的那一枚(测试夹具按位置 new)。 */ + public ShopDataCrawlTaskService(FileTaskMapper fileTaskMapper, + FileResultMapper fileResultMapper, + ShopDataCrawlResolveService shopDataCrawlResolveService, + ShopDataCrawlExcelAssemblyService excelAssemblyService, + ShopDataCrawlTaskCacheService taskCacheService, + OssStorageService ossStorageService, + ZiniaoShopSwitchService ziniaoShopSwitchService, + ObjectMapper objectMapper, + TaskPressureProperties taskPressureProperties, + TaskFileJobService taskFileJobService, + TaskResultItemService taskResultItemService, + TaskProgressSnapshotService taskProgressSnapshotService, + TaskDistributedLockService taskDistributedLockService, + TaskChunkMapper taskChunkMapper, + TaskScopeStateMapper taskScopeStateMapper, + TransientPayloadStorageService transientPayloadStorageService, + InstanceMetadata instanceMetadata, + ShopDataCrawlDailyFileService dailyFileService, + ShopDataCrawlItemStoreService shopDataCrawlItemStoreService, + DuplicateCheckRefreshPort duplicateCheckRefreshPort, + PlatformTransactionManager transactionManager, + TaskProgressLightAssembler taskProgressLightAssembler, + TaskHeartbeatPositionService taskHeartbeatPositionService) { + super(fileTaskMapper, fileResultMapper, taskDistributedLockService, taskFileJobService, ossStorageService); + this.shopDataCrawlResolveService = shopDataCrawlResolveService; + this.excelAssemblyService = excelAssemblyService; + this.taskCacheService = taskCacheService; + this.ziniaoShopSwitchService = ziniaoShopSwitchService; + this.objectMapper = objectMapper; + this.taskPressureProperties = taskPressureProperties; + this.taskResultItemService = taskResultItemService; + this.taskProgressSnapshotService = taskProgressSnapshotService; + this.taskChunkMapper = taskChunkMapper; + this.taskScopeStateMapper = taskScopeStateMapper; + this.transientPayloadStorageService = transientPayloadStorageService; + this.instanceMetadata = instanceMetadata; + this.dailyFileService = dailyFileService; + this.shopDataCrawlItemStoreService = shopDataCrawlItemStoreService; + this.duplicateCheckRefreshPort = duplicateCheckRefreshPort; + this.transactionManager = transactionManager; + this.taskProgressLightAssembler = taskProgressLightAssembler; + this.taskHeartbeatPositionService = taskHeartbeatPositionService; + } + + // 管线钩子(Phase 3 的 3B 迁移):形状在底座,模块语义留在本类 + + @Override + protected String moduleType() { + return MODULE_TYPE; + } + + /** 本支是缓存优先派({@code TaskFinalizeSupport.loadTaskForExecution}),不在底座里替它选。 */ + @Override + protected FileTaskEntity loadTaskForSubmission(Long taskId) { + return loadTaskForExecution(taskId); + } + + @Override + protected AbstractModuleTaskCacheService taskCacheService() { + return taskCacheService; + } + @Value("${aiimage.shop-data-crawl.stale-timeout-minutes:30}") private long staleTimeoutMinutes; @@ -341,7 +400,7 @@ public class ShopDataCrawlTaskService { } public ProductRiskDashboardVo dashboard(Long userId) { - validateUserId(userId); + requireUserId(userId); ProductRiskDashboardVo vo = new ProductRiskDashboardVo(); vo.setCandidateCount(shopDataCrawlResolveService.countCandidates(userId)); vo.setProcessedTaskCount(countTasks(userId, @@ -361,7 +420,7 @@ public class ShopDataCrawlTaskService { */ public ShopDataCrawlHistoryVo listHistory(Long userId, int page, int limit) { long startedAt = System.nanoTime(); - validateUserId(userId); + requireUserId(userId); if (page < 1) { throw new BusinessException("page 必须大于等于 1"); } @@ -493,14 +552,14 @@ public class ShopDataCrawlTaskService { } public String resolveResultDownloadUrl(Long resultId, Long userId) { - validateUserId(userId); + requireUserId(userId); FileResultEntity entity = requireResultEntity(resultId); ensureResultOwner(entity, userId); return resolveDownloadUrl(entity); } public String resolveResultDownloadFilename(Long resultId, Long userId) { - validateUserId(userId); + requireUserId(userId); FileResultEntity entity = requireResultEntity(resultId); ensureResultOwner(entity, userId); return resolveDownloadFilename(entity); @@ -548,7 +607,7 @@ public class ShopDataCrawlTaskService { @Transactional public ShopDataCrawlCreateTaskVo createTask(ShopDataCrawlCreateTaskRequest request, String deviceId) { - validateUserId(request.getUserId()); + requireUserId(request.getUserId()); if (request.getItems() == null || request.getItems().size() != 1) { throw new BusinessException("items 必须且只能包含一个店铺"); } @@ -572,20 +631,11 @@ public class ShopDataCrawlTaskService { } LocalDateTime now = LocalDateTime.now(); - FileTaskEntity task = new FileTaskEntity(); - task.setTaskNo(MODULE_TYPE + "-" + IdUtil.getSnowflakeNextIdStr()); - task.setModuleType(MODULE_TYPE); - task.setTaskMode("PYTHON_QUEUE"); - task.setStatus("RUNNING"); - task.setSourceFileCount(uniqueItems.size()); + FileTaskEntity task = newTaskHeader("RUNNING", "PYTHON_QUEUE", request.getUserId(), deviceId, + uniqueItems.size(), now); task.setSuccessFileCount(0); task.setFailedFileCount(0); - task.setCreatedBy("user:" + request.getUserId()); - task.setUserId(request.getUserId()); - task.setDeviceId(AdminAuthSupport.normalizeDeviceId(deviceId)); - task.setCreatedAt(now); - task.setUpdatedAt(now); - fileTaskMapper.insert(task); + insertTask(task); taskCacheService.saveTaskCache(task); taskCacheService.touchTaskHeartbeat(task.getId()); @@ -595,14 +645,9 @@ public class ShopDataCrawlTaskService { if (blank(normalizedShopName)) { throw new BusinessException("任务数据已失效,请刷新后重试"); } - FileResultEntity result = new FileResultEntity(); - result.setTaskId(task.getId()); - result.setModuleType(MODULE_TYPE); - result.setSourceFilename(normalizedShopName); - result.setSourceFileUrl(item.getShopId()); - result.setUserId(request.getUserId()); - result.setSuccess(RESULT_PENDING); - result.setCreatedAt(now); + // rowCount 留 null、success 用本支的 RESULT_PENDING=-1、时刻复用头行那一枚 now(golden 的 result.insert 钉着) + FileResultEntity result = newScopeRow(task.getId(), request.getUserId(), normalizedShopName, + item.getShopId(), null, RESULT_PENDING, now); fileResultMapper.insert(result); snapshots.add(toSnapshotVo(result, item, task.getStatus(), null)); } @@ -616,25 +661,21 @@ public class ShopDataCrawlTaskService { } public void submitResult(Long taskId, ShopDataCrawlSubmitResultRequest request) { - if (taskId == null || taskId <= 0) { - throw new BusinessException("taskId 不合法"); - } + requireTaskId(taskId); if (request == null || request.getShops() == null || request.getShops().size() != 1) { throw new BusinessException("shops 必须且只能包含一个店铺结果"); } - try (TaskDistributedLockService.LockHandle ignored = acquireTaskLockOrThrow(taskId)) { - FileTaskEntity task = loadTaskForExecution(taskId); - if (task == null || !MODULE_TYPE.equals(task.getModuleType())) { - throw new BusinessException("任务不存在"); - } + try (TaskDistributedLockService.LockHandle ignored = + acquireSubmissionLockOrThrow(taskId, LOCK_LOG_TAG)) { + // 准入步序现网是「先归属、后终态」,与底座 admitSubmission 的默认序相反 ⇒ 不整段套它, + // 只复用拆开的三格、序一个字不动。对撞证据:golden 的 ownershipCheckedBeforeTerminal(本支得 + // 40903,默认序得「任务已结束」)与 terminalTaskRejectedWithoutCode(本支终态拒绝不带 40901)。 + FileTaskEntity task = requireSubmissionTask(taskId); ensureTaskOwnedByCurrentInstance(task, "submit shop data crawl result"); - if ("SUCCESS".equals(task.getStatus()) || "FAILED".equals(task.getStatus())) { - throw new BusinessException("任务已结束,拒绝重复提交"); - } - - taskCacheService.touchTaskHeartbeat(taskId); - List resultRows = listTaskRows(taskId); + rejectTerminalSubmission(task.getStatus(), TerminalRejection.ERROR); + touchSubmissionHeartbeat(taskId); + List resultRows = listScopeRows(taskId); List snapshots = buildSnapshotFromDb(task, resultRows); Map snapshotByResultId = indexSnapshotByResultId(snapshots); if (resultRows.size() != 1) throw new BusinessException("任务店铺数据异常"); @@ -715,7 +756,7 @@ public class ShopDataCrawlTaskService { return true; } - List rows = listTaskRows(taskId); + List rows = listScopeRows(taskId); if (rows.isEmpty()) { return false; } @@ -791,7 +832,7 @@ public class ShopDataCrawlTaskService { } } - List latestRows = listTaskRows(taskId); + List latestRows = listScopeRows(taskId); updateTaskStatusFromRows(task, latestRows); if (latestRows.stream().allMatch(this::isResultFinished)) { if (changed || !snapshotJsonHasCountryRows(task)) { @@ -813,15 +854,15 @@ public class ShopDataCrawlTaskService { * DB 段(含每日文件行锁与三条删除链路)仍在同一个短事务内,远端对象清理在提交后进行。 */ public void deleteTask(Long taskId, Long userId) { - validateUserId(userId); + requireUserId(userId); FileTaskEntity task = loadTaskForExecution(taskId); if (task == null || !MODULE_TYPE.equals(task.getModuleType()) || !userId.equals(task.getUserId())) { throw new BusinessException("任务不存在"); } ensureTaskOwnedByCurrentInstance(task, "delete shop data crawl task"); - try (TaskDistributedLockService.LockHandle ignored = acquireTaskLockOrThrow(taskId)) { + try (TaskDistributedLockService.LockHandle ignored = acquireSubmissionLockOrThrow(taskId, LOCK_LOG_TAG)) { executeShortTransaction(() -> { - List taskRows = listTaskRows(taskId); + List taskRows = listScopeRows(taskId); try (DailyLockSet dailyLocks = acquireDailyLocks(taskRows)) { ensureDailySyncCompletedBeforeDelete(taskRows); Set removedResultIds = collectResultIds(taskRows); @@ -898,7 +939,7 @@ public class ShopDataCrawlTaskService { * 远端对象清理已由 deleteResultObjectIfUnreferenced 在提交后执行。 */ public void deleteHistory(Long resultId, Long userId) { - validateUserId(userId); + requireUserId(userId); FileResultEntity entity = requireResultEntity(resultId); ensureResultOwner(entity, userId); Long taskId = entity.getTaskId(); @@ -910,7 +951,7 @@ public class ShopDataCrawlTaskService { resultId, taskId, task.getStatus()); throw new BusinessException(BusinessCodes.TASK_BUSY, "任务仍在处理中,不能删除"); } - try (TaskDistributedLockService.LockHandle ignored = acquireTaskLockOrThrow(taskId)) { + try (TaskDistributedLockService.LockHandle ignored = acquireSubmissionLockOrThrow(taskId, LOCK_LOG_TAG)) { executeShortTransaction(() -> { FileResultEntity latestEntity = fileResultMapper.selectById(resultId); if (latestEntity == null || !MODULE_TYPE.equals(latestEntity.getModuleType()) || !userId.equals(latestEntity.getUserId())) { @@ -1163,7 +1204,7 @@ public class ShopDataCrawlTaskService { if (task == null || !MODULE_TYPE.equals(task.getModuleType())) { return; } - List rows = listTaskRows(taskId); + List rows = listScopeRows(taskId); if (rows.isEmpty()) { taskFileJobService.deleteTaskJobs(taskId, MODULE_TYPE); taskResultItemService.deleteTaskItems(taskId, MODULE_TYPE); @@ -1191,13 +1232,6 @@ public class ShopDataCrawlTaskService { return count == null ? 0L : count; } - private List listTaskRows(Long taskId) { - return fileResultMapper.selectList(new LambdaQueryWrapper() - .eq(FileResultEntity::getTaskId, taskId) - .eq(FileResultEntity::getModuleType, MODULE_TYPE) - .orderByAsc(FileResultEntity::getId)); - } - Map normalizePayloadByShop( List shops, String expectedShopName) { Map payloadByShop = new LinkedHashMap<>(); @@ -1469,7 +1503,7 @@ public class ShopDataCrawlTaskService { if (!hasProcessableChunkData(incoming.getCountryResults())) { throw new BusinessException("店铺数据抓取结果分片内容为空,拒绝接收"); } - String payloadJson = writeJson(countryResults, "序列化店铺数据抓取结果分片失败"); + String payloadJson = writeJson(objectMapper, countryResults, "序列化店铺数据抓取结果分片失败"); String payloadHash = DigestUtil.sha256Hex(payloadJson); String scopeKey = resultChunkScopeKey(shopKey); @@ -1757,14 +1791,6 @@ public class ShopDataCrawlTaskService { return RESULT_CHUNK_SCOPE_PREFIX + trim(shopKey); } - private String writeJson(Object value, String message) { - try { - return objectMapper.writeValueAsString(value); - } catch (Exception ex) { - throw new BusinessException(message); - } - } - private String safeMessage(Exception ex) { return ex == null || blank(ex.getMessage()) ? ex == null ? "未知错误" : ex.getClass().getSimpleName() : ex.getMessage(); } @@ -1875,7 +1901,7 @@ public class ShopDataCrawlTaskService { * 一条 UPDATE 落库结果文件列。 * *

原先对每个成功行 {@code updateById}:N 行 = N 次网络往返 + N 次提交(本方法非事务、自动提交), - * 且写 binlog 被同步放大;N=500 时白花约 0.5~1s。条件与 listTaskRows 的查询口径一致。 + * 且写 binlog 被同步放大;N=500 时白花约 0.5~1s。条件与 {@code listScopeRows} 的查询口径一致。 */ private void updateResultFileColumns(List rowIds, String filename, String objectKey, long fileSize, int rowCount) { @@ -1940,7 +1966,7 @@ public class ShopDataCrawlTaskService { throw new BusinessException("任务不存在"); } ensureTaskOwnedByCurrentInstance(task, "assemble shop data crawl result"); - List rows = listTaskRows(job.getTaskId()); + List rows = listScopeRows(job.getTaskId()); List snapshots = taskResultItemService.listResultSnapshots(job.getTaskId(), MODULE_TYPE, ShopDataCrawlResultItemVo.class); if (snapshots.isEmpty()) { snapshots = buildSnapshotFromDb(task, rows); @@ -2626,7 +2652,7 @@ public class ShopDataCrawlTaskService { if (task == null || !MODULE_TYPE.equals(task.getModuleType())) { return; } - List rows = listTaskRows(taskId); + List rows = listScopeRows(taskId); if (rows.isEmpty()) { return; } @@ -2853,10 +2879,7 @@ public class ShopDataCrawlTaskService { return job != null && !"SUCCESS".equals(job.getStatus()); } - private TaskDistributedLockService.LockHandle acquireTaskLockOrThrow(Long taskId) { - return TaskFinalizeSupport.acquireTaskLockOrThrow(taskDistributedLockService, MODULE_TYPE, taskId, "shop-data-crawl"); - } - + /** 非阻塞/带等待的取锁两枚:拿不到就静默跳过(stale 巡检与判死用),语义与「抢不到即拒提交」不同,故不并入底座。 */ private TaskDistributedLockService.LockHandle acquireTaskLock(Long taskId) { return TaskFinalizeSupport.acquireTaskLock(taskDistributedLockService, MODULE_TYPE, taskId); } @@ -3045,13 +3068,14 @@ public class ShopDataCrawlTaskService { public void handleResultFileJobFailure(TaskFileJobEntity job, String message) { if (job == null || job.getTaskId() == null) return; - try (TaskDistributedLockService.LockHandle ignored = acquireTaskLockOrThrow(job.getTaskId())) { + try (TaskDistributedLockService.LockHandle ignored = + acquireSubmissionLockOrThrow(job.getTaskId(), LOCK_LOG_TAG)) { FileTaskEntity task = fileTaskMapper.selectById(job.getTaskId()); if (task == null || !MODULE_TYPE.equals(task.getModuleType())) return; ensureTaskOwnedByCurrentInstance(task, "fail shop data crawl result file job"); FileResultEntity row = job.getResultId() == null ? null : fileResultMapper.selectById(job.getResultId()); if (row != null && MODULE_TYPE.equals(row.getModuleType())) markResultFailed(row, message); - List rows = listTaskRows(job.getTaskId()); + List rows = listScopeRows(job.getTaskId()); List snapshots = buildSnapshotFromDb(task, rows); for (ShopDataCrawlResultItemVo snapshot : snapshots) { if (Objects.equals(snapshot.getResultId(), job.getResultId())) applyFailureToSnapshot(snapshot, message); @@ -3111,6 +3135,8 @@ public class ShopDataCrawlTaskService { return (references == null || references == 0L) && dailyReferences == 0L; } + /** 归属实例校验:底座钩子默认放过,本支是多实例转发派,覆写成现网语义(外部转发链也调它,故保持 public)。 */ + @Override public void ensureTaskOwnedByCurrentInstance(FileTaskEntity task, String operation) { String owner = ownerFromTask(task); if (blank(owner) || Objects.equals(owner, currentInstanceId())) return; @@ -3162,7 +3188,7 @@ public class ShopDataCrawlTaskService { private String buildTaskWorkbookFilename(FileTaskEntity task) { Long taskId = task == null ? null : task.getId(); - List rows = taskId == null ? List.of() : listTaskRows(taskId); + List rows = taskId == null ? List.of() : listScopeRows(taskId); String shopName = rows.isEmpty() ? "result" : rows.get(0).getSourceFilename(); return safeFileStem("店铺数据抓取-" + shopName + "-" + (taskId == null ? "result" : taskId)) + ".xlsx"; } @@ -3185,11 +3211,5 @@ public class ShopDataCrawlTaskService { return ShopDataCrawlRowNormalizer.blankToNull(value); } - private void validateUserId(Long userId) { - if (userId == null || userId <= 0) { - throw new BusinessException("user_id 不合法"); - } - } - private record ResultChunkReceipt(String scopeHash, int chunkTotal, boolean completed) {} } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/pipeline/AbstractFileTaskPipeline.java b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/pipeline/AbstractFileTaskPipeline.java index 5a58cdb35..8b3e74340 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/pipeline/AbstractFileTaskPipeline.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/pipeline/AbstractFileTaskPipeline.java @@ -48,8 +48,9 @@ import java.util.List; * {@code writeJson(Object, String)} 就是带文案参数的形状。 * ⚠ task 模块内部那三份逐字同名件({@code TaskProgressSnapshotService:186}/ * {@code TaskResultItemService:405}/{@code TaskResultPayloadService:113})本轮仍未归并: - * 归并会把 RETHROW 那一格跌破下限(它是下限不是上限,实测首迁后正好落在 386), - * 那属于「调整门禁判据」动作,与 Phase 0 那格「三格守卫」同批做,不在迁移笔里顺手干。 + * 归并会把 RETHROW 那一格跌破下限(它是下限不是上限;首迁后落在 386,3B 并掉 ShopDataCrawl + * 那份私有同名件后按「逐条点名改基线」调到 385,出处写在 {@code CatchSilenceRatchetTest}), + * 再往下降就属于「调整门禁判据」动作,与 Phase 0 那格「三格守卫」同批做,不在迁移笔里顺手干。 *

  • 跑批:服务端没有属于这七支的可沉件——机制早已收在 * {@link TaskFileJobService}(enqueue/claim/markSuccess/markFailed)+ * {@code TaskResultFileJobWorker}(取锁、重排、重试)+ @@ -357,9 +358,11 @@ public abstract class AbstractFileTaskPipeline { * *

    步序按 ShopMatch/PriceTrack 定:终态判定在归属校验之前。ShopDataCrawl 现网是反的 * ({@code :631} 先查归属、{@code :632} 再判终态),一支既被别人持有又已终态的任务, - * 走它会得 {@code TaskOwnerMismatchException}、走本方法是终态拒绝。所以 ShopDataCrawl 迁移时 - * 要么保留自己的步序(传 {@code null} 后自查归属),要么把这条差异单独立账, - * 不许悄悄套用本默认序就算迁完。 + * 走它会得 {@code TaskOwnerMismatchException}、走本方法是终态拒绝。3B 迁移那一支的处置是 + * 保留本地步序:它按自己的序复用 {@link #requireSubmissionTask}/ + * {@link #rejectTerminalSubmission}/{@link #touchSubmissionHeartbeat} 三格, + * 不整段套本方法——本方法的默认序因此一个字也没替它改,这条差异也不再只是记在注释里的口头账 + * (golden 的 {@code ownershipCheckedBeforeTerminal} 那例钉着)。 * *

    本方法不打日志:七支里只有 PriceTrack{@code :602} 在终态拒绝前打一行 warn, * 其余六支沉默。日志不是公共形状,所以那一行留在它自己的调用点,别当成已沉掉后把它删了。 @@ -368,30 +371,60 @@ public abstract class AbstractFileTaskPipeline { TerminalRejection terminalRejection, String ownershipOperation) { requireTaskId(taskId); - FileTaskEntity task = loadTaskForSubmission(taskId); - if (task == null || !moduleType().equals(task.getModuleType())) { - throw new BusinessException("任务不存在"); - } - String status = task.getStatus(); - if ("SUCCESS".equals(status) || "FAILED".equals(status)) { - if (terminalRejection == TerminalRejection.IDEMPOTENT) { - throw new BusinessException(BusinessCodes.TASK_ALREADY_FINISHED, "任务已结束,拒绝重复提交"); - } - throw new BusinessException("任务已结束,拒绝重复提交"); - } + FileTaskEntity task = requireSubmissionTask(taskId); + rejectTerminalSubmission(task.getStatus(), terminalRejection); if (ownershipOperation != null) { ensureTaskOwnedByCurrentInstance(task, ownershipOperation); } - AbstractModuleTaskCacheService cacheService = taskCacheService(); - if (cacheService != null) { - cacheService.touchTaskHeartbeat(taskId); + touchSubmissionHeartbeat(taskId); + return task; + } + + /** + * 准入的前两行:加载+模块校验,不符即「任务不存在」。 + * 出处:ShopMatch{@code :647-650}/PriceTrack{@code :597-600}/ShopDataCrawl{@code :627-630}(三支逐字同形)。 + * + *

    为什么把它从 {@link #admitSubmission} 里拆出来。3B 实测缺件:ShopDataCrawl 的准入 + * 步序与本类默认序相反(先归属后终态),整段套 {@code admitSubmission} 就会改掉那格的可见结果 + * (见方法注释里立着的账)。拆开后它按自己的序复用这三格,而 ShopMatch/PriceTrack 走的 + * 默认序一个字没动——四格合起来与拆前逐句等值,两支的 golden 就是这条等值的证明。 + */ + protected final FileTaskEntity requireSubmissionTask(Long taskId) { + FileTaskEntity task = loadTaskForSubmission(taskId); + if (task == null || !moduleType().equals(task.getModuleType())) { + throw new BusinessException("任务不存在"); } return task; } + /** + * 终态那格:怎么拒由 {@code terminalRejection} 决定(两种线协议,见 {@link TerminalRejection})。 + * 与 {@link #requireSubmissionTask} 同一笔拆开的理由——步序不同的支要能单独复用这一格。 + */ + protected final void rejectTerminalSubmission(String status, TerminalRejection terminalRejection) { + if (!"SUCCESS".equals(status) && !"FAILED".equals(status)) { + return; + } + if (terminalRejection == TerminalRejection.IDEMPOTENT) { + throw new BusinessException(BusinessCodes.TASK_ALREADY_FINISHED, "任务已结束,拒绝重复提交"); + } + throw new BusinessException("任务已结束,拒绝重复提交"); + } + + /** 有模块缓存服务的支按现网形状打一次心跳;没有的支什么都不做(见 {@link #taskCacheService()})。 */ + protected final void touchSubmissionHeartbeat(Long taskId) { + AbstractModuleTaskCacheService cacheService = taskCacheService(); + if (cacheService != null) { + cacheService.touchTaskHeartbeat(taskId); + } + } + /** * 该任务的全部结果行,按主键升序——回传侧的作用域匹配与收尾判定都依赖这个顺序。 * 出处:ShopMatch{@code :656-659}/PriceTrack{@code :606-610}/DeleteBrand 同款 selectList。 + * 3B 又并进来一支:ShopDataCrawl 本地那枚 {@code listTaskRows}(原 {@code :1194-1199})与这两家 + * 逐字同形、已删 ⇒ 真正调本件的支数现在是三(ShopMatch/PriceTrack/ShopDataCrawl), + * 其余四支尚未迁移,别说成「七支都用它」。 */ protected final List listScopeRows(Long taskId) { return fileResultMapper.selectList(new LambdaQueryWrapper() diff --git a/backend-java/src/test/java/com/nanri/aiimage/config/CatchSilenceRatchetTest.java b/backend-java/src/test/java/com/nanri/aiimage/config/CatchSilenceRatchetTest.java index 3f73ff25a..13fd7bf65 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/config/CatchSilenceRatchetTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/config/CatchSilenceRatchetTest.java @@ -86,7 +86,15 @@ class CatchSilenceRatchetTest { // 10-09 再下调 387 -> 386,出处点名:去重库按公司收口那一笔删掉了 DedupeTotalDataService.deleteFromExcel // 的两个零调用者重载,其中 `throw new BusinessException("删除 Excel 匹配数据失败", e)` 是 RETHROW 形状, // 随死代码一起离开树;实测重抛 386、不重抛与只 log 两数未涨(那两格仍绿)=> 没有任何一处「异常会往外走」被改回吞掉。 - static final int RETHROW_FLOOR = 386; + // 10-19 再下调 386 -> 385,出处点名(用户授权「逐处记名调这一格」):Phase 3 的 3B 迁移把 + // ShopDataCrawlTaskService 的私有 `writeJson(Object, String)` 并进底座已有的 + // `AbstractFileTaskPipeline.writeJson(ObjectMapper, Object, String)`——那一枚 catch 的体是 + // `throw new BusinessException(message)`(RETHROW 形状、不带 cause),本支文案「序列化店铺数据抓取结果分片失败」 + // 逐字带到调用点,失败形状与线协议一字未动(golden 的 submit-result 分片各例对撞相等)。 + // 四份逐字同名件并成一份 ⇒ 树里少了一处「异常会往外走」的**实例**,不是少了一种会外走的异常; + // 本笔只从树上摘掉这一处 RETHROW 形状的 catch,不重抛侧一个字节没动:同批实测 notRethrow 562、 + // logOnly 173、empty 55 三格仍在上限内(未涨)=> 没有任何一处出口被改回吞掉。 + static final int RETHROW_FLOOR = 385; /** * 10-17 抬 559 -> 561,逐处记名(两处都是新增的 fail-open 证据读写,不是把已有出口改回吞掉): * 1){@code TaskHeartbeatLivenessService.stamp()}:心跳证据写失败只 WARN——心跳接口不许因为