fix(similar-asin): history 保留续跑件并补回窗口外非终态任务,更新打断后不再两头看不见
现场(用户 2026-10-22「更新客户端,在跑的任务列表没掉」): ① 客户端更新打断任务后,V129 自动续跑会克隆一条新的 PENDING (TaskRetryCloneSupport:status=PENDING + resume_of_task_id 指向原件)。原件已 FAILED 沉进历史,而 SimilarAsinHistoryAssembler 对 PENDING 一律 continue ⇒「当前任务」和 「历史任务」两头都看不到,要等下一个在线客户端把它领走才重新出现。 ② 第二条独立成因:history 由结果行驱动、ORDER BY created_at DESC LIMIT 50..100 (每任务一行)。一个还在跑、但结果行被更新任务挤出窗口的任务会从列表里彻底消失; 前端「当前任务」唯一的兜底是内存 liveProgressItems,页面重载/客户端更新即清零。 改法: ① PENDING 只跳过「未启动的解析预览」,续跑克隆件保留(普通预览不进列表,避免用户 没打算跑的预览一直挂在当前任务里); ② history 追加一次固定的非终态任务查询(RUNNING + 续跑件),把窗口外的按任务头补回 列表最前;resultId/downloadUrl 留空、由前端按 taskStatus 渲染(删除按钮本就 v-if="itemSource(item).resultId",不会拿 null 打接口)。 查询数仍是常数:1 次结果行 + 2 次任务 + 1 次 job = 4(性能守卫同步改成 ≤2 / 总数 ≤4)。 门禁:mvn -o test-compile rc=0;整量 4695 例 / 0 红 / 0 错 / 17 skip / BUILD SUCCESS (07:05);组装器 15 例、history 批次 13 例、性能守卫 8 例全绿(新增 4 例:续跑件保 留、普通预览仍跳过、窗口外补回、窗口内不重复)。
This commit is contained in:
+45
@@ -25,6 +25,7 @@ import com.nanri.aiimage.modules.similarasin.model.dto.SimilarAsinSubmitResultRe
|
||||
import com.nanri.aiimage.modules.similarasin.model.entity.SimilarAsinFilterConditionEntity;
|
||||
import com.nanri.aiimage.modules.similarasin.model.vo.SimilarAsinDashboardVo;
|
||||
import com.nanri.aiimage.modules.similarasin.model.vo.SimilarAsinFilterConditionVo;
|
||||
import com.nanri.aiimage.modules.similarasin.model.vo.SimilarAsinHistoryItemVo;
|
||||
import com.nanri.aiimage.modules.similarasin.model.vo.SimilarAsinHistoryVo;
|
||||
import com.nanri.aiimage.modules.similarasin.model.vo.SimilarAsinParsedGroupVo;
|
||||
import com.nanri.aiimage.modules.similarasin.model.vo.SimilarAsinParsedRowVo;
|
||||
@@ -587,6 +588,7 @@ public class SimilarAsinTaskService implements SimilarAsinPipelineHost {
|
||||
for (FileTaskEntity task : fileTaskMapper.selectList(new LambdaQueryWrapper<FileTaskEntity>()
|
||||
.select(FileTaskEntity::getId,
|
||||
FileTaskEntity::getStatus,
|
||||
FileTaskEntity::getResumeOfTaskId,
|
||||
FileTaskEntity::getCreatedAt,
|
||||
FileTaskEntity::getFinishedAt)
|
||||
.in(FileTaskEntity::getId, taskIds))) {
|
||||
@@ -598,9 +600,52 @@ public class SimilarAsinTaskService implements SimilarAsinPipelineHost {
|
||||
.filter(Objects::nonNull)
|
||||
.toList());
|
||||
vo.getItems().addAll(historyAssembler().buildHistoryItems(rows, taskMap, jobMap));
|
||||
prependActiveTasksOutsideWindow(vo, userId, taskIds);
|
||||
return vo;
|
||||
}
|
||||
|
||||
/**
|
||||
* 把「结果行被挤出 top-N 窗口」的活跃任务补回列表最前。
|
||||
*
|
||||
* 历史列表按结果行 created_at 倒序取 50/100 行(每个任务一行):一个还在跑、但结果行
|
||||
* 排在窗口外的任务会从列表里彻底消失。前端「当前任务」唯一的兜底是内存里的实时缓存,
|
||||
* 页面重载/客户端更新即清零——于是用户看到的在跑任务凭空没了。这里按任务头补回;
|
||||
* 只补 RUNNING 与续跑克隆件(PENDING),未启动的解析预览不进列表(保持原历史语义)。
|
||||
*/
|
||||
private void prependActiveTasksOutsideWindow(SimilarAsinHistoryVo vo, Long userId, List<Long> coveredTaskIds) {
|
||||
List<FileTaskEntity> activeTasks = fileTaskMapper.selectList(new LambdaQueryWrapper<FileTaskEntity>()
|
||||
.select(FileTaskEntity::getId,
|
||||
FileTaskEntity::getStatus,
|
||||
FileTaskEntity::getResumeOfTaskId,
|
||||
FileTaskEntity::getCreatedAt,
|
||||
FileTaskEntity::getFinishedAt)
|
||||
.eq(FileTaskEntity::getModuleType, MODULE_TYPE)
|
||||
.eq(FileTaskEntity::getUserId, userId)
|
||||
.in(FileTaskEntity::getStatus, List.of(STATUS_PENDING, STATUS_RUNNING))
|
||||
.orderByDesc(FileTaskEntity::getCreatedAt)
|
||||
.last("limit 50"));
|
||||
if (activeTasks == null || activeTasks.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
SimilarAsinHistoryAssembler assembler = historyAssembler();
|
||||
List<SimilarAsinHistoryItemVo> activeItems = new ArrayList<>();
|
||||
for (FileTaskEntity task : activeTasks) {
|
||||
if (task == null || task.getId() == null) {
|
||||
continue;
|
||||
}
|
||||
if (coveredTaskIds.contains(task.getId())) {
|
||||
continue;
|
||||
}
|
||||
if (STATUS_PENDING.equals(task.getStatus()) && !assembler.isResumeClone(task)) {
|
||||
continue;
|
||||
}
|
||||
activeItems.add(assembler.buildActiveItem(task));
|
||||
}
|
||||
if (!activeItems.isEmpty()) {
|
||||
vo.getItems().addAll(0, activeItems);
|
||||
}
|
||||
}
|
||||
|
||||
public SimilarAsinTaskLightBatchVo progressLight(List<Long> taskIds) {
|
||||
SimilarAsinTaskLightBatchVo vo = new SimilarAsinTaskLightBatchVo();
|
||||
List<Long> normalizedIds = taskIds == null ? List.of() : taskIds.stream()
|
||||
|
||||
+33
-3
@@ -76,8 +76,13 @@ public class SimilarAsinHistoryAssembler {
|
||||
}
|
||||
|
||||
/**
|
||||
* 按 rows 顺序组装历史项;PENDING 任务(history 语义)跳过。
|
||||
* taskMap/jobMap 均为调用方已查好的映射,本方法只读不改输入。
|
||||
* 按 rows 顺序组装历史项;PENDING 只在「续跑克隆件」时保留,普通解析预览仍按原口径跳过。
|
||||
*
|
||||
* 为什么续跑件必须留:客户端更新打断任务后,V129 自动续跑会克隆出一条新的 PENDING
|
||||
* (TaskRetryCloneSupport 置 status=PENDING + resume_of_task_id=原件)。原件已 FAILED 沉进历史,
|
||||
* 这条克隆件如果在这里被跳过,就出现「当前任务」和「历史任务」两头都看不到的空窗——
|
||||
* 用户看到的正是「更新完在跑的任务没了」,得等某个在线客户端把它领走才重新出现。
|
||||
* 普通 PENDING(只解析未启动的预览)不进列表,避免用户没打算跑的预览一直挂在当前任务里。
|
||||
*/
|
||||
public List<SimilarAsinHistoryItemVo> buildHistoryItems(List<FileResultEntity> rows,
|
||||
Map<Long, FileTaskEntity> taskMap,
|
||||
@@ -89,7 +94,7 @@ public class SimilarAsinHistoryAssembler {
|
||||
for (FileResultEntity row : rows) {
|
||||
FileTaskEntity task = taskMap.get(row.getTaskId());
|
||||
String taskStatus = task == null ? null : task.getStatus();
|
||||
if (STATUS_PENDING.equals(taskStatus)) {
|
||||
if (STATUS_PENDING.equals(taskStatus) && !isResumeClone(task)) {
|
||||
continue;
|
||||
}
|
||||
items.add(toHistoryItem(row, task, jobMap.get(row.getId())));
|
||||
@@ -97,6 +102,31 @@ public class SimilarAsinHistoryAssembler {
|
||||
return items;
|
||||
}
|
||||
|
||||
/** 续跑克隆件:已经跑过、被中断后重新排队的 PENDING(resume_of_task_id 指向原件)。 */
|
||||
public boolean isResumeClone(FileTaskEntity task) {
|
||||
return task != null && task.getResumeOfTaskId() != null;
|
||||
}
|
||||
|
||||
/**
|
||||
* 由任务头拼一条「结果行不在返回窗口里」的列表项(仍在执行、或续跑排队中)。
|
||||
*
|
||||
* 历史列表是按结果行 created_at 倒序的 top-N 窗口(每个任务一行);一个还在跑、
|
||||
* 但结果行被更新任务挤出窗口的任务会从列表里整个消失,客户端更新/页面重载后
|
||||
* 前端「当前任务」的兜底(内存缓存)也已经清零——用户看到的就是任务没了。
|
||||
* 这里只带前端渲染当前任务所需字段:没有 resultId/downloadUrl 表示还没有结果文件,
|
||||
* 进度链拿不到结果行就不伪造百分比,由页面按 taskStatus 显示「执行中/排队中」。
|
||||
*/
|
||||
public SimilarAsinHistoryItemVo buildActiveItem(FileTaskEntity task) {
|
||||
SimilarAsinHistoryItemVo vo = new SimilarAsinHistoryItemVo();
|
||||
vo.setTaskId(task.getId());
|
||||
vo.setTaskStatus(task.getStatus());
|
||||
vo.setSuccess(false);
|
||||
vo.setCreatedAt(fmt(task.getCreatedAt()));
|
||||
vo.setStartedAt(fmt(task.getCreatedAt()));
|
||||
vo.setFinishedAt(fmt(task.getFinishedAt()));
|
||||
return vo;
|
||||
}
|
||||
|
||||
private SimilarAsinHistoryItemVo toHistoryItem(FileResultEntity row, FileTaskEntity task, TaskFileJobEntity job) {
|
||||
SimilarAsinHistoryItemVo vo = new SimilarAsinHistoryItemVo();
|
||||
vo.setResultId(row.getId());
|
||||
|
||||
+64
-2
@@ -45,6 +45,7 @@ import java.util.Map;
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertNotNull;
|
||||
import static org.junit.jupiter.api.Assertions.assertNull;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
@@ -161,6 +162,26 @@ class SimilarAsinTaskServiceHistoryBatchTest {
|
||||
LambdaQueryWrapper<FileTaskEntity> q = invocation.getArgument(0);
|
||||
String segment = q.getSqlSegment() == null ? "" : q.getSqlSegment();
|
||||
List<Object> params = paramValuesOf(q, segment);
|
||||
// 非终态任务查询(history 补回窗口外的在跑任务):按 status 条件过滤任务表。
|
||||
// MyBatis-Plus 3.5.7 把 IN 展开成逐值占位符,所以字符串参数要两个分支一起收。
|
||||
if (segment.contains("status")) {
|
||||
List<String> wantedStatuses = new ArrayList<>();
|
||||
for (Object value : params) {
|
||||
if (value instanceof List<?> list) {
|
||||
for (Object item : list) {
|
||||
if (item instanceof String status) {
|
||||
wantedStatuses.add(status);
|
||||
}
|
||||
}
|
||||
} else if (value instanceof String status) {
|
||||
wantedStatuses.add(status);
|
||||
}
|
||||
}
|
||||
return taskDb.stream()
|
||||
.filter(t -> wantedStatuses.contains(t.getStatus()))
|
||||
.filter(t -> MODULE.equals(t.getModuleType()))
|
||||
.toList();
|
||||
}
|
||||
List<Long> wanted = new ArrayList<>();
|
||||
for (Object value : params) {
|
||||
if (value instanceof List<?> list) {
|
||||
@@ -306,6 +327,46 @@ class SimilarAsinTaskServiceHistoryBatchTest {
|
||||
vo.getItems().stream().map(SimilarAsinHistoryItemVo::getResultId).toList());
|
||||
}
|
||||
|
||||
@Test
|
||||
void historyIncludesActiveTaskOutsideResultWindow() throws Exception {
|
||||
// 结果行窗口只装得下新任务;老任务还在跑,结果行已被挤出窗口
|
||||
taskDb.add(task(900L, "RUNNING", LocalDateTime.of(2026, 8, 1, 8, 0)));
|
||||
seed(3, 3, 0);
|
||||
|
||||
SimilarAsinHistoryVo vo = service.history(1L, 3);
|
||||
|
||||
assertEquals(4, vo.getItems().size(), "窗口外仍在跑的任务必须补回列表");
|
||||
SimilarAsinHistoryItemVo first = vo.getItems().getFirst();
|
||||
assertEquals(900L, first.getTaskId(), "补回项排在最前");
|
||||
assertEquals("RUNNING", first.getTaskStatus());
|
||||
assertNull(first.getResultId(), "补回项还没有结果行,不许伪造");
|
||||
}
|
||||
|
||||
@Test
|
||||
void historyDoesNotDuplicateActiveTaskAlreadyInWindow() throws Exception {
|
||||
seed(1, 1, 0);
|
||||
taskDb.getFirst().setStatus("RUNNING");
|
||||
|
||||
SimilarAsinHistoryVo vo = service.history(1L, 50);
|
||||
|
||||
assertEquals(1, vo.getItems().size(), "结果行已在窗口里的任务不得重复补回");
|
||||
}
|
||||
|
||||
@Test
|
||||
void historyHidesPendingPreviewButKeepsResumeCloneOutsideWindow() throws Exception {
|
||||
taskDb.add(task(910L, "PENDING", LocalDateTime.of(2026, 8, 2, 9, 0)));
|
||||
FileTaskEntity clone = task(911L, "PENDING", LocalDateTime.of(2026, 8, 2, 10, 0));
|
||||
clone.setResumeOfTaskId(910L);
|
||||
taskDb.add(clone);
|
||||
seed(2, 2, 0);
|
||||
|
||||
SimilarAsinHistoryVo vo = service.history(1L, 50);
|
||||
|
||||
List<Long> taskIds = vo.getItems().stream().map(SimilarAsinHistoryItemVo::getTaskId).toList();
|
||||
assertTrue(taskIds.contains(911L), "续跑克隆件必须可见(更新打断后就靠它显示)");
|
||||
assertFalse(taskIds.contains(910L), "未启动的解析预览不进列表");
|
||||
}
|
||||
|
||||
@Test
|
||||
void historyMissingRelated() throws Exception {
|
||||
resultDb.add(result(201L, 9999L, 1L, LocalDateTime.of(2026, 8, 1, 10, 1)));
|
||||
@@ -344,10 +405,11 @@ class SimilarAsinTaskServiceHistoryBatchTest {
|
||||
seed(20, 4, 20);
|
||||
service.history(1L, 50);
|
||||
verify(fileResultMapper, org.mockito.Mockito.times(1)).selectList(any());
|
||||
verify(fileTaskMapper, org.mockito.Mockito.times(1)).selectList(any());
|
||||
// 2 次固定任务查询:①结果行 taskId 的 IN 批查;②窗口外非终态任务的补回查询
|
||||
verify(fileTaskMapper, org.mockito.Mockito.times(2)).selectList(any());
|
||||
verify(taskFileJobService, org.mockito.Mockito.times(1)).findAssembleJobsByResultIds(eq(MODULE), anyList());
|
||||
assertEquals(1, resultSelectCount.get(), "结果 1 次 IN 查询");
|
||||
assertEquals(1, taskSelectCount.get(), "任务 1 次 IN 查询");
|
||||
assertEquals(2, taskSelectCount.get(), "任务 2 次固定查询(IN 批查 + 非终态补回)");
|
||||
assertEquals(1, jobSelectCount.get(), "Job 1 次 IN 查询");
|
||||
assertEquals(20, resultSelectCount.get() * 20, "查询次数与结果行数无关(无 N+1)");
|
||||
}
|
||||
|
||||
+2
-1
@@ -434,7 +434,8 @@ class SimilarAsinTaskServicePerf500Test {
|
||||
jobQueryCount.set(0);
|
||||
service.history(USER_ID, HISTORY_LIMIT);
|
||||
assertTrue(resultSelectCount.get() <= 1, "history 结果查询 ≤ 1 次");
|
||||
assertTrue(taskSelectCount.get() <= 1, "history 任务查询 ≤ 1 次");
|
||||
// 2 次固定任务查询:①结果行 taskId 的 IN 批查;②窗口外非终态任务的补回查询(都是常数,与行数无关)
|
||||
assertTrue(taskSelectCount.get() <= 2, "history 任务查询 ≤ 2 次");
|
||||
assertTrue(jobQueryCount.get() <= 2, "history Job 查询 ≤ 2 次(findAssembleJobsByResultIds 一次)");
|
||||
int historyTotal = resultSelectCount.get() + taskSelectCount.get() + jobQueryCount.get();
|
||||
assertTrue(historyTotal <= MAX_QUERY_COUNT_HISTORY,
|
||||
|
||||
+25
-3
@@ -239,13 +239,35 @@ class SimilarAsinHistoryAssemblerTest {
|
||||
Map<Long, FileTaskEntity> taskMap = new LinkedHashMap<>();
|
||||
taskMap.put(10L, task(10L, "PENDING", null));
|
||||
taskMap.put(11L, task(11L, "RUNNING", null));
|
||||
// 续跑克隆件:客户端更新打断后 V129 自动续跑排回来的 PENDING(resume_of_task_id 指向原件),
|
||||
// 原件已 FAILED 沉进历史,这一条再被跳过就两头都看不到——必须保留
|
||||
taskMap.put(12L, task(12L, "PENDING", null));
|
||||
taskMap.get(12L).setResumeOfTaskId(11L);
|
||||
|
||||
List<SimilarAsinHistoryItemVo> items = assembler.buildHistoryItems(
|
||||
List.of(result(100L, 10L, "a.xlsx", null, 0), result(101L, 11L, "b.xlsx", null, 0)),
|
||||
List.of(result(100L, 10L, "a.xlsx", null, 0),
|
||||
result(101L, 11L, "b.xlsx", null, 0),
|
||||
result(102L, 12L, "c.xlsx", null, 0)),
|
||||
taskMap, jobMap());
|
||||
|
||||
assertEquals(1, items.size(), "PENDING 任务历史项被跳过");
|
||||
assertEquals(101L, items.get(0).getResultId());
|
||||
assertEquals(2, items.size(), "普通 PENDING 预览跳过,续跑克隆件保留");
|
||||
assertEquals(List.of(101L, 102L),
|
||||
items.stream().map(SimilarAsinHistoryItemVo::getResultId).toList());
|
||||
assertEquals("PENDING", items.get(1).getTaskStatus(), "克隆件按排队中呈现");
|
||||
}
|
||||
|
||||
@Test
|
||||
void test_assembler_active_item_without_result_row() {
|
||||
FileTaskEntity running = task(20L, "RUNNING", LocalDateTime.of(2026, 8, 2, 9, 0));
|
||||
|
||||
SimilarAsinHistoryItemVo item = assembler.buildActiveItem(running);
|
||||
|
||||
assertEquals(20L, item.getTaskId());
|
||||
assertEquals("RUNNING", item.getTaskStatus());
|
||||
assertNull(item.getResultId(), "还没有结果行,不许伪造 resultId");
|
||||
assertNull(item.getDownloadUrl());
|
||||
assertEquals(Boolean.FALSE, item.getSuccess());
|
||||
assertEquals("2026-08-02T09:00", item.getStartedAt());
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
Reference in New Issue
Block a user