fix(外观专利): 兜底归属校验接进 TaskFinalizeSupport 出口——手抄谓词棘轮回落 130
上一枚 commit 的 fallbackAssembleResultFile 手抄了 2 处 「!MODULE_TYPE.equals(x.getModuleType())」,把 TaskLifecycleDebtRatchetTest 钉死的 130 推到 131。按棘轮注释的指路接公共出口: - TaskFinalizeSupport 新增 belongsToModule(expected, record) 静态出口 (expected 为 null 判不归属,防御守卫静默失效); - 兜底 2 处改走出口,净增 0,遍数回落 130; - 出口语义 3 例钉在 TaskFinalizeSupportTest。
This commit is contained in:
+3
-2
@@ -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;
|
||||
|
||||
+15
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
+35
@@ -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 兜底收口补位)。
|
||||
*
|
||||
* <p>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 不能判成归属——否则守卫静默失效");
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user