fix(长任务判死): 封口前增加「客户端仍在推进」豁免,避免还在采集就被结案丢数据

服务端二次判死线(心跳正常但 N 分钟无结果分片上报)只看分片间隔,客户端攒批回传一慢
就把仍在采集的任务判成卡死、封口结案,后续分片全被拒(生产 28919:1300 行只出 395 行,
丢 905 行)。改为封口前用 TaskHeartbeatPositionService 的位置快照判定客户端是否仍在推进:
ADVANCING(位置在变)→ 本轮不封口;STALLED(长时间不变)→ 按原判据;UNKNOWN(老客户端
无位置信息)→ 保留原行为。接入 similar-asin / appearance-patent / brand / delete-brand /
collect-data 五条判死线。
This commit is contained in:
2026-09-23 10:52:45 +08:00
parent 8d73377b25
commit afa45d51c3
16 changed files with 348 additions and 6 deletions
@@ -136,6 +136,7 @@ class CollectDataActivateGuardTest {
mock(InvalidAsinDataMapper.class),
mock(TaskChunkMapper.class), mock(TaskScopeStateMapper.class), mock(TaskResultItemMapper.class),
mock(TaskDistributedLockService.class), mock(TaskFileJobService.class),
mock(com.nanri.aiimage.modules.task.service.TaskHeartbeatPositionService.class),
mock(TransientPayloadStorageService.class),
mock(CollectDataExcelAssemblyService.class), mock(OssStorageService.class),
new ObjectMapper(), new TransactionTemplate(transactionManager),
@@ -104,7 +104,9 @@ class CollectDataDeleteConsistencyTest {
mock(com.nanri.aiimage.modules.collectdata.mapper.CollectDataCountryPrefMapper.class),
mock(com.nanri.aiimage.modules.invalidasin.mapper.InvalidAsinDataMapper.class),
taskChunkMapper, taskScopeStateMapper, taskResultItemMapper,
taskDistributedLockService, taskFileJobService, transientPayloadStorageService,
taskDistributedLockService, taskFileJobService,
mock(com.nanri.aiimage.modules.task.service.TaskHeartbeatPositionService.class),
transientPayloadStorageService,
mock(com.nanri.aiimage.modules.collectdata.service.CollectDataExcelAssemblyService.class),
mock(com.nanri.aiimage.modules.file.service.oss.OssStorageService.class),
objectMapper, txTemplate,
@@ -8,6 +8,7 @@ import com.nanri.aiimage.modules.task.model.dto.TaskScopeLastChunkDto;
import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity;
import com.nanri.aiimage.modules.task.service.TaskDistributedLockService;
import com.nanri.aiimage.modules.task.service.TaskFileJobService;
import com.nanri.aiimage.modules.task.service.TaskHeartbeatPositionService;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -45,6 +46,8 @@ class CollectDataNoUploadStaleTest {
@Mock private TaskScopeStateMapper taskScopeStateMapper;
@Mock private TaskDistributedLockService taskDistributedLockService;
@Mock private TaskFileJobService taskFileJobService;
/** 默认(Mockito 布尔默认值 false)= 不构成「客户端仍在推进」豁免,与原判据行为一致。 */
@Mock private TaskHeartbeatPositionService taskHeartbeatPositionService;
@Mock private TaskDistributedLockService.LockHandle lockHandle;
@Spy
@@ -103,7 +103,9 @@ class CollectDataStorageCallCountTest {
mock(com.nanri.aiimage.modules.collectdata.mapper.CollectDataCountryPrefMapper.class),
mock(com.nanri.aiimage.modules.invalidasin.mapper.InvalidAsinDataMapper.class),
taskChunkMapper, taskScopeStateMapper, taskResultItemMapper,
taskDistributedLockService, taskFileJobService, transientPayloadStorageService,
taskDistributedLockService, taskFileJobService,
mock(com.nanri.aiimage.modules.task.service.TaskHeartbeatPositionService.class),
transientPayloadStorageService,
mock(com.nanri.aiimage.modules.collectdata.service.CollectDataExcelAssemblyService.class),
mock(com.nanri.aiimage.modules.file.service.oss.OssStorageService.class),
objectMapper, txTemplate,