refactor(交付): 已交付判定的唯一出处搬回模块侧——底座不长新方法、复位改成摘行复用现成入队路
上一笔 847f8a22 的落点不对,这一笔把它改到位(行为等价、判据同向):
一、TaskFileJobService 回到 1233 行(−60)。可读棘轮把这支钉在 1240 行、规则是
按对象点名只许减,拿"再开一对 hasXxx/rearmXxx"往底座加方法是跟量具讨价还价。
该棘轮基线故意钉清单成员而非总数,正是防"A 加一条 B 减一条"整段绕过,所以
不动基线、只让改动落在该落的地方。
二、已交付判定搬进 AppearancePatentTaskService,并同时喂给恢复探针与「继续」复位
(deliveredAssembleJobs 一个出处)。这条同源不是洁癖:两处判的不是同一样东西时,
刚点过继续的任务会被探针当成已交付当场收尾——33228 的死胡同换个方向再演一遍。
读侧复用底座既有 findAssembleJobsByTaskIds(已按 jobType 过滤 ASSEMBLE_RESULT),
比 listJobs(status,module,task,limit) 稳:后者不过滤 jobType,等第二种作业出现
就会把别的 SUCCESS 误读成"表已出"。finalizer 因此新增一个 Predicate 注入位,
与它既有的 submissionComplete/persistedRowsPresent 同形。
三、复位从 UPDATE SUCCESS→PENDING 改为 deleteResultJobs 摘掉作业行。结果行
biz_file_result 与直链一行不动(读侧都取结果行),而 enqueueAssembleResult 在
existing==null 的分支里本就建 PENDING、按当前 owner 算 scope_key 并补发派发事件
——走现成那条路,不在底座之外再抄一遍派发形状(抄的那份迟早和 owner 对账那条分叉)。
判据:守卫 4 支改注入式谓词仍绿;DelegationTest 补 2 支钉住复位的两个方向——已交付→删对
resultId、RUNNING→一律不删(不许摘掉正在产出表的那支)。20 例 0 失败;快检四面绿
(overall=pass,档位=快检)。
This commit is contained in:
+39
@@ -22,6 +22,7 @@ import com.nanri.aiimage.modules.task.mapper.TaskChunkMapper;
|
||||
import com.nanri.aiimage.modules.task.mapper.TaskScopeStateMapper;
|
||||
import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity;
|
||||
import com.nanri.aiimage.modules.task.model.entity.TaskChunkEntity;
|
||||
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.TaskProgressLightAssembler;
|
||||
@@ -54,6 +55,7 @@ import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.anyString;
|
||||
import static org.mockito.Mockito.lenient;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
@@ -396,6 +398,43 @@ class AppearancePatentTaskServiceDelegationTest {
|
||||
assertEquals("A", AppearancePatentRowNormalizer.firstNonBlank(null, "A"));
|
||||
}
|
||||
|
||||
// ---------- 8 「继续」摘掉已交付的出表作业(33228 那类 spin 的复位半边) ----------
|
||||
|
||||
@Test
|
||||
void 继续必须摘掉已交付的出表作业让剩余行重排补检() {
|
||||
TaskFileJobEntity delivered = assembleJob(7777L, 6600L, "SUCCESS");
|
||||
when(taskFileJobService.findAssembleJobsByTaskIds(
|
||||
AppearancePatentTaskService.MODULE_TYPE, List.of(33228L)))
|
||||
.thenReturn(Map.of(33228L, delivered));
|
||||
|
||||
service.rearmDeliveredAssembleJobForResume(33228L);
|
||||
|
||||
// 只删作业行、不动结果行:下一轮 enqueueAssembleResult 走 existing==null 分支重建 PENDING 并补发派发事件
|
||||
verify(taskFileJobService).deleteResultJobs(33228L, AppearancePatentTaskService.MODULE_TYPE, 6600L);
|
||||
}
|
||||
|
||||
@Test
|
||||
void 继续不许摘掉正在产出表的出表作业() {
|
||||
when(taskFileJobService.findAssembleJobsByTaskIds(
|
||||
AppearancePatentTaskService.MODULE_TYPE, List.of(33228L)))
|
||||
.thenReturn(Map.of(33228L, assembleJob(7778L, 6600L, "RUNNING")));
|
||||
|
||||
service.rearmDeliveredAssembleJobForResume(33228L);
|
||||
|
||||
verify(taskFileJobService, never())
|
||||
.deleteResultJobs(any(), anyString(), any());
|
||||
}
|
||||
|
||||
private static TaskFileJobEntity assembleJob(Long jobId, Long resultId, String status) {
|
||||
TaskFileJobEntity job = new TaskFileJobEntity();
|
||||
job.setId(jobId);
|
||||
job.setTaskId(33228L);
|
||||
job.setModuleType(AppearancePatentTaskService.MODULE_TYPE);
|
||||
job.setResultId(resultId);
|
||||
job.setStatus(status);
|
||||
return job;
|
||||
}
|
||||
|
||||
// ---------- 私有门面反射调用 ----------
|
||||
|
||||
private void invokeWriteResultWorkbook(File out, AppearancePatentParsedRowVo row,
|
||||
|
||||
+5
-6
@@ -21,7 +21,6 @@ import java.util.function.Predicate;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
import static org.mockito.Mockito.lenient;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
/**
|
||||
@@ -36,7 +35,7 @@ import static org.mockito.Mockito.when;
|
||||
* 而紧随其后的 touch 又让陈旧扫描永远看不见这一行——既不失败也不完成。
|
||||
*
|
||||
* <p>反向同样要钉死:**刚点过「继续」的任务不能被这一格当成已交付直接收尾**,否则剩余行
|
||||
* 永远轮不到补检。这条靠 resume 复位那行 SUCCESS({@code rearmDeliveredAssembleJobForResume})
|
||||
* 永远轮不到补检。这条靠 resume 摘掉那行 SUCCESS({@code rearmDeliveredAssembleJobForResume})
|
||||
* 保证,所以这里断言的是"没有已交付作业时必须照常恢复"。
|
||||
*/
|
||||
@ExtendWith(MockitoExtension.class)
|
||||
@@ -70,11 +69,11 @@ class AppearancePatentStaleTaskFinalizerDeliveredGuardTest {
|
||||
when(fileTaskMapper.selectById(TASK_ID)).thenReturn(runningTask);
|
||||
when(taskFileJobService.countActiveAssembleJobs(TASK_ID, MODULE_TYPE)).thenReturn(activeAssembleJobs);
|
||||
when(taskFileJobService.hasExhaustedAssembleJob(TASK_ID, MODULE_TYPE)).thenReturn(false);
|
||||
// 这一格是短路求值(uploadComplete=false 或有在飞作业时根本不会问),严格 stub 会判多余
|
||||
lenient().when(taskFileJobService.hasDeliveredAssembleJob(TASK_ID, MODULE_TYPE)).thenReturn(delivered);
|
||||
|
||||
Predicate<Long> submissionComplete = taskId -> uploadComplete;
|
||||
Predicate<Long> persistedRowsPresent = taskId -> true;
|
||||
// 「是否已交付」由服务侧单一判定注入(恢复探针与「继续」复位共用它),本类不自行读底座
|
||||
Predicate<Long> deliveredAssembleJob = taskId -> delivered;
|
||||
Function<Long, Integer> markSubmissionComplete = taskId -> 1;
|
||||
Function<Long, List<TaskChunkEntity>> chunksLoader = taskId -> List.of();
|
||||
Function<List<TaskChunkEntity>, Integer> uninspectedRowCounter = chunks -> 10;
|
||||
@@ -83,8 +82,8 @@ class AppearancePatentStaleTaskFinalizerDeliveredGuardTest {
|
||||
BiConsumer<FileTaskEntity, String> finalizer = (task, error) -> finalized.set(true);
|
||||
|
||||
new AppearancePatentStaleTaskFinalizer(MODULE_TYPE, fileTaskMapper, taskFileJobService,
|
||||
task -> 154, submissionComplete, persistedRowsPresent, markSubmissionComplete,
|
||||
chunksLoader, uninspectedRowCounter, llmSubmitter, toucher, finalizer)
|
||||
task -> 154, submissionComplete, persistedRowsPresent, deliveredAssembleJob,
|
||||
markSubmissionComplete, chunksLoader, uninspectedRowCounter, llmSubmitter, toucher, finalizer)
|
||||
.finalizeStaleTask(TASK_ID, "有 10 行未完成检测,等待补检轮");
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user