From 2f0b6b0de93bcc1d3a5326e6613a7694b97744a7 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 01:31:14 +0800 Subject: [PATCH] =?UTF-8?q?refactor(phase-3):=20PriceTrack=20=E6=8E=A5?= =?UTF-8?q?=E5=85=A5=E5=AE=B6=E6=97=8F=E9=AA=A8=E6=9E=B6=EF=BC=8C=E4=B8=A4?= =?UTF-8?q?=E6=94=AF=E9=80=90=E5=AD=97=E9=87=8D=E5=A4=8D=E7=9A=84=E4=BD=9C?= =?UTF-8?q?=E7=94=A8=E5=9F=9F=E8=A1=8C=E6=9F=A5=E8=AF=A2=E4=B8=8B=E6=B2=89?= =?UTF-8?q?=20listScopeRows?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 孪生支之二迁完,§3.1 那句「七支到底接得上几支」现在有实测答案了:shop-payload 那一族 两支都换得上,且各自判序原样保留——本支是「先判 error → 再判 success==FALSE → 处理删跳过 ASIN 的信号 → 最后才合并」,ShopMatch 相反(先合并再判 error),这段家族层 javadoc 点名 「刻意不沉」,本笔一个字没碰。 段 3 整段(准入→取锁→建索引→逐行→changed 闸门→重算状态)改为 submitShopScopedResults; 建单段的头行与结果行改为 newTaskHeader/newScopeRow 的默认时区那一派(本支现网就是 LocalDateTime.now(),与 ShopMatch 的业务时区那一派刻意分成两枚重载,不替谁归一)。 一处「想并但没并」要说在白处:本支 createTask 那格序列化 catch 没接进 writeJson—— 并进去会把 CatchSilenceRatchetTest 的 RETHROW 那一格跌破下限 386(它是下限不是上限), 调它属于「改门禁判据」动作、要逐处记名,与 Phase 0 那格三格守卫同批做,不在迁移笔里顺手干。 所以本支的捕获账一个字未动(ShopMatch 那笔才是净减一处)。 终态拒绝前那句 [price-track] submitResult rejected 留在了 loadTaskForSubmission 里: 底座刻意不打日志(七支只有一支打),而骨架没给 throw 前留落点;这一格的条件与顺序与迁移前 逐字相同(模块校验已过、马上 throw),巡检按它数过被拒的回传,删就是改现网可观测行为。 顺手收掉本面 7 处(两支合计 13 处)逐字相同的作用域行查询 eq(taskId).eq(moduleType).orderByAsc(id) → listScopeRows(taskId):这不是清理,是 §3.1 段 3 里已沉的件,Phase 3 的本职就是把内联副本换成它。可读性账因此对得上:显式构造器是 结构性成本(PriceTrack 一度 2331 行、另一路已代登记在飞那笔),去重后回落到 2302 行, 严格低于迁移前 2303;ShopMatch 2028→2008。 证据:两支建单+回传四条 golden 逐字节相等(git status -- src/test/resources 一字未动); 定向批 387 例全绿;全量 mvn -o test 4495 例/3 红/0 错/9 skipped(27:58,机器被并发拖长), 三红逐条单跑复绿(ShopDataCrawl 那两格是 5000ms 耗时断言被抢核、DuplicateCheckRefreshScheduler 那格是真实时间窗在全量并跑里抖),无一条落在本笔的面上。 --- .../service/PriceTrackTaskService.java | 299 +++++++++--------- .../service/ShopMatchTaskService.java | 31 +- 2 files changed, 155 insertions(+), 175 deletions(-) diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/service/PriceTrackTaskService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/service/PriceTrackTaskService.java index b161ce4dc..9ac464bc1 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/service/PriceTrackTaskService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/pricetrack/service/PriceTrackTaskService.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.nanri.aiimage.common.exception.BusinessException; -import com.nanri.aiimage.common.security.AdminAuthSupport; import com.nanri.aiimage.common.util.ExcelStreamReader; import com.nanri.aiimage.config.TaskPressureProperties; import com.nanri.aiimage.modules.file.service.oss.OssStorageService; @@ -31,13 +30,13 @@ import com.nanri.aiimage.modules.task.mapper.FileTaskMapper; 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.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; import com.nanri.aiimage.modules.task.service.TaskResultPayloadService; +import com.nanri.aiimage.modules.task.service.pipeline.AbstractShopPayloadTaskPipeline; import com.nanri.aiimage.modules.ziniao.service.ZiniaoShopSwitchService; -import cn.hutool.core.util.IdUtil; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -64,9 +63,8 @@ import com.nanri.aiimage.modules.task.model.vo.TaskProgressLightBatchVo; import com.nanri.aiimage.modules.task.service.TaskProgressLightAssembler; @Service -@RequiredArgsConstructor @Slf4j -public class PriceTrackTaskService { +public class PriceTrackTaskService extends AbstractShopPayloadTaskPipeline { private static final String MODULE_TYPE = "PRICE_TRACK"; /** 批量进度查询的任务 id 上限(轮询端点防滥用,与 patroldelete/deletebrand 保持一致)。 */ @@ -79,11 +77,8 @@ public class PriceTrackTaskService { private static final String ASIN_ROWS_PAYLOAD_SCOPE = "price-track-asin-rows"; private static final String NO_USABLE_ROWS_ERROR = "未收到有效跟价数据,未生成结果文件"; - private final FileTaskMapper fileTaskMapper; - private final FileResultMapper fileResultMapper; private final PriceTrackShopCandidateMapper candidateMapper; private final ZiniaoShopSwitchService ziniaoShopSwitchService; - private final OssStorageService ossStorageService; /** 结果下载直链解析(2026-09 从本类抽到 common,消除 11 处逐字重复) */ private final com.nanri.aiimage.common.service.ResultDownloadResolver resultDownloadResolver; private final ObjectMapper objectMapper; @@ -93,8 +88,6 @@ public class PriceTrackTaskService { private final PriceTrackLoopRunService priceTrackLoopRunService; private final TaskPressureProperties taskPressureProperties; private final TaskResultPayloadService taskResultPayloadService; - private final TaskFileJobService taskFileJobService; - private final TaskDistributedLockService taskDistributedLockService; private final TaskProgressLightAssembler taskProgressLightAssembler; private final com.nanri.aiimage.modules.file.service.LocalFileStorageService localFileStorageService; /** @@ -103,6 +96,79 @@ public class PriceTrackTaskService { */ private final org.springframework.transaction.PlatformTransactionManager transactionManager; + /** 参数表顺序=原先 {@code @RequiredArgsConstructor} 生成的那一个(夹具按位置 new,见 PriceTrackSnapshotTest:163)。 */ + public PriceTrackTaskService(FileTaskMapper fileTaskMapper, + FileResultMapper fileResultMapper, + PriceTrackShopCandidateMapper candidateMapper, + ZiniaoShopSwitchService ziniaoShopSwitchService, + OssStorageService ossStorageService, + com.nanri.aiimage.common.service.ResultDownloadResolver resultDownloadResolver, + ObjectMapper objectMapper, + SkipPriceAsinService skipPriceAsinService, + PriceTrackExcelAssemblyService excelAssemblyService, + PriceTrackTaskCacheService priceTrackTaskCacheService, + PriceTrackLoopRunService priceTrackLoopRunService, + TaskPressureProperties taskPressureProperties, + TaskResultPayloadService taskResultPayloadService, + TaskFileJobService taskFileJobService, + TaskDistributedLockService taskDistributedLockService, + TaskProgressLightAssembler taskProgressLightAssembler, + com.nanri.aiimage.modules.file.service.LocalFileStorageService localFileStorageService, + org.springframework.transaction.PlatformTransactionManager transactionManager) { + super(fileTaskMapper, fileResultMapper, taskDistributedLockService, taskFileJobService, ossStorageService); + this.candidateMapper = candidateMapper; + this.ziniaoShopSwitchService = ziniaoShopSwitchService; + this.resultDownloadResolver = resultDownloadResolver; + this.objectMapper = objectMapper; + this.skipPriceAsinService = skipPriceAsinService; + this.excelAssemblyService = excelAssemblyService; + this.priceTrackTaskCacheService = priceTrackTaskCacheService; + this.priceTrackLoopRunService = priceTrackLoopRunService; + this.taskPressureProperties = taskPressureProperties; + this.taskResultPayloadService = taskResultPayloadService; + this.taskProgressLightAssembler = taskProgressLightAssembler; + this.localFileStorageService = localFileStorageService; + this.transactionManager = transactionManager; + } + + // ------------------------------------------------------------------ + // 管线钩子(Phase 3 首迁·孪生支之二) + // ------------------------------------------------------------------ + + @Override + protected String moduleType() { + return MODULE_TYPE; + } + + @Override + protected FileTaskEntity loadTaskForSubmission(Long taskId) { + FileTaskEntity task = loadTaskForExecution(taskId); + // 底座刻意不打日志(七支里只有本支在终态拒绝前 warn 一句,见 admitSubmission 的注释), + // 而那句的位置就在「模块校验已过、throw 之前」——骨架里唯一等价的落点就是这里,同条件同顺序。 + // 删掉它就是改现网可观测行为(巡检按这句数过被拒的回传)。 + if (task != null && MODULE_TYPE.equals(task.getModuleType()) + && ("SUCCESS".equals(task.getStatus()) || "FAILED".equals(task.getStatus()))) { + log.warn("[price-track] submitResult rejected taskId={} status={}", taskId, task.getStatus()); + } + return task; + } + + @Override + protected AbstractModuleTaskCacheService taskCacheService() { + return priceTrackTaskCacheService; + } + + @Override + protected String submissionLockLogTag() { + return "price-track"; + } + + @Override + protected String normalizeShopKey(String rawShopName) { + return ziniaoShopSwitchService.normalizeShopName(rawShopName); + } + + private FileTaskEntity loadTaskForExecution(Long taskId) { // 缓存行仅当 requestJson 非空时视为可用(历史语义),否则回落 DB return TaskFinalizeSupport.loadTaskForExecution(fileTaskMapper, priceTrackTaskCacheService, MODULE_TYPE, taskId, @@ -300,11 +366,7 @@ public class PriceTrackTaskService { if ("SUCCESS".equals(task.getStatus()) || "FAILED".equals(task.getStatus())) { return null; } - List results = fileResultMapper.selectList( - new LambdaQueryWrapper() - .eq(FileResultEntity::getTaskId, taskId) - .eq(FileResultEntity::getModuleType, MODULE_TYPE) - .orderByAsc(FileResultEntity::getId)); + List results = listScopeRows(taskId); if (results.isEmpty()) { task.setStatus("FAILED"); task.setErrorMessage(normalizedError); @@ -498,20 +560,11 @@ public class PriceTrackTaskService { final Map>> parsedAsinRows = asinRowsForPayload; return inRequiredTransaction(() -> { // 创建任务记录 - 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()); task.setSuccessFileCount(0); task.setFailedFileCount(0); - task.setCreatedBy("user:" + request.getUserId()); - task.setUserId(request.getUserId()); - task.setDeviceId(AdminAuthSupport.normalizeDeviceId(deviceId)); - task.setCreatedAt(LocalDateTime.now()); - task.setUpdatedAt(LocalDateTime.now()); - fileTaskMapper.insert(task); + insertTask(task); priceTrackTaskCacheService.touchTaskHeartbeat(task.getId()); if (request.isAsinMode()) { saveTaskAsinRowsPayload(task.getId(), parsedAsinRows); @@ -528,14 +581,8 @@ public class PriceTrackTaskService { for (PriceTrackMatchShopsVo.PriceTrackShopQueueItem item : uniqueItems) { String norm = ziniaoShopSwitchService.normalizeShopName(item.getShopName()); if (norm.isBlank()) throw new BusinessException("店铺名称无效"); - FileResultEntity fr = new FileResultEntity(); - fr.setTaskId(task.getId()); - fr.setModuleType(MODULE_TYPE); - fr.setSourceFilename(norm); - fr.setSourceFileUrl(Objects.toString(item.getShopId(), null)); - fr.setUserId(request.getUserId()); - fr.setSuccess(0); - fr.setCreatedAt(LocalDateTime.now()); + FileResultEntity fr = newScopeRow(task.getId(), request.getUserId(), norm, + Objects.toString(item.getShopId(), null), null, 0); fileResultMapper.insert(fr); PriceTrackResultItemVo snapshotItem = toSnapshotVo(fr, item, task.getStatus()); snapshotItem.setLoopRunId(request.getLoopRunId()); @@ -589,77 +636,63 @@ public class PriceTrackTaskService { } public void submitResult(Long taskId, PriceTrackSubmitResultRequest request) { - if (taskId == null || taskId <= 0) throw new BusinessException("taskId 不合法"); - if (request == null || request.getShops() == null || request.getShops().isEmpty()) { - throw new BusinessException("shops 不能为空"); + submitShopScopedResults(taskId, + request == null ? null : request.getShops(), + PriceTrackSubmitResultRequest.ShopResult::getShopName, + TerminalRejection.IDEMPOTENT, + null); + } + + /** 迁移前那句 {@code [price-track] submitResult received ...} 的位置:准入已过、索引已建、行还没开始处理。 */ + @Override + protected void onPayloadIndexed(FileTaskEntity task, + Map payloadByShopKey) { + log.info("[price-track] submitResult received taskId={} payloadShopCount={} payloadKeys={}", + task.getId(), payloadByShopKey.size(), payloadByShopKey.keySet()); + } + + /** + * 本支判序=「先判 error → 再判 success==FALSE → 处理删跳过 ASIN 的信号 → 最后才合并」, + * 与 ShopMatch(先合并再判 error)相反;这段整体留在被迁支里,底座一个字都不碰 + * (家族层 javadoc 点名「刻意不沉」的两处之一,沉了就是把两支语义并成一支)。 + */ + @Override + protected void applyShopResultRow(Long taskId, + FileTaskEntity task, + FileResultEntity fr, + String shopKey, + PriceTrackSubmitResultRequest.ShopResult payload) { + if (payload.getError() != null && !payload.getError().isBlank()) { + finalizeFailedShop(fr, shopKey, payload, payload.getError()); + return; } - try (TaskDistributedLockService.LockHandle ignored = acquireTaskLockOrThrow(taskId)) { - FileTaskEntity task = loadTaskForExecution(taskId); - if (task == null || !MODULE_TYPE.equals(task.getModuleType())) { - throw new BusinessException("任务不存在"); - } - if ("SUCCESS".equals(task.getStatus()) || "FAILED".equals(task.getStatus())) { - log.warn("[price-track] submitResult rejected taskId={} status={}", taskId, task.getStatus()); - throw new BusinessException(40901, "任务已结束,拒绝重复提交"); - } - priceTrackTaskCacheService.touchTaskHeartbeat(taskId); - List resultRows = fileResultMapper.selectList( - new LambdaQueryWrapper() - .eq(FileResultEntity::getTaskId, taskId) - .eq(FileResultEntity::getModuleType, MODULE_TYPE) - .orderByAsc(FileResultEntity::getId)); - Map payloadByShop = new LinkedHashMap<>(); - for (PriceTrackSubmitResultRequest.ShopResult sr : request.getShops()) { - if (sr == null) continue; - String key = ziniaoShopSwitchService.normalizeShopName(sr.getShopName()); - if (!key.isBlank()) payloadByShop.put(key, sr); - } - log.info("[price-track] submitResult received taskId={} payloadShopCount={} payloadKeys={}", - taskId, payloadByShop.size(), payloadByShop.keySet()); - boolean changed = false; - for (FileResultEntity fr : resultRows) { - String shopKey = fr.getSourceFilename(); - PriceTrackSubmitResultRequest.ShopResult payload = shopKey == null ? null : payloadByShop.get(shopKey); - if (payload == null) { - continue; - } - changed = true; - if (payload.getError() != null && !payload.getError().isBlank()) { - finalizeFailedShop(fr, shopKey, payload, payload.getError()); - continue; - } - if (Boolean.FALSE.equals(payload.getSuccess())) { - finalizeFailedShop(fr, shopKey, payload, "shop processing failed"); - continue; - } - handleSkipAsinDeletionSignals(shopKey, payload); - PriceTrackSubmitResultRequest.ShopResult merged = mergeShopPayload(taskId, shopKey, payload); - if (!Boolean.TRUE.equals(merged.getSuccess())) { - continue; - } - if (countPayloadRows(merged) <= 0) { - markResultFailed(fr, buildNoUsableRowsMessage(payload)); - priceTrackTaskCacheService.removeShopMergedPayload(taskId, shopKey); - continue; - } - try { - enqueueResultFileAssembly(fr, shopKey, merged); - priceTrackTaskCacheService.removeShopMergedPayload(taskId, shopKey); - } catch (Exception ex) { - markResultFailed(fr, ex.getMessage() == null ? "assemble price-track result failed" : ex.getMessage()); - priceTrackTaskCacheService.removeShopMergedPayload(taskId, shopKey); - } - } - if (!changed) { - return; - } - List latest = fileResultMapper.selectList( - new LambdaQueryWrapper() - .eq(FileResultEntity::getTaskId, taskId) - .eq(FileResultEntity::getModuleType, MODULE_TYPE) - .orderByAsc(FileResultEntity::getId)); - updateTaskStatusFromLatestRows(task, latest); + if (Boolean.FALSE.equals(payload.getSuccess())) { + finalizeFailedShop(fr, shopKey, payload, "shop processing failed"); + return; } + handleSkipAsinDeletionSignals(shopKey, payload); + PriceTrackSubmitResultRequest.ShopResult merged = mergeShopPayload(taskId, shopKey, payload); + if (!Boolean.TRUE.equals(merged.getSuccess())) { + return; + } + // 本支闸门只看 success,不看行数 ⇒「说完成了但一行可用 ASIN 都没有」在这里可达(ShopMatch 不可达) + if (countPayloadRows(merged) <= 0) { + markResultFailed(fr, buildNoUsableRowsMessage(payload)); + priceTrackTaskCacheService.removeShopMergedPayload(taskId, shopKey); + return; + } + try { + enqueueResultFileAssembly(fr, shopKey, merged); + priceTrackTaskCacheService.removeShopMergedPayload(taskId, shopKey); + } catch (Exception ex) { + markResultFailed(fr, ex.getMessage() == null ? "assemble price-track result failed" : ex.getMessage()); + priceTrackTaskCacheService.removeShopMergedPayload(taskId, shopKey); + } + } + + @Override + protected void onShopRowsRecomputed(FileTaskEntity task, List latestRows) { + updateTaskStatusFromLatestRows(task, latestRows); } public boolean tryFinalizeTask(Long taskId, boolean fromCompensation) { @@ -678,11 +711,7 @@ public class PriceTrackTaskService { cleanupTaskCacheIfTerminal(taskId, task.getStatus()); return false; } - List latest = fileResultMapper.selectList( - new LambdaQueryWrapper() - .eq(FileResultEntity::getTaskId, taskId) - .eq(FileResultEntity::getModuleType, MODULE_TYPE) - .orderByAsc(FileResultEntity::getId)); + List latest = listScopeRows(taskId); if (latest.isEmpty()) { task.setStatus("FAILED"); task.setErrorMessage("task details missing, cannot finalize automatically"); @@ -740,11 +769,7 @@ public class PriceTrackTaskService { if (!changed && cachedPayloadByShop.isEmpty()) { return false; } - List refreshed = fileResultMapper.selectList( - new LambdaQueryWrapper() - .eq(FileResultEntity::getTaskId, taskId) - .eq(FileResultEntity::getModuleType, MODULE_TYPE) - .orderByAsc(FileResultEntity::getId)); + List refreshed = listScopeRows(taskId); updateTaskStatusFromLatestRows(task, refreshed); return true; } @@ -771,11 +796,7 @@ public class PriceTrackTaskService { private void reconcileTaskAfterResultRemoval(Long taskId) { FileTaskEntity task = loadTaskForExecution(taskId); if (task == null || !MODULE_TYPE.equals(task.getModuleType())) return; - List latest = fileResultMapper.selectList( - new LambdaQueryWrapper() - .eq(FileResultEntity::getTaskId, taskId) - .eq(FileResultEntity::getModuleType, MODULE_TYPE) - .orderByAsc(FileResultEntity::getId)); + List latest = listScopeRows(taskId); if (latest.isEmpty()) { priceTrackLoopRunService.syncLoopRunAfterChildRemoved(taskId); fileTaskMapper.deleteById(taskId); @@ -842,19 +863,9 @@ public class PriceTrackTaskService { boolean partialFailure = result.getErrorMessage() != null && !result.getErrorMessage().isBlank(); try { excelAssemblyService.writeWorkbook(xlsx, countries); - String objectKey = ossStorageService.uploadResultFile(xlsx, MODULE_TYPE); - if (partialFailure) { - result.setSuccess(0); - } else { - result.setSuccess(1); - result.setErrorMessage(null); - } - result.setResultFilename(stem + ".xlsx"); - result.setResultFileUrl(objectKey); - result.setResultFileSize(xlsx.length()); - result.setResultContentType(CONTENT_TYPE_XLSX); - result.setRowCount(excelAssemblyService.countRows(countries)); - fileResultMapper.updateById(result); + // 上传+结果行 6 列落库是六支逐字相同的那一截,沉在底座;清理点各支不同,仍留在本层 finally + publishResultFile(result, xlsx, stem + ".xlsx", CONTENT_TYPE_XLSX, + excelAssemblyService.countRows(countries), partialFailure); } finally { cn.hutool.core.io.FileUtil.del(xlsx); } @@ -876,11 +887,7 @@ public class PriceTrackTaskService { assembleShopResult(result, job.getScopeKey(), payload); FileTaskEntity task = loadTaskForExecution(job.getTaskId()); if (task != null && MODULE_TYPE.equals(task.getModuleType())) { - List latest = fileResultMapper.selectList( - new LambdaQueryWrapper() - .eq(FileResultEntity::getTaskId, job.getTaskId()) - .eq(FileResultEntity::getModuleType, MODULE_TYPE) - .orderByAsc(FileResultEntity::getId)); + List latest = listScopeRows(job.getTaskId()); updateTaskStatusFromLatestRows(task, latest); } } @@ -902,7 +909,7 @@ public class PriceTrackTaskService { applyServerModifyCounts(result.getTaskId(), payload); taskResultPayloadService.saveLatest(result.getTaskId(), MODULE_TYPE, shopKey, payload); markResultFilePending(result, shopKey, payload, preserveFailure); - taskFileJobService.enqueueAssembleResult(result.getTaskId(), MODULE_TYPE, result.getId(), shopKey); + enqueueResultAssembly(result.getTaskId(), result.getId(), shopKey); } private void applyServerModifyCounts( @@ -1894,11 +1901,7 @@ public class PriceTrackTaskService { private PriceTrackTaskDetailVo buildTaskDetail(FileTaskEntity task) { PriceTrackTaskDetailVo detail = new PriceTrackTaskDetailVo(); detail.setTask(toTaskItemVo(task)); - List rows = fileResultMapper.selectList( - new LambdaQueryWrapper() - .eq(FileResultEntity::getTaskId, task.getId()) - .eq(FileResultEntity::getModuleType, MODULE_TYPE) - .orderByAsc(FileResultEntity::getId)); + List rows = listScopeRows(task.getId()); for (FileResultEntity fr : rows) { detail.getItems().add(toHistoryItemVo(fr, task)); } @@ -1971,11 +1974,7 @@ public class PriceTrackTaskService { } private List buildSnapshotFromDb(Long taskId, String taskStatus) { - List rows = fileResultMapper.selectList( - new LambdaQueryWrapper() - .eq(FileResultEntity::getTaskId, taskId) - .eq(FileResultEntity::getModuleType, MODULE_TYPE) - .orderByAsc(FileResultEntity::getId)); + List rows = listScopeRows(taskId); List list = new ArrayList<>(); for (FileResultEntity fr : rows) list.add(toHistoryItemVo(fr, taskStatus)); return list; @@ -2264,7 +2263,7 @@ public class PriceTrackTaskService { * 显式开启一个短事务:锁已在事务外获取,这里只包住 DB 段, * 保证原来同属一个 @Transactional 的多条写仍在同一事务内。 */ - private T inNewTransaction(java.util.function.Supplier action) { + private R inNewTransaction(java.util.function.Supplier action) { if (transactionManager == null) { // 单测直接 new 出本类(history 见 QueryAsinSnapshotJsonThrottleTest 同类用法)时无事务管理器 return action.get(); @@ -2278,7 +2277,7 @@ public class PriceTrackTaskService { * 默认传播(REQUIRED)事务段:供「外部 IO 已移出、只剩 DB 写」的方法体使用。 * 与 {@link #inNewTransaction} 的差别是不挂起外层事务;单测直接 new 本类时退化为直调。 */ - private T inRequiredTransaction(java.util.function.Supplier action) { + private R inRequiredTransaction(java.util.function.Supplier action) { if (transactionManager == null) { return action.get(); } 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 1e9213d5a..2fa897ef3 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 @@ -43,7 +43,6 @@ import com.nanri.aiimage.modules.task.service.TaskFinalizeSupport; import com.nanri.aiimage.modules.task.service.TaskResultPayloadService; import com.nanri.aiimage.modules.task.service.pipeline.AbstractShopPayloadTaskPipeline; import com.nanri.aiimage.modules.ziniao.service.ZiniaoShopSwitchService; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -409,10 +408,7 @@ public class ShopMatchTaskService extends AbstractShopPayloadTaskPipeline latest = fileResultMapper.selectList(new LambdaQueryWrapper() - .eq(FileResultEntity::getTaskId, taskId) - .eq(FileResultEntity::getModuleType, MODULE_TYPE) - .orderByAsc(FileResultEntity::getId)); + List latest = listScopeRows(taskId); if (latest.isEmpty()) { fileTaskMapper.deleteById(taskId); shopMatchTaskCacheService.deleteTaskCache(taskId); @@ -737,10 +733,7 @@ public class ShopMatchTaskService extends AbstractShopPayloadTaskPipeline resultRows = fileResultMapper.selectList(new LambdaQueryWrapper() - .eq(FileResultEntity::getTaskId, taskId) - .eq(FileResultEntity::getModuleType, MODULE_TYPE) - .orderByAsc(FileResultEntity::getId)); + List resultRows = listScopeRows(taskId); if (resultRows.isEmpty()) { return false; } @@ -816,10 +809,7 @@ public class ShopMatchTaskService extends AbstractShopPayloadTaskPipeline latest = fileResultMapper.selectList(new LambdaQueryWrapper() - .eq(FileResultEntity::getTaskId, taskId) - .eq(FileResultEntity::getModuleType, MODULE_TYPE) - .orderByAsc(FileResultEntity::getId)); + List latest = listScopeRows(taskId); updateTaskStatusFromLatestRows(task, latest, batchErrors); return true; } @@ -861,10 +851,7 @@ public class ShopMatchTaskService extends AbstractShopPayloadTaskPipeline latest = fileResultMapper.selectList(new LambdaQueryWrapper() - .eq(FileResultEntity::getTaskId, job.getTaskId()) - .eq(FileResultEntity::getModuleType, MODULE_TYPE) - .orderByAsc(FileResultEntity::getId)); + List latest = listScopeRows(job.getTaskId()); updateTaskStatusFromLatestRows(task, latest, List.of()); } } @@ -1071,10 +1058,7 @@ public class ShopMatchTaskService extends AbstractShopPayloadTaskPipeline rows = fileResultMapper.selectList(new LambdaQueryWrapper() - .eq(FileResultEntity::getTaskId, task.getId()) - .eq(FileResultEntity::getModuleType, MODULE_TYPE) - .orderByAsc(FileResultEntity::getId)); + List rows = listScopeRows(task.getId()); for (FileResultEntity row : rows) { detail.getItems().add(toHistoryItemVo(row, task)); } @@ -1088,10 +1072,7 @@ public class ShopMatchTaskService extends AbstractShopPayloadTaskPipeline buildSnapshotFromDb(Long taskId, String taskStatus) { - List rows = fileResultMapper.selectList(new LambdaQueryWrapper() - .eq(FileResultEntity::getTaskId, taskId) - .eq(FileResultEntity::getModuleType, MODULE_TYPE) - .orderByAsc(FileResultEntity::getId)); + List rows = listScopeRows(taskId); List items = new ArrayList<>(); for (FileResultEntity row : rows) { items.add(toHistoryItemVo(row, taskStatus));