feat(任务判死): 心跳正常但 180 分钟无结果上报的二次判死线(13 模块)+ 同期待发改动

判死线(治 28131 型「主线程卡死、心跳线程照发」):
- 判据改看 biz_task_scope_state.last_chunk_at(HTTP 心跳不刷新它);从未上报跳过不判
- 中央线覆盖 DELETE_BRAND/PRODUCT_RISK_RESOLVE/PRICE_TRACK/SHOP_MATCH/PATROL_DELETE/QUERY_ASIN/WITHDRAW
- 自带线接入 COLLECT_DATA/SIMILAR_ASIN/APPEARANCE_PATENT/SHOP_DATA_CRAWL/PUBLISH/BRAND
- 客户端心跳带处理位置 progressText,判死文案含最后位置;no-result-upload-timeout-minutes 默认 180(0 关闭)

同期带上另一工作流的待发改动:跟价换 IP 重试、品牌检测重试上限与 LLM 并发下调、
教程包后台管理页与 V126 迁移、admin-vue 教程记录页。
This commit is contained in:
2026-09-14 17:56:20 +08:00
parent b2b9983b07
commit 792b5f8bce
36 changed files with 1538 additions and 57 deletions
@@ -0,0 +1,143 @@
package com.nanri.aiimage.modules.collectdata.service;
import com.nanri.aiimage.modules.task.mapper.FileResultMapper;
import com.nanri.aiimage.modules.task.mapper.FileTaskMapper;
import com.nanri.aiimage.modules.task.mapper.TaskChunkMapper;
import com.nanri.aiimage.modules.task.mapper.TaskScopeStateMapper;
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 org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.ArgumentCaptor;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.test.util.ReflectionTestUtils;
import java.time.LocalDateTime;
import java.util.List;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
/**
* collect-data 二次判死线(心跳正常但连续 N 分钟无结果分片上报)。
*
* <p>既有心跳线候选条件是 updated_at 陈旧(心跳线),而 Python 心跳线程在主线程卡死时照发——
* 任务永远命不中。本线候选取「心跳新鲜 + 创建超过 N 分钟」,判据用
* biz_task_scope_state.last_chunk_at(仅分片上传时刷新);从未上报(无 scope 行)跳过。
*/
@ExtendWith(MockitoExtension.class)
class CollectDataNoUploadStaleTest {
@Mock private FileTaskMapper fileTaskMapper;
@Mock private FileResultMapper fileResultMapper;
@Mock private TaskChunkMapper taskChunkMapper;
@Mock private TaskScopeStateMapper taskScopeStateMapper;
@Mock private TaskDistributedLockService taskDistributedLockService;
@Mock private TaskFileJobService taskFileJobService;
@Mock private TaskDistributedLockService.LockHandle lockHandle;
@Spy
private com.fasterxml.jackson.databind.ObjectMapper objectMapper = new com.fasterxml.jackson.databind.ObjectMapper();
@InjectMocks
private CollectDataService service;
@BeforeEach
void setUp() {
ReflectionTestUtils.setField(service, "staleTimeoutMinutes", 30L);
ReflectionTestUtils.setField(service, "noResultUploadTimeoutMinutes", 180L);
ReflectionTestUtils.setField(service, "progressThrottleMillis", 0L);
ReflectionTestUtils.setField(service, "progressDirtyWindowMillis", 0L);
}
private FileTaskEntity runningTask(long id) {
FileTaskEntity task = new FileTaskEntity();
task.setId(id);
task.setModuleType("COLLECT_DATA");
task.setStatus("RUNNING");
task.setCreatedAt(LocalDateTime.now().minusDays(1));
task.setUpdatedAt(LocalDateTime.now().minusMinutes(1));
return task;
}
private void invokeNoUpload() {
ReflectionTestUtils.invokeMethod(service, "finalizeNoUploadStaleTasks",
LocalDateTime.now().minusMinutes(30));
}
@Test
void 上报仍新鲜时不判死() {
when(fileTaskMapper.selectList(any())).thenReturn(List.of(runningTask(1L)));
when(taskScopeStateMapper.selectLastChunkAtByTaskIds(any()))
.thenReturn(List.of(new TaskScopeLastChunkDto(1L, LocalDateTime.now().minusMinutes(5))));
invokeNoUpload();
verify(taskDistributedLockService, never()).acquire(any(), anyLong(), anyLong());
verify(fileTaskMapper, never()).updateById(any());
}
@Test
void 从未上报时跳过() {
when(fileTaskMapper.selectList(any())).thenReturn(List.of(runningTask(2L)));
when(taskScopeStateMapper.selectLastChunkAtByTaskIds(any())).thenReturn(List.of());
invokeNoUpload();
verify(taskDistributedLockService, never()).acquire(any(), anyLong(), anyLong());
verify(fileTaskMapper, never()).updateById(any());
}
@Test
void 开关为0时不扫描() {
ReflectionTestUtils.setField(service, "noResultUploadTimeoutMinutes", 0L);
invokeNoUpload();
verify(fileTaskMapper, never()).selectList(any());
}
@Test
void 任务锁忙时跳过() {
when(fileTaskMapper.selectList(any())).thenReturn(List.of(runningTask(3L)));
when(taskScopeStateMapper.selectLastChunkAtByTaskIds(any()))
.thenReturn(List.of(new TaskScopeLastChunkDto(3L, LocalDateTime.now().minusHours(4))));
when(taskDistributedLockService.acquire(any(), anyLong(), anyLong())).thenReturn(null);
invokeNoUpload();
verify(fileTaskMapper, never()).updateById(any());
}
@Test
void 心跳正常但上报超时触发判死() {
FileTaskEntity task = runningTask(5L);
when(fileTaskMapper.selectList(any())).thenReturn(List.of(task));
when(taskScopeStateMapper.selectLastChunkAtByTaskIds(any()))
.thenReturn(List.of(new TaskScopeLastChunkDto(5L, LocalDateTime.now().minusHours(4))));
when(taskDistributedLockService.acquire(any(), anyLong(), anyLong())).thenReturn(lockHandle);
when(fileTaskMapper.selectById(5L)).thenReturn(task);
when(taskFileJobService.countUnfinishedAssembleJobs(5L, "COLLECT_DATA")).thenReturn(0L);
when(taskChunkMapper.selectCount(any())).thenReturn(0L);
when(fileResultMapper.selectOne(any())).thenReturn(null);
invokeNoUpload();
ArgumentCaptor<FileTaskEntity> taskCaptor = ArgumentCaptor.forClass(FileTaskEntity.class);
verify(fileTaskMapper).updateById(taskCaptor.capture());
assertEquals("FAILED", taskCaptor.getValue().getStatus());
assertTrue(taskCaptor.getValue().getErrorMessage().contains("无结果回传"),
taskCaptor.getValue().getErrorMessage());
}
}