fix(看板): 任务状态收成三态,外观专利终态进度带真实状态落库

两次定案方向相反,所以分开钉:主看板只要 执行中/成功/失败 三态(其他状态不再当筛选项);
变体采集那页反过来——撤掉「在跑=0∪1 合并」口径,直接显示 待执行/处理中/成功/失败,
历史终态也要能看到。

- 后端 statusFilter 做同义词展开:成功 = SUCCESS∪COMPLETED,失败 = FAILED∪ERROR∪CANCELLED
  (取消=没成功也不在跑,并入失败),展开只住这一处,页面模型不再各自 if。前端筛选项随之
  收成 全部/执行中/成功/失败 四项(原 待执行/执行中/已排期/已完成/已取消 那一排撤掉)。
- 变体采集:不传 status = 全部状态,后端原样直查麦象(含历史终态),不再有 0∪1 合并哨兵;
  前端选项与 label 同步改。上线顺序仍是先 jar 后前端——新前端发 ACTIVE 打旧 jar 会整页空。
- AppearancePatentTaskService.saveFileBuildProgress 的终态必须带任务真实状态落库:save() 只对
  终态豁免 500ms 节流,而收尾三连写(组装/上传/完成)都在同一次调用里,若全按 RUNNING 写
  就只有第一条落地,满格「结果文件已生成」必被吞——2026-10-04 生产实测的「已完成 0/130、
  57/59」就是这么来的。对齐货源查询侧的 isTerminalFileBuildProgress。
- 节流侧补一条用例钉住"终态不受节流",模块侧补一条钉住"终态写的是任务状态而不是 RUNNING"——
  这两条分别在 service 与 mapper 出口,任一处回退都会红。

