新需求更新 同步更新

This commit is contained in:
supernijia
2026-08-06 01:11:54 +08:00
parent 28423e015b
commit 40f4fae272
112 changed files with 7739 additions and 637 deletions
@@ -0,0 +1,37 @@
package com.nanri.aiimage.modules.collectdata.service;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.nanri.aiimage.modules.collectdata.model.dto.CollectDataSummaryRowDto;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.ss.usermodel.WorkbookFactory;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import java.io.File;
import java.nio.file.Path;
import java.util.List;
import static org.assertj.core.api.Assertions.assertThat;
class CollectDataExcelAssemblyServiceTest {
@TempDir
Path tempDir;
@Test
void writesAsinFilterToSummarySheet() throws Exception {
CollectDataSummaryRowDto summary = new ObjectMapper().readValue(
"{\"keyword\":\"phone case\",\"asinFilter\":3}",
CollectDataSummaryRowDto.class);
File output = tempDir.resolve("collect-data-result.xlsx").toFile();
new CollectDataExcelAssemblyService().writeWorkbook(output, List.of(), List.of(summary), List.of());
try (Workbook workbook = WorkbookFactory.create(output)) {
Sheet sheet = workbook.getSheet("结果文件");
assertThat(sheet.getRow(0).getCell(6).getStringCellValue()).isEqualTo("ASIN过滤");
assertThat(sheet.getRow(1).getCell(6).getNumericCellValue()).isEqualTo(3);
}
}
}
@@ -0,0 +1,196 @@
package com.nanri.aiimage.modules.collectdata.service;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.nanri.aiimage.modules.collectdata.model.vo.CollectDataDashboardVo;
import com.nanri.aiimage.modules.collectdata.model.vo.CollectDataTaskBatchVo;
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.model.entity.FileResultEntity;
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.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.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
class CollectDataServiceTest {
@Mock
private FileTaskMapper fileTaskMapper;
@Mock
private FileResultMapper fileResultMapper;
@Mock
private TaskChunkMapper taskChunkMapper;
@Mock
private TaskDistributedLockService taskDistributedLockService;
@Mock
private TaskFileJobService taskFileJobService;
@Mock
private TaskDistributedLockService.LockHandle lockHandle;
@Spy
private ObjectMapper objectMapper = new ObjectMapper();
@InjectMocks
private CollectDataService service;
@BeforeEach
void setUp() {
ReflectionTestUtils.setField(service, "staleTimeoutMinutes", 30L);
}
@Test
void dashboardCountsPendingAndRunningTasksAsActive() {
when(fileTaskMapper.selectCount(any())).thenReturn(5L, 3L, 2L);
CollectDataDashboardVo dashboard = service.dashboard(7L);
assertThat(dashboard.getPendingTaskCount()).isEqualTo(5L);
assertThat(dashboard.getSuccessTaskCount()).isEqualTo(3L);
assertThat(dashboard.getFailedTaskCount()).isEqualTo(2L);
assertThat(dashboard.getProcessedTaskCount()).isEqualTo(5L);
}
@Test
void progressBatchExposesProcessedKeywordProgress() {
FileTaskEntity task = new FileTaskEntity();
task.setId(91L);
task.setTaskNo("COLLECT_DATA-91");
task.setModuleType(CollectDataService.MODULE_TYPE);
task.setStatus("RUNNING");
task.setCreatedAt(LocalDateTime.of(2026, 8, 1, 10, 0));
task.setResultJson("{\"totalRows\":10,\"receivedRows\":24,\"processedRows\":4}");
FileResultEntity result = new FileResultEntity();
result.setId(101L);
result.setTaskId(task.getId());
result.setModuleType(CollectDataService.MODULE_TYPE);
result.setRowCount(10);
result.setCreatedAt(LocalDateTime.of(2026, 8, 1, 10, 0));
when(fileTaskMapper.selectList(any())).thenReturn(List.of(task));
when(fileResultMapper.selectList(any())).thenReturn(List.of(result));
CollectDataTaskBatchVo progress = service.progressBatch(List.of(task.getId()));
assertThat(progress.getItems()).hasSize(1);
assertThat(progress.getItems().getFirst().getItems()).hasSize(1);
assertThat(progress.getItems().getFirst().getItems().getFirst().getTotalRows()).isEqualTo(10);
assertThat(progress.getItems().getFirst().getItems().getFirst().getReceivedRows()).isEqualTo(24);
assertThat(progress.getItems().getFirst().getItems().getFirst().getProcessedRows()).isEqualTo(4);
assertThat(progress.getItems().getFirst().getItems().getFirst().getProgressPercent()).isEqualTo(40);
}
@Test
void failTaskMarksAnActivatedTaskAsFailed() {
FileTaskEntity task = new FileTaskEntity();
task.setId(92L);
task.setUserId(7L);
task.setModuleType(CollectDataService.MODULE_TYPE);
task.setStatus("RUNNING");
task.setResultJson("{\"totalRows\":10,\"receivedRows\":4}");
FileResultEntity result = new FileResultEntity();
result.setId(102L);
result.setTaskId(task.getId());
result.setModuleType(CollectDataService.MODULE_TYPE);
when(fileTaskMapper.selectById(task.getId())).thenReturn(task);
when(fileResultMapper.selectOne(any())).thenReturn(result);
service.failTask(task.getId(), task.getUserId(), "queue unavailable");
assertThat(task.getStatus()).isEqualTo("FAILED");
assertThat(task.getErrorMessage()).isEqualTo("queue unavailable");
assertThat(result.getSuccess()).isZero();
assertThat(result.getErrorMessage()).isEqualTo("queue unavailable");
verify(fileResultMapper).updateById(result);
verify(fileTaskMapper).updateById(task);
}
@Test
void staleTaskWithResultChunksEnqueuesPartialWorkbook() throws Exception {
FileTaskEntity task = staleTask(93L);
task.setResultJson("{\"finalRowCount\":343}");
FileResultEntity result = taskResult(task, 103L);
when(fileTaskMapper.selectList(any())).thenReturn(List.of(task));
when(taskDistributedLockService.acquire(CollectDataService.MODULE_TYPE, task.getId(), 0L))
.thenReturn(lockHandle);
when(fileTaskMapper.selectById(task.getId())).thenReturn(task);
when(taskFileJobService.countUnfinishedAssembleJobs(task.getId(), CollectDataService.MODULE_TYPE))
.thenReturn(0L);
when(fileResultMapper.selectOne(any())).thenReturn(result);
when(taskChunkMapper.selectCount(any())).thenReturn(170L);
service.finalizeStaleTasks();
verify(taskFileJobService).enqueueAssembleResult(
task.getId(), CollectDataService.MODULE_TYPE, result.getId(), "task:" + task.getId());
assertThat(task.getStatus()).isEqualTo("RUNNING");
assertThat(result.getRowCount()).isEqualTo(343);
verify(lockHandle).close();
}
@Test
void staleTaskWithoutResultChunksFails() throws Exception {
FileTaskEntity task = staleTask(94L);
task.setResultJson("{\"finalRowCount\":0}");
FileResultEntity result = taskResult(task, 104L);
when(fileTaskMapper.selectList(any())).thenReturn(List.of(task));
when(taskDistributedLockService.acquire(CollectDataService.MODULE_TYPE, task.getId(), 0L))
.thenReturn(lockHandle);
when(fileTaskMapper.selectById(task.getId())).thenReturn(task);
when(taskFileJobService.countUnfinishedAssembleJobs(task.getId(), CollectDataService.MODULE_TYPE))
.thenReturn(0L);
when(fileResultMapper.selectOne(any())).thenReturn(result);
when(taskChunkMapper.selectCount(any())).thenReturn(0L);
service.finalizeStaleTasks();
assertThat(task.getStatus()).isEqualTo("FAILED");
assertThat(task.getErrorMessage()).contains("Python 心跳");
verify(taskFileJobService, never()).enqueueAssembleResult(any(), any(), any(), any());
verify(lockHandle).close();
}
private static FileTaskEntity staleTask(long taskId) {
FileTaskEntity task = new FileTaskEntity();
task.setId(taskId);
task.setModuleType(CollectDataService.MODULE_TYPE);
task.setStatus("RUNNING");
task.setUpdatedAt(LocalDateTime.now().minusMinutes(31));
return task;
}
private static FileResultEntity taskResult(FileTaskEntity task, long resultId) {
FileResultEntity result = new FileResultEntity();
result.setId(resultId);
result.setTaskId(task.getId());
result.setModuleType(CollectDataService.MODULE_TYPE);
result.setSourceFilename("collect.xlsx");
return result;
}
}