From 394145deb5a3b7dd38757eb8e68fcab56271e983 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 13:33:19 +0800 Subject: [PATCH] =?UTF-8?q?refactor(phase-3):=203E=20=E7=AC=AC=E4=BA=94?= =?UTF-8?q?=E6=94=AF=E6=8E=A5=E5=85=A5=E5=BA=95=E5=BA=A7=E2=80=94=E2=80=94?= =?UTF-8?q?=E6=8E=A5=E5=BE=97=E4=B8=8A=E4=B8=83=E4=BB=B6=E4=B9=9D=E7=82=B9?= =?UTF-8?q?=EF=BC=8C=E6=8E=A5=E4=B8=8D=E4=B8=8A=E7=9A=84=E5=85=AD=E6=A0=BC?= =?UTF-8?q?=E9=80=90=E6=A0=BC=E7=AB=8B=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DeleteBrandRunService extends AbstractFileTaskPipeline: @RequiredArgsConstructor 换显式 14 枚构造子,五枚(两支 Mapper+锁+Job+OSS)交 super, 本支不再重复声明那五个字段;moduleType()/loadTaskForSubmission() 两枚钩子落地。 接上并逐点核对的七件九点:requireUserId(:176)、newTaskHeader+insertTask(:180/183)、 newScopeRow 两处(:259/271)、requireSubmissionTask(:1372)、enqueueResultAssembly(:1516)、 listScopeRows 两处(:1609/1717)。 接不上、且都写了实测理由的六格(不是「没做」,是「做了会改行为」): - requireTaskId:本支 :1361 文案「任务 id 不合法」≠ 底座「taskId 不合法」,且它在取锁之前 - rejectTerminalSubmission:本支 :1384 只说「任务已结束」——同一 ERROR 形内部有两种文案, 底座把文案写死了 - acquireSubmissionLockOrThrow:本支 :2249 抛不带 TASK_BUSY code 的那句,而 :1577 用 message.contains("任务正被占用,请稍后重试") 当收尾跳过的判据 ⇒ 换件=改锁竞争语义 - writeJson:本支建单走 hutool JSONUtil,压根没有 Jackson 序列化失败那一格 - publishResultFile:形状同但本支 :1916-1924 写的是可空 Integer rowCount(缓存 DTO), 底座件收 int ⇒ 套上去要么 NPE 要么把 NULL 洗成 0 - taskCacheService():DeleteBrandTaskCacheService 不继承 AbstractModuleTaskCacheService (第二例,第一例是 AP 的兄弟抽象)⇒ 心跳那格没有承接件,admitSubmission 整段用不上 另有 :1770 那处 enqueueAssembleResult 因吃掉返回值(按 job.status/retryCount 判组装已终态 失败)也没换。底座 javadoc 的四处出处账按上述实测更正,并把 :1265 那枚会腐烂的行号指针 改成方法名指针。 拆薄同笔抵账(readability 点名基线只许降):删两枚零调用私有件 countCompletedFiles/ inNewTransaction,接走建单 12 行与结果行各 5-7 行;棘轮读数 2305→2300。本支手抄的 「!MODULE_TYPE.equals(」由 8 处降到 7 处(TaskLifecycleDebt 那格方向对)。基线一格未改。 接线:TaskServiceWiringSliceTest 加第五支(3 枚新 @Bean 桩+逐枚 assertSame 本支 9 枚私有件 +「五枚底座字段不许在本支重复声明」那条 NoSuchFieldException 断言+DELETE_BRAND 那对 moduleType 验证);顺手把这篇测试自己两处会撒谎的计数(两支/三支)改成实数。 门禁:后端全量 mvn -o test 4523 例/0 红/0 错/13 skipped,BUILD SUCCESS;两条 deletebrand golden(run-snapshot+昨日新落 submit-result-snapshot)跑完 git status 一字未动 ⇒ 建单/解析/ 载荷/回传四段对外行为零变化;定向 79 例全绿;ops 面 ruff All checks passed、readability 9 passed。 ⚠ 真机启动验收(mvn -o spring-boot:run)仍未做,五支都欠着,账在 Phase 8。 --- .../service/DeleteBrandRunService.java | 137 +++++++++--------- .../pipeline/AbstractFileTaskPipeline.java | 45 +++++- .../config/TaskServiceWiringSliceTest.java | 72 ++++++++- 3 files changed, 170 insertions(+), 84 deletions(-) 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 d0d582ddb..0dece025f 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 @@ -2,13 +2,11 @@ package com.nanri.aiimage.modules.deletebrand.service; import com.nanri.aiimage.common.util.UserMessages; import cn.hutool.core.io.FileUtil; -import cn.hutool.core.util.IdUtil; import cn.hutool.json.JSONUtil; 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.DeleteBrandProgressProperties; import com.nanri.aiimage.config.TaskPressureProperties; @@ -42,10 +40,10 @@ import com.nanri.aiimage.modules.task.model.entity.TaskFileJobEntity; 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.pipeline.AbstractFileTaskPipeline; import com.nanri.aiimage.modules.ziniao.model.vo.ZiniaoShopMatchResultVo; import com.nanri.aiimage.modules.ziniao.service.ZiniaoShopIndexService; import com.nanri.aiimage.modules.ziniao.service.ZiniaoShopSwitchService; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; @@ -76,9 +74,8 @@ import com.nanri.aiimage.modules.task.model.vo.TaskProgressLightBatchVo; import com.nanri.aiimage.modules.task.service.TaskProgressLightAssembler; @Service -@RequiredArgsConstructor @Slf4j -public class DeleteBrandRunService { +public class DeleteBrandRunService extends AbstractFileTaskPipeline { private static final String MODULE_TYPE = "DELETE_BRAND"; @@ -92,31 +89,68 @@ public class DeleteBrandRunService { private static final Duration TASK_LOCK_TTL = TaskDistributedLockService.DEFAULT_LOCK_TTL; private static final long TASK_LOCK_WAIT_MILLIS = TaskDistributedLockService.DEFAULT_WAIT_MILLIS; - private final FileTaskMapper fileTaskMapper; - private final FileResultMapper fileResultMapper; private final LocalFileStorageService localFileStorageService; private final DeleteBrandTaskCacheService deleteBrandTaskCacheService; private final DeleteBrandTaskStorageService deleteBrandTaskStorageService; private final ZiniaoShopSwitchService ziniaoShopSwitchService; - private final OssStorageService ossStorageService; private final ObjectMapper objectMapper; private final DeleteBrandProgressProperties deleteBrandProgressProperties; private final TaskPressureProperties taskPressureProperties; - private final TaskDistributedLockService taskDistributedLockService; - private final TaskFileJobService taskFileJobService; private final PlatformTransactionManager transactionManager; private final TaskProgressLightAssembler taskProgressLightAssembler; + /** + * 显式构造子取代 {@code @RequiredArgsConstructor}:五枚底座依赖(两支 Mapper+锁+Job+对象存储) + * 交 {@code super(...)} 持有,本支不再重复声明那五个字段。逐枚接线由 {@code TaskServiceWiringSliceTest} 钉。 + */ + public DeleteBrandRunService(FileTaskMapper fileTaskMapper, + FileResultMapper fileResultMapper, + LocalFileStorageService localFileStorageService, + DeleteBrandTaskCacheService deleteBrandTaskCacheService, + DeleteBrandTaskStorageService deleteBrandTaskStorageService, + ZiniaoShopSwitchService ziniaoShopSwitchService, + OssStorageService ossStorageService, + ObjectMapper objectMapper, + DeleteBrandProgressProperties deleteBrandProgressProperties, + TaskPressureProperties taskPressureProperties, + TaskDistributedLockService taskDistributedLockService, + TaskFileJobService taskFileJobService, + PlatformTransactionManager transactionManager, + TaskProgressLightAssembler taskProgressLightAssembler) { + super(fileTaskMapper, fileResultMapper, taskDistributedLockService, taskFileJobService, ossStorageService); + this.localFileStorageService = localFileStorageService; + this.deleteBrandTaskCacheService = deleteBrandTaskCacheService; + this.deleteBrandTaskStorageService = deleteBrandTaskStorageService; + this.ziniaoShopSwitchService = ziniaoShopSwitchService; + this.objectMapper = objectMapper; + this.deleteBrandProgressProperties = deleteBrandProgressProperties; + this.taskPressureProperties = taskPressureProperties; + this.transactionManager = transactionManager; + this.taskProgressLightAssembler = taskProgressLightAssembler; + } + + @Override + protected String moduleType() { + return MODULE_TYPE; + } + + /** + * 加载走本支那一派:缓存优先(Redis 任务缓存→DB→回写缓存),与 AppearancePatent/Publish/ + * CollectData 的直接 {@code selectById} 不同派,所以这一格由本支定。整段 + * {@code admitSubmission} 套不上——本支先取锁后加载、终态文案也不同,而缓存服务不继承 + * {@code AbstractModuleTaskCacheService},心跳那一格没有承接件。 + */ + @Override + protected FileTaskEntity loadTaskForSubmission(Long taskId) { + return loadTaskForExecution(taskId); + } + private TransactionTemplate newRequiresNewTemplate() { TransactionTemplate template = new TransactionTemplate(transactionManager); template.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW); return template; } - private T inNewTransaction(java.util.function.Supplier action) { - return newRequiresNewTemplate().execute(status -> action.get()); - } - private void inNewTransactionVoid(Runnable action) { newRequiresNewTemplate().execute(status -> { action.run(); @@ -139,23 +173,14 @@ public class DeleteBrandRunService { } public DeleteBrandRunVo run(DeleteBrandRunRequest request, String deviceId) { - if (request.getUserId() == null || request.getUserId() <= 0) { - throw new BusinessException("user_id 不合法"); - } + requireUserId(request.getUserId()); - FileTaskEntity task = new FileTaskEntity(); - task.setTaskNo(MODULE_TYPE + "-" + IdUtil.getSnowflakeNextIdStr()); - task.setModuleType(MODULE_TYPE); - task.setTaskMode("IMMEDIATE"); - task.setStatus("RUNNING"); - task.setSourceFileCount(request.getFiles().size()); - task.setCreatedBy("user:" + request.getUserId()); - task.setUserId(request.getUserId()); - task.setDeviceId(AdminAuthSupport.normalizeDeviceId(deviceId)); + // 建单那两列(successFileCount/failedFileCount)现网此刻留 NULL,逐文件循环跑完才回填—— + // 底座刻意不替它默认 0,所以这里一个都不 set。 + FileTaskEntity task = newTaskHeader("RUNNING", "IMMEDIATE", request.getUserId(), deviceId, + request.getFiles().size(), LocalDateTime.now()); task.setRequestJson(JSONUtil.toJsonStr(request)); - task.setCreatedAt(LocalDateTime.now()); - task.setUpdatedAt(LocalDateTime.now()); - fileTaskMapper.insert(task); + insertTask(task); deleteBrandTaskCacheService.saveTaskCache(task); List items = new ArrayList<>(); @@ -230,19 +255,11 @@ public class DeleteBrandRunService { item.setSuccess(true); - FileResultEntity resultEntity = new FileResultEntity(); - resultEntity.setTaskId(task.getId()); - resultEntity.setModuleType(MODULE_TYPE); - resultEntity.setSourceFilename(item.getSourceFilename()); - resultEntity.setSourceFileUrl(sourceFile.getFileKey()); - resultEntity.setResultFilename(null); - resultEntity.setResultFileUrl(null); + // 现网这里显式 set resultFilename/resultFileUrl=null:新建实体本就是这个值,不跟着搬 + FileResultEntity resultEntity = newScopeRow(task.getId(), request.getUserId(), + item.getSourceFilename(), sourceFile.getFileKey(), parsed.totalRows(), 0); resultEntity.setResultFileSize(0L); resultEntity.setResultContentType(CONTENT_TYPE_XLSX); - resultEntity.setRowCount(parsed.totalRows()); - resultEntity.setSuccess(0); - resultEntity.setUserId(request.getUserId()); - resultEntity.setCreatedAt(LocalDateTime.now()); fileResultMapper.insert(resultEntity); item.setResultId(resultEntity.getId()); } catch (Exception ex) { @@ -250,15 +267,10 @@ public class DeleteBrandRunService { item.setError(UserMessages.orFallback(ex.getMessage(), "这个文件解析失败,请检查内容后重新上传")); parsedFailedCount++; - FileResultEntity resultEntity = new FileResultEntity(); - resultEntity.setTaskId(task.getId()); - resultEntity.setModuleType(MODULE_TYPE); - resultEntity.setSourceFilename(sourceFile.getOriginalFilename()); - resultEntity.setSourceFileUrl(sourceFile.getFileKey()); - resultEntity.setSuccess(0); + // 失败行不写 rowCount(现网就是留 NULL),错误文案才是它的对外语义 + FileResultEntity resultEntity = newScopeRow(task.getId(), request.getUserId(), + sourceFile.getOriginalFilename(), sourceFile.getFileKey(), null, 0); resultEntity.setErrorMessage(UserMessages.orFallback(ex.getMessage(), "这个文件解析失败,请检查内容后重新上传")); - resultEntity.setUserId(request.getUserId()); - resultEntity.setCreatedAt(LocalDateTime.now()); fileResultMapper.insert(resultEntity); item.setResultId(resultEntity.getId()); } @@ -1355,10 +1367,9 @@ public class DeleteBrandRunService { throw new BusinessException("文件列表为空"); } - FileTaskEntity task = loadTaskForExecution(taskId); - if (task == null || !MODULE_TYPE.equals(task.getModuleType())) { - throw new BusinessException("任务不存在"); - } + // 底座那格(加载+模块校验+「任务不存在」)与本支逐字同形;整段 admitSubmission 套不上: + // 本支先取锁后加载,且终态那格是「任务已结束」而非「任务已结束,拒绝重复提交」。 + FileTaskEntity task = requireSubmissionTask(taskId); if ("SUCCESS".equals(task.getStatus()) || "FAILED".equals(task.getStatus())) { log.warn("[DeleteBrand] submitResult rejected because task is terminal -> taskId: {}, status: {}, createdAt: {}, updatedAt: {}, finishedAt: {}, error: {}, sourceFiles: {}, successFiles: {}, failedFiles: {}", task.getId(), @@ -1502,7 +1513,7 @@ public class DeleteBrandRunService { resultEntity.setResultFileSize(0L); } fileResultMapper.updateById(resultEntity); - taskFileJobService.enqueueAssembleResult(task.getId(), MODULE_TYPE, resultEntity.getId(), fileIdentity); + enqueueResultAssembly(task.getId(), resultEntity.getId(), fileIdentity); log.info("[DeleteBrand] completed file early assemble job enqueued -> taskId: {}, resultId: {}, file: {}", task.getId(), resultEntity.getId(), parsedFile.getSourceFilename()); } @@ -1595,10 +1606,7 @@ public class DeleteBrandRunService { if (task == null || task.getId() == null) { return; } - List resultEntities = fileResultMapper.selectList(new LambdaQueryWrapper() - .eq(FileResultEntity::getModuleType, MODULE_TYPE) - .eq(FileResultEntity::getTaskId, task.getId()) - .orderByAsc(FileResultEntity::getId)); + List resultEntities = listScopeRows(task.getId()); if (resultEntities == null || resultEntities.isEmpty()) { return; } @@ -1648,16 +1656,6 @@ public class DeleteBrandRunService { task.getId(), task.getStatus(), successCount, failedCount); } - private int countCompletedFiles(Map> mergedByFile) { - int finishedFiles = 0; - for (List chunks : mergedByFile.values()) { - if (isMergedFileCompleted(chunks)) { - finishedFiles++; - } - } - return finishedFiles; - } - private boolean isMergedFileCompleted(List chunks) { if (chunks == null || chunks.isEmpty()) { return false; @@ -1716,10 +1714,7 @@ public class DeleteBrandRunService { "updated_at", String.valueOf(System.currentTimeMillis()) )); - List resultEntities = fileResultMapper.selectList(new LambdaQueryWrapper() - .eq(FileResultEntity::getModuleType, MODULE_TYPE) - .eq(FileResultEntity::getTaskId, task.getId()) - .orderByAsc(FileResultEntity::getId)); + List resultEntities = listScopeRows(task.getId()); Map resultEntityByIdentity = new LinkedHashMap<>(); for (FileResultEntity entity : resultEntities) { String identity = entity.getSourceFileUrl(); 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 8b3e74340..913778923 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 @@ -71,7 +71,8 @@ import java.util.List; * (AppearancePatent/ShopDataCrawl/ShopMatch/PriceTrack),其余三支没有—— * 故 {@link #taskCacheService()} 默认 {@code null},心跳只在有缓存服务的支上落, * 与现网一致(DeleteBrand 走自家 {@code saveProgress},其缓存服务不继承本抽象, - * 见 {@code DeleteBrandRunService:1265} 注释)。 + * 见 {@code DeleteBrandRunService#loadTaskForExecution} 里那句注释;3A 的 AppearancePatent + * 是第二例——它继承的是兄弟抽象 {@code AbstractPendingRowTaskCacheService})。 * *

依赖严格限于 task 模块内部+{@code common}+{@code modules.file},不触碰任何业务模块, * 满足 ArchUnit 冻结线 {@code TASK_TO_BUSINESS_BASELINE = 0} @@ -81,7 +82,7 @@ import java.util.List; @Slf4j public abstract class AbstractFileTaskPipeline { - /** 终态任务被再次回传时的拒绝形状。两支差异不是文案,是线协议。 */ + /** 终态任务被再次回传时的拒绝形状。两支的主要差异是线协议,但 3E 实测:同一形内部文案也不止一种。 */ public enum TerminalRejection { /** * 带 {@link BusinessCodes#TASK_ALREADY_FINISHED}(40901): @@ -91,7 +92,13 @@ public abstract class AbstractFileTaskPipeline { IDEMPOTENT, /** * 不带 code({@code BusinessException(String)}):响应 success=false,调用方会当错误处理。 - * 现网出处:ShopDataCrawl {@code :633}/DeleteBrand {@code :1362-1374}/Publish {@code :1344}。 + * 现网出处:ShopDataCrawl {@code :633}/Publish {@code :1344}——两支文案就是本件那句 + * 「任务已结束,拒绝重复提交」。 + * + *

3E 实测补正:{@code DeleteBrandRunService:1384} 同属不带 code 这一形,文案却只有 + * 「任务已结束」。本件把文案写死了,所以那一支接不上、留本地写法(它的回传段 golden + * {@code terminalTaskRejected} 逐字钉着这句)。Phase 2 原先把 DeleteBrand 列在本件出处里, + * 是按「有无 code」这一维归的类,文案那一维当时没数过。 */ ERROR } @@ -312,7 +319,14 @@ public abstract class AbstractFileTaskPipeline { // 段 3:回传落库——准入序列 // ------------------------------------------------------------------ - /** {@code taskId} 非法即拒。出处:ShopDataCrawl{@code :619}/ShopMatch{@code :631}/PriceTrack{@code :592}。 */ + /** + * {@code taskId} 非法即拒。出处:ShopDataCrawl{@code :619}/ShopMatch{@code :631}/PriceTrack{@code :592}。 + * + *

3E 实测补充:这一格不是七支通用。{@code DeleteBrandRunService:1361} 判据逐字相同 + * 但文案是「任务 id 不合法」(本件是「taskId 不合法」),且它把这一格放在取锁之前—— + * 回传段 golden 里 {@code reject:taskIdNull} 那例的 {@code lockAcquire=0} 钉的就是这个步序。 + * 文案是对外契约(golden 逐字锁着),底座只收上面那三支的形状,第五支要留本地写法。 + */ protected final void requireTaskId(Long taskId) { if (taskId == null || taskId <= 0) { throw new BusinessException("taskId 不合法"); @@ -334,7 +348,17 @@ public abstract class AbstractFileTaskPipeline { return TaskFinalizeSupport.acquireTaskLockOrThrow(taskDistributedLockService, moduleType(), taskId, logTag); } - /** 带等待时长的变体(CollectData/ShopDataCrawl 等自有 {@code TASK_LOCK_WAIT_MILLIS})。 */ + /** + * 带等待时长的变体(CollectData/ShopDataCrawl 等自有 {@code TASK_LOCK_WAIT_MILLIS})。 + * + *

3E 实测:这一格对 DeleteBrand 接不上,而且接上会踩掉一条本地语义。 + * {@code DeleteBrandRunService:2249} 抢锁失败抛的是不带 code 的 + * {@code BusinessException("任务正被占用,请稍后重试")},而本件抛带 {@link BusinessCodes#TASK_BUSY} + * 的「任务正在处理中,请稍后再试」;更要命的是它家 {@code :1577} 用 + * {@code ex.getMessage().contains("任务正被占用,请稍后重试")} 来识别「锁竞争 ⇒ 收尾跳过、不报错」。 + * 也就是说那句文案在本支内部是被字符串匹配的判据,换件就等于悄悄把锁竞争时的收尾 + * 从「静默跳过」改成「整条回传冒错」。golden 的 {@code lockBusyRejected} 钉着这一格。 + */ protected final TaskDistributedLockService.LockHandle acquireSubmissionLockOrThrow(Long taskId, String logTag, long waitMillis) { @@ -388,6 +412,11 @@ public abstract class AbstractFileTaskPipeline { * 步序与本类默认序相反(先归属后终态),整段套 {@code admitSubmission} 就会改掉那格的可见结果 * (见方法注释里立着的账)。拆开后它按自己的序复用这三格,而 ShopMatch/PriceTrack 走的 * 默认序一个字没动——四格合起来与拆前逐句等值,两支的 golden 就是这条等值的证明。 + * + *

3E 是这条拆格决定的第二次兑现:{@code DeleteBrandRunService:1372} 也是先取锁后加载, + * 只复用本格(它的「任务不存在」文案逐字相同),终态那格因文案不同留在本地(见 + * {@link TerminalRejection#ERROR})。没有这一格,3E 就只能整段套或整段不套——套即改行为、 + * 不套即零复用,两边都是亏。 */ protected final FileTaskEntity requireSubmissionTask(Long taskId) { FileTaskEntity task = loadTaskForSubmission(taskId); @@ -454,6 +483,12 @@ public abstract class AbstractFileTaskPipeline { * Publish{@code :590-598}/CollectData{@code :1166-1190}/AppearancePatent{@code :1876} * /DeleteBrand{@code :1921-1929}。 * + *

DeleteBrand 形状同、入参不同,本件对它接不上(3E 实测):现网 + * {@code :1916-1924} 写的是 {@code setRowCount(parsedFile.getTotalRows())},那枚 + * {@code DeleteBrandParsedFileCacheDto.totalRows} 是可空 Integer(缓存里读出来的载荷可能没这格), + * 而本件收 {@code int rowCount}——换上去要么 NPE、要么把 NULL 洗成 0。本支留本地写法; + * 把入参放宽成 {@code Integer} 属于「调整底座判据」动作,不在迁移笔里顺手干。 + * *

ShopDataCrawl 不在此件适用范围内:它写 5 列走的是另一条路—— * {@code updateResultFileColumns:1880-1892} 用 {@code LambdaUpdateWrapper} 按 id 集合批量 * {@code .in(ids).eq(success, RESULT_SUCCESS).set(...)},既不 {@code updateById} 载入的实体、 diff --git a/backend-java/src/test/java/com/nanri/aiimage/config/TaskServiceWiringSliceTest.java b/backend-java/src/test/java/com/nanri/aiimage/config/TaskServiceWiringSliceTest.java index dd783d803..461c60f75 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/config/TaskServiceWiringSliceTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/config/TaskServiceWiringSliceTest.java @@ -67,10 +67,13 @@ import static org.mockito.Mockito.verifyNoInteractions; * Phase 3 动了 {@code @Service} 的**构造器形状**(Lombok {@code @RequiredArgsConstructor} 生成枚 * → 手写的显式枚,还要把 5 枚交给 {@code super})——这正是「装配相邻」的改动,光靠单测说不过去。 * 本切片不连数据库,但走的是**真的 Spring 构造器解析**:隐式单构造器注入是否成立、 - * 底座那 5 枚是否真从 {@code super(...)} 落进来、三支是否各自拿到自己的缓存服务与装配服务。 + * 底座那 5 枚是否真从 {@code super(...)} 落进来、五支是否各自拿到自己的缓存服务与装配服务。 * 3B 把第三支({@code ShopDataCrawlTaskService},23 枚依赖)也接进来时,本切片顺带钉住 * 「它继承的是底座、不是 shop-payload 家族层」这条按证据得出的结论——家族层模板会改掉它的准入步序 - * 与收尾闸门,误套上去这里当场红。 + * 与收尾闸门,误套上去这里当场红。3A/3E 又各加了第四、第五支,同一格判据沿用; + * 其中两支({@code AppearancePatentTaskCacheService}/{@code DeleteBrandTaskCacheService})的缓存服务 + * 不继承 {@code AbstractModuleTaskCacheService},所以 {@code taskCacheService()} 那枚钩子 + * 在它们身上必须是缺件(底座 javadoc 已按实测更正过),别指望这里出现「心跳接上」的断言。 * *

为什么不只断言「refresh() 没抛异常」。那是一句会说谎的判据:Spring 6 在没有 * {@code @Autowired} 而存在多枚 public 构造器时,会**静默挑无参那一枚**,容器照样起得来、 @@ -249,6 +252,19 @@ class TaskServiceWiringSliceTest { @Bean com.nanri.aiimage.modules.usersecret.service.UserApiSecretService userApiSecretService() { return mock(com.nanri.aiimage.modules.usersecret.service.UserApiSecretService.class); } + + // ---- 3E 迁进来的 DeleteBrand 那一支(14 枚依赖;「缓存服务不继承底座抽象」的第二例)---- + @Bean com.nanri.aiimage.modules.deletebrand.service.DeleteBrandTaskCacheService deleteBrandTaskCacheService() { + return mock(com.nanri.aiimage.modules.deletebrand.service.DeleteBrandTaskCacheService.class); + } + + @Bean com.nanri.aiimage.modules.deletebrand.service.DeleteBrandTaskStorageService deleteBrandTaskStorageService() { + return mock(com.nanri.aiimage.modules.deletebrand.service.DeleteBrandTaskStorageService.class); + } + + @Bean com.nanri.aiimage.config.DeleteBrandProgressProperties deleteBrandProgressProperties() { + return mock(com.nanri.aiimage.config.DeleteBrandProgressProperties.class); + } } private static AnnotationConfigApplicationContext context(Class... services) { @@ -277,24 +293,28 @@ class TaskServiceWiringSliceTest { } // ------------------------------------------------------------------ - // 正判:真实容器把两支建起来,且每一枚依赖都落在它该落的位置 + // 正判:真实容器把五支建起来,且每一枚依赖都落在它该落的位置 // ------------------------------------------------------------------ @Test void migratedServicesInstantiateThroughTheSpringContainer() { try (AnnotationConfigApplicationContext ctx = context(ShopMatchTaskService.class, PriceTrackTaskService.class, ShopDataCrawlTaskService.class, - com.nanri.aiimage.modules.appearancepatent.service.AppearancePatentTaskService.class)) { + com.nanri.aiimage.modules.appearancepatent.service.AppearancePatentTaskService.class, + com.nanri.aiimage.modules.deletebrand.service.DeleteBrandRunService.class)) { ShopMatchTaskService shopMatch = ctx.getBean(ShopMatchTaskService.class); PriceTrackTaskService priceTrack = ctx.getBean(PriceTrackTaskService.class); ShopDataCrawlTaskService shopDataCrawl = ctx.getBean(ShopDataCrawlTaskService.class); com.nanri.aiimage.modules.appearancepatent.service.AppearancePatentTaskService appearancePatent = ctx.getBean(com.nanri.aiimage.modules.appearancepatent.service.AppearancePatentTaskService.class); + com.nanri.aiimage.modules.deletebrand.service.DeleteBrandRunService deleteBrand = + ctx.getBean(com.nanri.aiimage.modules.deletebrand.service.DeleteBrandRunService.class); assertNotNull(shopMatch, "Lombok 生成枚换成显式枚之后,Spring 仍要能隐式构造注入"); assertNotNull(priceTrack); assertNotNull(shopDataCrawl, "3B 那张 23 枚的参数表也得被容器原样解开"); assertNotNull(appearancePatent, "3A 这张 22 枚的参数表同理——它比 3B 少一枚,风险一样"); + assertNotNull(deleteBrand, "3E 这张 14 枚:本支是全族唯一 taskMode=IMMEDIATE 的一支"); assertTrue(shopMatch instanceof AbstractShopPayloadTaskPipeline, "Phase 3 的判据是「真有生产调用方继承底座」,不是只由单测证明契约可用"); assertTrue(priceTrack instanceof AbstractShopPayloadTaskPipeline); @@ -307,6 +327,10 @@ class TaskServiceWiringSliceTest { // 「按 submissionId 分片」当成「按店铺分片」,那是一整段合并语义的替换。 assertEquals(com.nanri.aiimage.modules.task.service.pipeline.AbstractFileTaskPipeline.class, appearancePatent.getClass().getSuperclass(), "外观专利的直接父类必须是底座那一层"); + // 3E:删除品牌是「自有分片存储」第三族(chunk 存 DeleteBrandTaskStorageService, + // 按 fileIdentity 分scope),既不是 shop-payload 也不是 AP 那族;接错层的代价同上。 + assertEquals(com.nanri.aiimage.modules.task.service.pipeline.AbstractFileTaskPipeline.class, + deleteBrand.getClass().getSuperclass(), "删除品牌的直接父类必须是底座那一层"); } } @@ -314,16 +338,19 @@ class TaskServiceWiringSliceTest { void superCallLandsTheFiveBaseDependenciesInOrder() { try (AnnotationConfigApplicationContext ctx = context(ShopMatchTaskService.class, PriceTrackTaskService.class, ShopDataCrawlTaskService.class, - com.nanri.aiimage.modules.appearancepatent.service.AppearancePatentTaskService.class)) { + com.nanri.aiimage.modules.appearancepatent.service.AppearancePatentTaskService.class, + com.nanri.aiimage.modules.deletebrand.service.DeleteBrandRunService.class)) { ShopMatchTaskService shopMatch = ctx.getBean(ShopMatchTaskService.class); PriceTrackTaskService priceTrack = ctx.getBean(PriceTrackTaskService.class); ShopDataCrawlTaskService shopDataCrawl = ctx.getBean(ShopDataCrawlTaskService.class); com.nanri.aiimage.modules.appearancepatent.service.AppearancePatentTaskService appearancePatent = ctx.getBean(com.nanri.aiimage.modules.appearancepatent.service.AppearancePatentTaskService.class); + com.nanri.aiimage.modules.deletebrand.service.DeleteBrandRunService deleteBrand = + ctx.getBean(com.nanri.aiimage.modules.deletebrand.service.DeleteBrandRunService.class); // 这五枚是交给 super(...) 的那五枚。参数表里它们与其余 12/13 枚同类型不重复, // 换位会在编译期就被挡住——但「少交一枚」「交 null」不会。逐枚 assertSame 才是硬证。 - for (Object service : List.of(shopMatch, priceTrack, shopDataCrawl, appearancePatent)) { + for (Object service : List.of(shopMatch, priceTrack, shopDataCrawl, appearancePatent, deleteBrand)) { assertSame(ctx.getBean(FileTaskMapper.class), fieldValue(service, "fileTaskMapper")); assertSame(ctx.getBean(FileResultMapper.class), fieldValue(service, "fileResultMapper")); assertSame(ctx.getBean(TaskDistributedLockService.class), @@ -351,6 +378,28 @@ class TaskServiceWiringSliceTest { assertSame(ctx.getBean(com.nanri.aiimage.modules.usersecret.service.UserApiSecretService.class), fieldValue(appearancePatent, "userApiSecretService")); + // 3E 的 9 枚私有件逐枚点名。本支最容易串的是「两支同族 Redis 缓存服务」与 + // 「两支同名 taskStorage/localFileStorage」:注错一支不会编译报错,只会把分片写到别人的键域里。 + assertSame(ctx.getBean(com.nanri.aiimage.modules.deletebrand.service.DeleteBrandTaskCacheService.class), + fieldValue(deleteBrand, "deleteBrandTaskCacheService")); + assertSame(ctx.getBean(com.nanri.aiimage.modules.deletebrand.service.DeleteBrandTaskStorageService.class), + fieldValue(deleteBrand, "deleteBrandTaskStorageService")); + assertSame(ctx.getBean(com.nanri.aiimage.config.DeleteBrandProgressProperties.class), + fieldValue(deleteBrand, "deleteBrandProgressProperties")); + assertSame(ctx.getBean(ZiniaoShopSwitchService.class), fieldValue(deleteBrand, "ziniaoShopSwitchService")); + assertSame(ctx.getBean(LocalFileStorageService.class), fieldValue(deleteBrand, "localFileStorageService")); + assertSame(ctx.getBean(TaskProgressLightAssembler.class), + fieldValue(deleteBrand, "taskProgressLightAssembler")); + assertSame(ctx.getBean(PlatformTransactionManager.class), fieldValue(deleteBrand, "transactionManager")); + assertSame(ctx.getBean(ObjectMapper.class), fieldValue(deleteBrand, "objectMapper")); + assertSame(ctx.getBean(com.nanri.aiimage.config.TaskPressureProperties.class), + fieldValue(deleteBrand, "taskPressureProperties")); + // 交出去的那五枚在本支不许留同名私有字段:留了两份,读到的就是本支那枚(没人赋值,永远 null) + assertThrows(NoSuchFieldException.class, + () -> com.nanri.aiimage.modules.deletebrand.service.DeleteBrandRunService.class + .getDeclaredField("fileTaskMapper"), + "底座那五枚只能有一份,本支不该再声明 fileTaskMapper"); + // 三支各自的私有件:绝不能把 A 支的缓存服务注进 B 支(同族三个 bean,最容易串的就是这儿) assertSame(ctx.getBean(ShopMatchTaskCacheService.class), fieldValue(shopMatch, "shopMatchTaskCacheService")); assertSame(ctx.getBean(PriceTrackTaskCacheService.class), fieldValue(priceTrack, "priceTrackTaskCacheService")); @@ -388,22 +437,29 @@ class TaskServiceWiringSliceTest { @Test void injectedCollaboratorsAreActuallyUsedAndEachBranchReportsItsOwnModuleType() { try (AnnotationConfigApplicationContext ctx = context(ShopMatchTaskService.class, - PriceTrackTaskService.class, ShopDataCrawlTaskService.class)) { + PriceTrackTaskService.class, ShopDataCrawlTaskService.class, + com.nanri.aiimage.modules.deletebrand.service.DeleteBrandRunService.class)) { TaskProgressLightAssembler assembler = ctx.getBean(TaskProgressLightAssembler.class); ShopMatchTaskService shopMatch = ctx.getBean(ShopMatchTaskService.class); PriceTrackTaskService priceTrack = ctx.getBean(PriceTrackTaskService.class); ShopDataCrawlTaskService shopDataCrawl = ctx.getBean(ShopDataCrawlTaskService.class); + com.nanri.aiimage.modules.deletebrand.service.DeleteBrandRunService deleteBrand = + ctx.getBean(com.nanri.aiimage.modules.deletebrand.service.DeleteBrandRunService.class); List taskIds = List.of(1L); shopMatch.progressLight(taskIds, 7L); priceTrack.progressLight(taskIds, 7L); shopDataCrawl.progressLight(taskIds, 7L); + deleteBrand.progressLight(taskIds, 7L); // moduleType() 是迁移新加的钩子:回错一支,心跳、结果行与组装 Job 全挂到别人模块上, - // 而建单照样成功——那种错只有在这里才看得见。三支三个枚举形,串一支就少一对。 + // 而建单照样成功——那种错只有在这里才看得见。四支四个字符串,串一支就少一对。 verify(assembler, times(1)).assemble(eq("SHOP_MATCH"), eq(7L), eq(taskIds)); verify(assembler, times(1)).assemble(eq("PRICE_TRACK"), eq(7L), eq(taskIds)); verify(assembler, times(1)).assemble(eq("SHOP_DATA_CRAWL"), eq(7L), eq(taskIds)); + // 3E:这一对同时是「底座钩子真在被迁支用到」的生产侧证据——moduleType() 由本支交出, + // 而 progressLight 走的是自家 assembler,不是底座件,所以它证明的是钩子本身接对了。 + verify(assembler, times(1)).assemble(eq("DELETE_BRAND"), eq(7L), eq(taskIds)); } }