验证:后端定向 4 类 53/0(外观终态快照 4、进度节流 9、看板查询 34、变体采集 6;与批次①同一轮 mvn 197 例 0 红);admin-frontend-vue 定向 task-center-board 25/0(含三态选项、默认视图、
汇总卡口径)、全量 1726 例中本批 0 红。
This commit is contained in:
2026-10-05 11:52:07 +08:00
parent eea617b3e6
commit df03dce9c1
12 changed files with 327 additions and 190 deletions
@@ -0,0 +1,87 @@
package com.nanri.aiimage.modules.appearancepatent.service;
import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity;
import com.nanri.aiimage.modules.task.model.entity.TaskFileJobEntity;
import com.nanri.aiimage.modules.task.service.TaskProgressSnapshotService;
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.junit.jupiter.MockitoExtension;
import org.springframework.test.util.ReflectionTestUtils;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
/**
* 外观专利的进度快照是「文件构建」合成单位(LLM 批次数 + 3 个固定阶段),任务收尾在
* completeLlmFileJob 里同一瞬间连发三条进度(组装 N-2 / 上传 N-1 / 完成 N)。快照写入
* (TaskProgressSnapshotService.save)只对终态豁免 500ms 节流,所以满格那条必须带任务
* 真实状态落库——此前恒按 RUNNING 写,必被节流吞掉,看板永远停在 0/N 或 N-2/N
* (2026-10-04 生产实测)。修复:completed 满格且任务已终态时按任务状态写,
* 对齐货源查询 isTerminalFileBuildProgress。
*/
@ExtendWith(MockitoExtension.class)
class AppearancePatentSnapshotTerminalWriteTest {
private static final Long TASK_ID = 31337L;
@Mock private TaskProgressSnapshotService taskProgressSnapshotService;
@InjectMocks private AppearancePatentTaskService service;
@Test
void runningTaskKeepsWritingRunningStatus() {
save(task("RUNNING"), 3, "正在组装 xlsx");
assertSavedStatus("RUNNING");
}
@Test
void completedTaskWritesSuccessAsTerminalStatus() {
save(task("SUCCESS"), 6, "结果文件已生成");
assertSavedStatus("SUCCESS");
}
@Test
void failedTaskAtFullProgressWritesFailedAsTerminalStatus() {
save(task("FAILED"), 6, "结果文件已生成");
assertSavedStatus("FAILED");
}
/** 没跑满格就不算终态进度:失败的中间阶段照旧按 RUNNING 写,节流语义保持不变。 */
@Test
void failedTaskBelowFullProgressIsNotTerminalYet() {
save(task("FAILED"), 3, "正在组装 xlsx");
assertSavedStatus("RUNNING");
}
private void save(FileTaskEntity task, int completed, String message) {
TaskFileJobEntity job = new TaskFileJobEntity();
job.setId(1L);
job.setScopeKey("task:31337:owner:instance-a");
job.setStatus("RUNNING");
ReflectionTestUtils.invokeMethod(service, "saveFileBuildProgress",
task, job, 6, completed, message);
}
private void assertSavedStatus(String expectedStatus) {
ArgumentCaptor<String> status = ArgumentCaptor.forClass(String.class);
verify(taskProgressSnapshotService).save(eq(TASK_ID), eq(AppearancePatentTaskService.MODULE_TYPE),
status.capture(), anyInt(), anyInt(), anyInt(), anyString(), anyString(), any());
assertEquals(expectedStatus, status.getValue());
}
private FileTaskEntity task(String status) {
FileTaskEntity task = new FileTaskEntity();
task.setId(TASK_ID);
task.setModuleType(AppearancePatentTaskService.MODULE_TYPE);
task.setStatus(status);
return task;
}
}
@@ -145,6 +145,21 @@ class TaskProgressSnapshotServiceThrottleTest {
verify(taskProgressSnapshotMapper, times(1)).update(isNull(), any(LambdaUpdateWrapper.class));
}
/** 终态不受节流:外观专利收尾在同一瞬间连发三条进度(组装/上传/完成),只有最后一条带终态——
* 若终态也被 500ms 窗口吞掉,快照永远停在中间阶段,看板出现「已完成 0/130、57/59」
* (2026-10-04 生产实测,模块侧修复:AppearancePatentTaskService.saveFileBuildProgress 终态带任务状态)。 */
@Test
void terminalStatusWritesLandEvenInsideTheThrottleWindow() {
when(taskProgressSnapshotMapper.selectOne(any(LambdaQueryWrapper.class))).thenReturn(running());
rewindLastWrite(20581L, "SIMILAR_ASIN", 100L);
service.save(20581L, "SIMILAR_ASIN", "RUNNING", 10, 5, 1, "s1", "half", null);
verify(taskProgressSnapshotMapper, never()).update(isNull(), any(LambdaUpdateWrapper.class));
service.save(20581L, "SIMILAR_ASIN", "SUCCESS", 10, 10, 0, "s1", "done", null);
verify(taskProgressSnapshotMapper, times(1)).update(isNull(), any(LambdaUpdateWrapper.class));
}
@Test
void test_task_063_progress_frontend_boundary_limit_and_overflow() {
// 上限/超限:最小更新间隔设为 0(超限值)→ 节流禁用,
@@ -374,6 +374,18 @@ class TaskCenterQueryServiceTest {
assertNull(TaskCenterQueryService.statusFilter(null));
}
/** 三态收敛(2026-10-04 用户定案:状态只留 执行中/成功/失败):成功/失败筛选必须命中
* 历史拼写(COMPLETED/ERROR)与取消,否则前端归并后的行在筛选下凭空消失。 */
@Test
void statusFilterExpandsSuccessAndFailedIntoSynonyms() {
assertEquals(TaskCenterQueryMapper.SUCCESS_STATUSES_ORDERED,
TaskCenterQueryService.statusFilter("success"));
assertEquals(List.of("SUCCESS", "COMPLETED"), TaskCenterQueryService.statusFilter(" SUCCESS "));
assertEquals(TaskCenterQueryMapper.FAILED_STATUSES_ORDERED,
TaskCenterQueryService.statusFilter("FAILED"));
assertEquals(List.of("FAILED", "ERROR", "CANCELLED"), TaskCenterQueryService.statusFilter("failed"));
}
/** 国家列:原文两种形状都要归一,取不到留空(前端画「—」),不许把 null 当国家名。 */
@Test
void countryColumnIsNormalizedFromBothJsonShapes() {
@@ -6,7 +6,6 @@ import com.nanri.aiimage.modules.notification.client.MaixiangConsoleClient.Batch
import com.nanri.aiimage.modules.taskcenter.mapper.TaskCenterQueryMapper;
import com.nanri.aiimage.modules.taskcenter.model.dto.TaskCenterUserRow;
import com.nanri.aiimage.modules.taskcenter.model.vo.TaskCenterVariantPageVo;
import com.nanri.aiimage.modules.taskcenter.model.vo.TaskCenterVariantTaskVo;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.InjectMocks;
@@ -31,7 +30,7 @@ import static org.mockito.Mockito.when;
/**
* 变体采集页签的 Java 侧口径:可见用户 → uid 集合(逗号拼接、排序稳定)、
* 分页归一化、uid → 账号名映射、麦象不可达/未配置时返回空页;
* 不传 status = 只看在跑(等待 0 ∪ 处理中 1 合并,历史终态不进默认口径)。
* 不传 status = 全部状态(单次直查麦象,四态与分页都由麦象完成——2026-10-05 定案)。
*/
@ExtendWith(MockitoExtension.class)
class TaskCenterVariantServiceTest {
@@ -54,11 +53,6 @@ class TaskCenterVariantServiceTest {
resMes, "{\"file_url\": \"https://oss.aishufu.top/a.xlsx\"}");
}
private static BatchTaskItem item(String taskId, String uid, int status, String resMes, LocalDateTime createTime) {
return new BatchTaskItem(taskId, "variant-collection", uid, status,
createTime, createTime, resMes, "{\"file_url\": \"https://oss.aishufu.top/a.xlsx\"}");
}
private static TaskCenterUserRow userRow(Long id, String username) {
TaskCenterUserRow row = new TaskCenterUserRow();
row.setUserId(id);
@@ -87,7 +81,7 @@ class TaskCenterVariantServiceTest {
assertEquals(1, page.getItems().get(0).getStatus());
assertEquals("处理中", page.getItems().get(0).getStatusLabel());
assertEquals("最新采集到 B0XXXXXXX 数据,已采集 12 条", page.getItems().get(0).getResMes());
assertEquals("已完成", page.getItems().get(1).getStatusLabel());
assertEquals("成功", page.getItems().get(1).getStatusLabel());
assertEquals("bob", page.getItems().get(1).getUsername());
}
@@ -113,58 +107,24 @@ class TaskCenterVariantServiceTest {
}
@Test
void superAdminWithoutStatusSeesOnlyActiveMergedFromBothStatuses() {
void superAdminWithoutStatusFetchesAllStatesInOneCall() {
when(consoleClient.configured()).thenReturn(true);
when(consoleClient.batchTasksPage(isNull(), eq(0), eq("variant-collection"), eq(1), eq(200)))
.thenReturn(new BatchTaskPage(1, List.of(item("t-wait", "5", 0, "已添加至任务队列,等待执行"))));
when(consoleClient.batchTasksPage(isNull(), eq(1), eq("variant-collection"), eq(1), eq(200)))
.thenReturn(new BatchTaskPage(2, List.of(item("t-run", "5", 1, "已采集 12 条"))));
when(consoleClient.batchTasksPage(isNull(), isNull(), eq("variant-collection"), eq(1), eq(20)))
.thenReturn(new BatchTaskPage(3, List.of(
item("t-wait", "5", 0, "已添加至任务队列,等待执行"),
item("t-run", "5", 1, "已采集 12 条"),
item("t-done", "5", 2, "已完成,共 30 条"))));
when(queryMapper.selectUsernames(List.of(5L))).thenReturn(List.of(userRow(5L, "ali")));
TaskCenterVariantPageVo page = service.variantTasks(superScope(), null, null, null, null);
assertEquals(3, page.getTotal(), "不传 status = 在跑(等待+处理中)之和,不再是历史全量 106");
assertEquals(2, page.getItems().size());
assertEquals(3, page.getTotal(), "不传 status = 全部状态直查麦象,total 原样透传");
assertEquals(3, page.getItems().size());
assertEquals(1, page.getPage());
assertEquals(20, page.getPageSize());
assertEquals("等待执行", page.getItems().get(0).getStatusLabel());
verify(consoleClient, never()).batchTasksPage(any(), isNull(), any(), anyInt(), anyInt());
}
@Test
void activeMergeSortsByCreateTimeDescAndSlicesPages() {
when(consoleClient.configured()).thenReturn(true);
when(consoleClient.batchTasksPage(isNull(), eq(0), any(), eq(1), eq(200)))
.thenReturn(new BatchTaskPage(2, List.of(
item("t-old", "5", 0, "等待", LocalDateTime.of(2026, 10, 4, 1, 0)),
item("t-mid", "5", 0, "等待", LocalDateTime.of(2026, 10, 4, 2, 0)))));
when(consoleClient.batchTasksPage(isNull(), eq(1), any(), eq(1), eq(200)))
.thenReturn(new BatchTaskPage(1, List.of(
item("t-new", "5", 1, "处理中", LocalDateTime.of(2026, 10, 4, 3, 0)))));
TaskCenterVariantPageVo first = service.variantTasks(superScope(), null, null, 1, 2);
assertEquals(List.of("t-new", "t-mid"),
first.getItems().stream().map(TaskCenterVariantTaskVo::getTaskId).toList(),
"两个状态合并后按创建时间倒序,不是先等待后处理中的拼接序");
TaskCenterVariantPageVo second = service.variantTasks(superScope(), null, null, 2, 2);
assertEquals(List.of("t-old"),
second.getItems().stream().map(TaskCenterVariantTaskVo::getTaskId).toList());
TaskCenterVariantPageVo beyond = service.variantTasks(superScope(), null, null, 3, 2);
assertEquals(0, beyond.getItems().size(), "越界页给空列表");
assertEquals(3, beyond.getTotal(), "total 不随空页归零");
}
@Test
void activeTotalFallsBackToItemCountWhenMaixiangTotalIsSentinel() {
when(consoleClient.configured()).thenReturn(true);
when(consoleClient.batchTasksPage(isNull(), eq(0), any(), eq(1), eq(200)))
.thenReturn(new BatchTaskPage(-1, List.of(item("t-1", "5", 0, "等待"))));
when(consoleClient.batchTasksPage(isNull(), eq(1), any(), eq(1), eq(200)))
.thenReturn(new BatchTaskPage(-1, List.of()));
TaskCenterVariantPageVo page = service.variantTasks(superScope(), null, null, 1, 20);
assertEquals(1, page.getTotal(), "-1 哨兵不能把在跑数算成负数");
assertEquals("待执行", page.getItems().get(0).getStatusLabel());
assertEquals("成功", page.getItems().get(2).getStatusLabel());
verify(consoleClient).batchTasksPage(isNull(), isNull(), eq("variant-collection"), eq(1), eq(20));
}
@Test
@@ -181,19 +141,17 @@ class TaskCenterVariantServiceTest {
@Test
void nonNumericUidAndUnknownStatusDegradeGracefully() {
when(consoleClient.configured()).thenReturn(true);
when(consoleClient.batchTasksPage("5", 0, "variant-collection", 1, 200))
when(consoleClient.batchTasksPage("5", null, "variant-collection", 1, 20))
.thenReturn(new BatchTaskPage(3, List.of(
item("t-1", "collect-27475", 0, "已添加至任务队列,等待执行"),
item("t-2", "5", 9, ""))));
when(consoleClient.batchTasksPage("5", 1, "variant-collection", 1, 200))
.thenReturn(BatchTaskPage.EMPTY);
when(queryMapper.selectUsernames(List.of(5L))).thenReturn(List.of(userRow(5L, "ali")));
TaskCenterVariantPageVo page = service.variantTasks(scoped(5L), null, null, 1, 20);
assertNull(page.getItems().get(0).getUsername(), "非数字 uid 不参与账号名映射");
assertEquals("collect-27475", page.getItems().get(0).getUid());
assertEquals("等待执行", page.getItems().get(0).getStatusLabel());
assertEquals("待执行", page.getItems().get(0).getStatusLabel());
assertEquals("ali", page.getItems().get(1).getUsername());
assertEquals("未知", page.getItems().get(1).getStatusLabel(), "未识别的麦象状态码不冒充成功");
}