From 84f248fa6c51d2f294da6c5cdc334b55d3dd43d7 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 00:15:08 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E5=A4=96=E8=A7=82=E4=B8=93=E5=88=A9):=20?= =?UTF-8?q?=E5=85=9C=E5=BA=95=E5=BD=92=E5=B1=9E=E6=A0=A1=E9=AA=8C=E6=8E=A5?= =?UTF-8?q?=E8=BF=9B=20TaskFinalizeSupport=20=E5=87=BA=E5=8F=A3=E2=80=94?= =?UTF-8?q?=E2=80=94=E6=89=8B=E6=8A=84=E8=B0=93=E8=AF=8D=E6=A3=98=E8=BD=AE?= =?UTF-8?q?=E5=9B=9E=E8=90=BD=20130?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 上一枚 commit 的 fallbackAssembleResultFile 手抄了 2 处 「!MODULE_TYPE.equals(x.getModuleType())」,把 TaskLifecycleDebtRatchetTest 钉死的 130 推到 131。按棘轮注释的指路接公共出口: - TaskFinalizeSupport 新增 belongsToModule(expected, record) 静态出口 (expected 为 null 判不归属,防御守卫静默失效); - 兜底 2 处改走出口,净增 0,遍数回落 130; - 出口语义 3 例钉在 TaskFinalizeSupportTest。 --- .../service/AppearancePatentTaskService.java | 5 +-- .../task/service/TaskFinalizeSupport.java | 15 ++++++++ .../task/service/TaskFinalizeSupportTest.java | 35 +++++++++++++++++++ 3 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 backend-java/src/test/java/com/nanri/aiimage/modules/task/service/TaskFinalizeSupportTest.java diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentTaskService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentTaskService.java index 112320f52..cfe914cad 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentTaskService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentTaskService.java @@ -53,6 +53,7 @@ import com.nanri.aiimage.modules.task.model.entity.TaskProgressSnapshotEntity; import com.nanri.aiimage.modules.task.model.entity.TaskScopeStateEntity; 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.TaskHeartbeatPositionService; import com.nanri.aiimage.modules.task.service.TaskProgressSnapshotService; import com.nanri.aiimage.modules.task.service.TransientPayloadStorageService; @@ -1913,7 +1914,7 @@ public class AppearancePatentTaskService { } try { FileResultEntity result = fileResultMapper.selectById(job.getResultId()); - if (result == null || !MODULE_TYPE.equals(result.getModuleType())) { + if (result == null || !TaskFinalizeSupport.belongsToModule(MODULE_TYPE, result.getModuleType())) { log.warn("[appearance-patent] fallback assemble skipped because result record missing taskId={} resultId={}", job.getTaskId(), job.getResultId()); return false; @@ -1924,7 +1925,7 @@ public class AppearancePatentTaskService { return true; } FileTaskEntity task = fileTaskMapper.selectById(job.getTaskId()); - if (task == null || !MODULE_TYPE.equals(task.getModuleType())) { + if (task == null || !TaskFinalizeSupport.belongsToModule(MODULE_TYPE, task.getModuleType())) { log.warn("[appearance-patent] fallback assemble skipped because task missing taskId={} resultId={}", job.getTaskId(), job.getResultId()); return false; diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskFinalizeSupport.java b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskFinalizeSupport.java index b522646da..49f000590 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskFinalizeSupport.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskFinalizeSupport.java @@ -187,4 +187,19 @@ public final class TaskFinalizeSupport { } return lockHandle; } + + // ------------------------------------------------------------------ + // 模块归属谓词(2026-10-18 收口:TaskLifecycleDebtRatchetTest 棘轮只许降) + // ------------------------------------------------------------------ + + /** + * 「这一行是不是这个模块的」归属谓词出口。此前该判断在 16 个业务文件里手抄了 130 遍 + * ({@code !MODULE_TYPE.equals(x.getModuleType())}),棘轮只许降不许升——新增归属校验 + * 一律改走这里,漏一处的表现是某页检查静默变成「谁都能读」,不报错、不 403。 + * + * @return true 表示记录属于 expectedModuleType 模块(expected 为 null 视为不归属) + */ + public static boolean belongsToModule(String expectedModuleType, String recordModuleType) { + return expectedModuleType != null && expectedModuleType.equals(recordModuleType); + } } diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/task/service/TaskFinalizeSupportTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/task/service/TaskFinalizeSupportTest.java new file mode 100644 index 000000000..34a99b3f4 --- /dev/null +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/task/service/TaskFinalizeSupportTest.java @@ -0,0 +1,35 @@ +package com.nanri.aiimage.modules.task.service; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +/** + * 模块归属谓词出口的语义(2026-10-18,随 31302/31354 兜底收口补位)。 + * + *

TaskLifecycleDebtRatchetTest 钉的是「散在各页的手抄遍数只许降」;这里钉出口本身的行为: + * expected 为 null 视为不归属(防御空模块标识漏判成「谁都能读」)。 + */ +class TaskFinalizeSupportTest { + + @Test + void matchingModuleTypeBelongs() { + assertTrue(TaskFinalizeSupport.belongsToModule("APPEARANCE_PATENT", "APPEARANCE_PATENT"), + "模块标识一致即归属"); + } + + @Test + void mismatchedOrMissingRecordModuleTypeDoesNotBelong() { + assertFalse(TaskFinalizeSupport.belongsToModule("APPEARANCE_PATENT", "PRICE_TRACK"), + "模块标识不一致不归属"); + assertFalse(TaskFinalizeSupport.belongsToModule("APPEARANCE_PATENT", null), + "记录缺模块标识不归属"); + } + + @Test + void nullExpectedModuleTypeNeverOwnsAnything() { + assertFalse(TaskFinalizeSupport.belongsToModule(null, "APPEARANCE_PATENT"), + "期望标识为 null 不能判成归属——否则守卫静默失效"); + } +}