From 83e9bbe71aaeb38705d343985c8f68d613b6520a Mon Sep 17 00:00:00 2001 From: zwork Date: Wed, 18 Nov 2026 14:04:51 +0800 Subject: [PATCH] =?UTF-8?q?fix(phase-5):=20AC-7=20=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E7=AB=AF=E5=8D=8A=E8=BE=B9=E2=80=94=E2=80=94=E4=BA=AC=E4=B8=9C?= =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E5=A4=B1=E8=B4=A5=E9=87=8D=E8=AF=95=E5=A4=8D?= =?UTF-8?q?=E4=BD=8D=20biz=5Fjd=5Fpublish=5Fitem=20=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E8=A1=8C=EF=BC=88v1.5=20=E8=93=9D=E5=9B=BE=20Phase=205=20?= =?UTF-8?q?=E6=B6=88=E6=AC=A0=E8=B4=A6=EF=BC=89=E2=80=94=E2=80=94=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=20TaskItemsResetSpi=EF=BC=88modules/task/spi=EF=BC=8C?= =?UTF-8?q?task=E4=BE=A7=E4=B8=8Dimport=E4=B8=9A=E5=8A=A1=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=EF=BC=8C=E4=BE=9D=E8=B5=96=E6=96=B9=E5=90=91=20jd?= =?UTF-8?q?=E2=86=92task=20=E4=B8=8E=20ClientTaskRetrySpi=20=E5=90=8C?= =?UTF-8?q?=E6=97=8F=EF=BC=89=EF=BC=8CTaskInPlaceRetryService=20=E5=9C=A8?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=A4=B4=20CAS=20=E5=A4=8D=E4=BD=8D=E6=88=90?= =?UTF-8?q?=E5=8A=9F=E5=90=8E=E6=8C=89=20moduleType=20=E8=B0=83=E7=94=A8?= =?UTF-8?q?=EF=BC=9BJdPublishTaskItemsResetSpiImpl=20=E6=8A=8A=20FAILED/PU?= =?UTF-8?q?BLISHING=20=E8=A1=8C=E5=A4=8D=E4=BD=8D=20PENDING=20=E5=B9=B6?= =?UTF-8?q?=E6=B8=85=E6=97=A7=20publish=5Ferror=EF=BC=8CSUCCESS=20?= =?UTF-8?q?=E8=A1=8C=E4=B8=8D=E5=8A=A8=EF=BC=88AC-4=20=E5=B7=B2=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E4=B8=8D=E9=87=8D=E5=8F=91=EF=BC=8C=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E7=AB=AF=E6=96=AD=E7=82=B9=20done=20=E5=90=8C=E5=8F=A3?= =?UTF-8?q?=E5=BE=84=EF=BC=89=EF=BC=9B=E5=88=BB=E6=84=8F=E4=B8=8D=E5=90=9E?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=EF=BC=88=E5=8D=8A=E6=88=AA=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=BA=AA=E5=BE=8B=E4=B8=8E=20clearDeliveredResultUrl=20?= =?UTF-8?q?=E5=90=8C=E4=B8=80=EF=BC=89=EF=BC=9B=E5=88=A4=E6=8D=AE=EF=BC=9A?= =?UTF-8?q?JdPublishTaskItemsResetSpiImplTest=202=EF=BC=88wrapper=20?= =?UTF-8?q?=E5=BD=A2=E7=8A=B6=E6=8E=A2=E9=92=88=EF=BC=9A=E8=A1=8C=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E8=B0=93=E8=AF=8D=E5=8F=AA=E8=AE=A4=20FAILED/PUBLISHI?= =?UTF-8?q?NG=E3=80=81publish=5Ferror=20=E6=B8=85=20NULL=EF=BC=89=EF=BC=8B?= =?UTF-8?q?TaskInPlaceRetryServiceTest=20+4=EF=BC=88=E5=A4=8D=E4=BD=8D?= =?UTF-8?q?=E8=A2=AB=E8=B0=83/=E6=97=A0=E5=8C=B9=E9=85=8D=E8=B7=B3?= =?UTF-8?q?=E8=BF=87/CAS=E5=A4=B1=E8=B4=A5=E4=B8=8D=E7=A2=B0=E6=98=8E?= =?UTF-8?q?=E7=BB=86/=E5=A4=8D=E4=BD=8D=E5=A4=B1=E8=B4=A5=E5=93=8D?= =?UTF-8?q?=E4=BA=AE=E4=BC=A0=E6=92=AD=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../JdPublishTaskItemsResetSpiImpl.java | 50 +++++++++++ .../task/service/TaskInPlaceRetryService.java | 23 +++++ .../modules/task/spi/TaskItemsResetSpi.java | 30 +++++++ .../JdPublishTaskItemsResetSpiImplTest.java | 73 ++++++++++++++++ .../service/TaskInPlaceRetryServiceTest.java | 83 ++++++++++++++++++- 5 files changed, 258 insertions(+), 1 deletion(-) create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdPublishTaskItemsResetSpiImpl.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/task/spi/TaskItemsResetSpi.java create mode 100644 backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdPublishTaskItemsResetSpiImplTest.java diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdPublishTaskItemsResetSpiImpl.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdPublishTaskItemsResetSpiImpl.java new file mode 100644 index 000000000..6d7b5dd54 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdPublishTaskItemsResetSpiImpl.java @@ -0,0 +1,50 @@ +package com.nanri.aiimage.modules.jd.service; + +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.nanri.aiimage.modules.jd.mapper.JdPublishItemMapper; +import com.nanri.aiimage.modules.jd.model.entity.JdPublishItemEntity; +import com.nanri.aiimage.modules.task.spi.TaskItemsResetSpi; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.time.LocalDateTime; + +/** + * 京东商品上架的失败重试明细行复位(AC-7 服务端半边,v1.5 Phase 5 消欠账)。 + * + *

任务头被 {@code TaskInPlaceRetryService} 原地复位成 PENDING 后,明细分批下发 + * {@code JdPublishItemMapper.selectPublishableItems} 只出 PENDING 行——上一代留下的 + * FAILED/PUBLISHING 行不复位,重试就是空页空跑(蓝图 Phase 2 变更记录登记的欠账)。 + * 本实现把 FAILED/PUBLISHING 行复位回 PENDING 并清旧错误文案,让剩余商品重新进入 + * 下发候选;SUCCESS 行不动:已发布商品不重发(AC-4),客户端断点 done 集合同口径。 + * + *

{@code jd_ware_id} 不清:只有 SUCCESS 行才有值,本条不碰 SUCCESS 行; + * 旧 {@code publish_error} 必须清——留着会让用户端面板把「上一代的失败原因」 + * 显示在「待发布」行上(进度真源是行级状态聚合,JdPublishBoardService 同源)。 + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class JdPublishTaskItemsResetSpiImpl implements TaskItemsResetSpi { + + private final JdPublishItemMapper jdPublishItemMapper; + + @Override + public String moduleType() { + return JdPublishTaskService.MODULE_TYPE; + } + + @Override + public void resetForRetry(Long taskId) { + LocalDateTime now = LocalDateTime.now(); + int updated = jdPublishItemMapper.update(null, new LambdaUpdateWrapper() + .eq(JdPublishItemEntity::getTaskId, taskId) + .in(JdPublishItemEntity::getPublishStatus, + JdPublishTaskService.ITEM_FAILED, JdPublishTaskService.ITEM_PUBLISHING) + .set(JdPublishItemEntity::getPublishStatus, JdPublishTaskService.ITEM_PENDING) + .set(JdPublishItemEntity::getPublishError, null) + .set(JdPublishItemEntity::getUpdatedAt, now)); + log.info("[jd-publish][retry] 明细行已复位可续跑 taskId={} reset={}", taskId, updated); + } +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskInPlaceRetryService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskInPlaceRetryService.java index 1596e817c..af021ef10 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskInPlaceRetryService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskInPlaceRetryService.java @@ -11,11 +11,13 @@ 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.TaskChunkEntity; import com.nanri.aiimage.modules.task.model.entity.TaskFileJobEntity; +import com.nanri.aiimage.modules.task.spi.TaskItemsResetSpi; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import java.time.LocalDateTime; +import java.util.List; import com.nanri.aiimage.modules.task.service.support.TaskFailureLedger; /** @@ -64,6 +66,7 @@ public class TaskInPlaceRetryService { private final TaskFileJobService taskFileJobService; private final TaskFileJobMapper taskFileJobMapper; private final ResultFileJobHandlerRegistry resultFileJobHandlers; + private final List itemsResetSpis; /** * 把一条失败/已中断任务复位成待执行。幂等:只有当前状态确实是 FAILED/CANCELLED 才动作。 @@ -105,6 +108,9 @@ public class TaskInPlaceRetryService { log.info("[task-retry] 状态已不是 FAILED/CANCELLED,跳过复位 taskId={}", task.getId()); return false; } + // 模块侧明细行复位(AC-7 服务端半边):不复位则重试后的明细分批下发是空页、任务空跑。 + // 无匹配实现=该模块没有模块侧明细行,什么也不做。 + resetModuleItems(task.getId(), task.getModuleType()); // 形状 (a) 与中断代共用这一段:失败代也要清直链(B96-08 第 1 条修法)。 // 旧写法只给中断代清、失败代留直链(本意「上一份可能已经可用」),叠上交付闸 // 「直链非空即跳过」就成了恒定空转:作业复位后 2 秒又被标回 SUCCESS,新一代永远组装不了。 @@ -216,6 +222,23 @@ public class TaskInPlaceRetryService { } } + /** + * 模块侧明细行复位(AC-7 服务端半边):京东上架的行级真源在 biz_jd_publish_item, + * 上一代的 FAILED/PUBLISHING 行不复位,重试后的明细分批下发(只出 PENDING 行)就是 + * 空页、任务空跑。无匹配实现=该模块没有模块侧明细行可复位,直接跳过。 + * + *

刻意不吞异常(静默 catch 台账只许减):复位失败会留下「任务已 PENDING、明细没跟上」 + * 的半截状态,与 {@link #clearDeliveredResultUrl} 同一纪律——响亮失败让用户当场看到, + * 不做半截继续。 + */ + private void resetModuleItems(Long taskId, String moduleType) { + for (TaskItemsResetSpi spi : itemsResetSpis) { + if (moduleType.equals(spi.moduleType())) { + spi.resetForRetry(taskId); + return; + } + } + } /** 结果行只清错误文案:直链由 {@link #clearDeliveredResultUrl} 在复位前单独清(B96-08)。 */ private void clearResultError(Long taskId, String moduleType) { try { diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/task/spi/TaskItemsResetSpi.java b/backend-java/src/main/java/com/nanri/aiimage/modules/task/spi/TaskItemsResetSpi.java new file mode 100644 index 000000000..5888aca94 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/task/spi/TaskItemsResetSpi.java @@ -0,0 +1,30 @@ +package com.nanri.aiimage.modules.task.spi; + +/** + * 失败/中断任务「在原任务上重试」的模块侧明细行复位扩展点(AC-7 服务端半边)。 + * + *

背景:京东上架(JD_PUBLISH)的行级真源在 {@code biz_jd_publish_item}(V210), + * 任务头被 {@code TaskInPlaceRetryService} 原地复位成 PENDING 后,明细分批下发 + * {@code selectPublishableItems} 只出 PENDING 行——上一代留下的 FAILED/PUBLISHING 行 + * 不复位,重试后的下发就是空页、任务空跑到判死(v1.5 蓝图 Phase 2 变更记录登记的欠账)。 + * + *

各模块按需实现本接口,Spring 装配后由 {@code TaskInPlaceRetryService} 在任务头 CAS + * 复位成功后按 {@code moduleType} 建索引调用。task 侧不 import 业务模块(task→业务依赖 + * 钉死为 0,{@code ArchitectureBoundaryTest} 同口径),与 {@link ClientTaskRetrySpi} 同族 + * 但语义相反:那个是「克隆新任务」的旧路(外观专利等解析载荷可整体复制的模块), + * 这个是「原地续跑」——失败任务重试不克隆(2026-11-01 铁律 26)。 + */ +public interface TaskItemsResetSpi { + + /** 本实现负责的 moduleType(与 biz_file_task.module_type 一致)。 */ + String moduleType(); + + /** + * 把该任务在模块侧的明细行复位成可续跑态。 + * + *

仅在任务头 CAS 复位成功后被调用;失败不得吞异常——吞掉会留下 + * 「任务已 PENDING、明细还是旧状态」的半截状态,用户重按也修不回来 + * (状态闸会拒「只有失败或已中断的任务可以继续」),宁可当场响亮失败。 + */ + void resetForRetry(Long taskId); +} diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdPublishTaskItemsResetSpiImplTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdPublishTaskItemsResetSpiImplTest.java new file mode 100644 index 000000000..50abf8889 --- /dev/null +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdPublishTaskItemsResetSpiImplTest.java @@ -0,0 +1,73 @@ +package com.nanri.aiimage.modules.jd.service; + +import com.baomidou.mybatisplus.core.MybatisConfiguration; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.metadata.TableInfoHelper; +import com.nanri.aiimage.modules.jd.mapper.JdPublishItemMapper; +import com.nanri.aiimage.modules.jd.model.entity.JdPublishItemEntity; +import com.nanri.aiimage.testutil.UpdateWrapperProbe; +import org.apache.ibatis.builder.MapperBuilderAssistant; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.mockito.ArgumentCaptor; + +import java.util.Map; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.isNull; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +/** + * AC-7 服务端半边(v1.5 Phase 5 消欠账):京东上架失败任务「重试」时, + * {@code biz_jd_publish_item} 的 FAILED/PUBLISHING 行必须复位回 PENDING 并清旧错误文案。 + * + *

不复位的后果(蓝图 Phase 2 变更记录登记):任务头复位成 PENDING 后, + * 明细分批下发 {@code selectPublishableItems} 只出 PENDING 行——重试就是空页空跑, + * 任务等满 stale 窗口再被判死一次。SUCCESS 行不动(已发布商品不重发,AC-4)。 + */ +class JdPublishTaskItemsResetSpiImplTest { + + @BeforeAll + static void initMybatisPlusTableInfo() { + TableInfoHelper.initTableInfo(new MapperBuilderAssistant(new MybatisConfiguration(), ""), + JdPublishItemEntity.class); + } + + @Test + void moduleType与建单模块一致() { + assertEquals("JD_PUBLISH", + new JdPublishTaskItemsResetSpiImpl(mock(JdPublishItemMapper.class)).moduleType()); + } + + @Test + void 复位只圈FAILED与PUBLISHING行_清旧错误文案_不碰SUCCESS() { + JdPublishItemMapper mapper = mock(JdPublishItemMapper.class); + when(mapper.update(isNull(), any())).thenReturn(3); + + new JdPublishTaskItemsResetSpiImpl(mapper).resetForRetry(34567L); + + @SuppressWarnings("unchecked") + ArgumentCaptor> captor = + ArgumentCaptor.forClass(LambdaUpdateWrapper.class); + verify(mapper).update(isNull(), captor.capture()); + LambdaUpdateWrapper wrapper = captor.getValue(); + + Map sets = UpdateWrapperProbe.setValues(wrapper); + assertEquals("PENDING", sets.get("publish_status"), "复位目标态必须是 PENDING(下发只出 PENDING 行)"); + assertTrue(sets.containsKey("publish_error"), "旧失败文案必须清"); + assertNull(sets.get("publish_error"), "旧失败文案清成 NULL,不留给待发布行"); + assertTrue(sets.containsKey("updated_at"), "行级 updated_at 随复位推进"); + + // WHERE:按任务圈行;行状态谓词只认 FAILED/PUBLISHING——SUCCESS 行是已发布商品,不重发(AC-4) + assertEquals(34567L, UpdateWrapperProbe.whereEq(wrapper).get("task_id")); + Map params = UpdateWrapperProbe.paramNameValuePairs(wrapper); + assertTrue(params.containsValue("FAILED"), "行状态谓词必须含 FAILED"); + assertTrue(params.containsValue("PUBLISHING"), "行状态谓词必须含 PUBLISHING(中断遗留行)"); + assertTrue(params.containsValue("PENDING"), "复位目标值在参数册"); + } +} diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/task/service/TaskInPlaceRetryServiceTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/task/service/TaskInPlaceRetryServiceTest.java index 84caa3b71..b87381d28 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/task/service/TaskInPlaceRetryServiceTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/task/service/TaskInPlaceRetryServiceTest.java @@ -12,6 +12,7 @@ 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.TaskChunkEntity; import com.nanri.aiimage.modules.task.model.entity.TaskFileJobEntity; +import com.nanri.aiimage.modules.task.spi.TaskItemsResetSpi; import org.apache.ibatis.builder.MapperBuilderAssistant; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -83,7 +84,16 @@ class TaskInPlaceRetryServiceTest { TaskChunkMapper chunks, TaskFileJobService jobs, TaskFileJobMapper jobMapper, ResultFileJobHandlerRegistry registry) { - return new TaskInPlaceRetryService(mapper, results, chunks, jobs, jobMapper, registry); + return service(mapper, results, chunks, jobs, jobMapper, registry, java.util.List.of()); + } + + /** AC-7 服务端半边:模块侧明细行复位 SPI(京东上架 JD_PUBLISH)。 */ + private static TaskInPlaceRetryService service(FileTaskMapper mapper, FileResultMapper results, + TaskChunkMapper chunks, TaskFileJobService jobs, + TaskFileJobMapper jobMapper, + ResultFileJobHandlerRegistry registry, + java.util.List itemsResetSpis) { + return new TaskInPlaceRetryService(mapper, results, chunks, jobs, jobMapper, registry, itemsResetSpis); } @Test @@ -118,6 +128,77 @@ class TaskInPlaceRetryServiceTest { assertFalse(ok); verify(jobs, never()).resetTerminalFailedForRecovery(anyLong(), any(), anyLong()); } + // ---- AC-7 服务端半边(v1.5 Phase 5):模块侧明细行随任务头一并复位 ---- + + @Test + void 京东上架重试必须复位模块侧明细行() { + FileTaskMapper mapper = mock(FileTaskMapper.class); + FileResultMapper results = mock(FileResultMapper.class); + TaskFileJobService jobs = mock(TaskFileJobService.class); + when(mapper.update(isNull(), any())).thenReturn(1); + TaskItemsResetSpi jdSpi = mock(TaskItemsResetSpi.class); + when(jdSpi.moduleType()).thenReturn("JD_PUBLISH"); + FileTaskEntity task = failedTask(); + task.setModuleType("JD_PUBLISH"); + + service(mapper, results, mock(TaskChunkMapper.class), jobs, + mock(TaskFileJobMapper.class), mock(ResultFileJobHandlerRegistry.class), + java.util.List.of(jdSpi)).retryInPlace(task); + + // 明细行随任务头一起回到 PENDING,否则重试后的明细分批下发(只出 PENDING 行)是空页空跑 + verify(jdSpi).resetForRetry(eq(32967L)); + } + + @Test + void 任务头复位失败时不碰模块明细行() { + FileTaskMapper mapper = mock(FileTaskMapper.class); + FileResultMapper results = mock(FileResultMapper.class); + TaskFileJobService jobs = mock(TaskFileJobService.class); + when(mapper.update(isNull(), any())).thenReturn(0); + TaskItemsResetSpi jdSpi = mock(TaskItemsResetSpi.class); + when(jdSpi.moduleType()).thenReturn("JD_PUBLISH"); + + service(mapper, results, mock(TaskChunkMapper.class), jobs, + mock(TaskFileJobMapper.class), mock(ResultFileJobHandlerRegistry.class), + java.util.List.of(jdSpi)).retryInPlace(failedTask()); + + verify(jdSpi, never()).resetForRetry(anyLong()); + } + + @Test + void 无匹配模块的明细复位直接跳过() { + FileTaskMapper mapper = mock(FileTaskMapper.class); + FileResultMapper results = mock(FileResultMapper.class); + TaskFileJobService jobs = mock(TaskFileJobService.class); + when(mapper.update(isNull(), any())).thenReturn(1); + TaskItemsResetSpi jdSpi = mock(TaskItemsResetSpi.class); + when(jdSpi.moduleType()).thenReturn("JD_PUBLISH"); + + service(mapper, results, mock(TaskChunkMapper.class), jobs, + mock(TaskFileJobMapper.class), mock(ResultFileJobHandlerRegistry.class), + java.util.List.of(jdSpi)).retryInPlace(failedTask()); + + verify(jdSpi, never()).resetForRetry(anyLong()); + } + + @Test + void 明细复位失败必须响亮失败不留半截状态() { + FileTaskMapper mapper = mock(FileTaskMapper.class); + FileResultMapper results = mock(FileResultMapper.class); + TaskFileJobService jobs = mock(TaskFileJobService.class); + when(mapper.update(isNull(), any())).thenReturn(1); + TaskItemsResetSpi jdSpi = mock(TaskItemsResetSpi.class); + when(jdSpi.moduleType()).thenReturn("JD_PUBLISH"); + org.mockito.Mockito.doThrow(new IllegalStateException("reset failed")) + .when(jdSpi).resetForRetry(anyLong()); + FileTaskEntity task = failedTask(); + task.setModuleType("JD_PUBLISH"); + + // 吞掉会留下「任务已 PENDING、明细没跟上」的半截状态,用户重按也修不回来 + assertThrows(IllegalStateException.class, () -> service(mapper, results, + mock(TaskChunkMapper.class), jobs, mock(TaskFileJobMapper.class), + mock(ResultFileJobHandlerRegistry.class), java.util.List.of(jdSpi)).retryInPlace(task)); + } // ---- 「继续」(2026-11-03):已中断任务在原任务上复位 ----