/, '无进度时不画进度轨')
+})
+
test('task_center_query_builder_omits_blanks_and_normalizes_time', () => {
const query = buildTaskQuery(
{ username: ' 张三 ', moduleType: 'COLLECT_DATA', status: 'RUNNING', shop: '林芳旗舰店', startTime: '2026-09-28T10:00', endTime: '' },
@@ -167,10 +196,11 @@ test('task_center_query_builder_omits_blanks_and_normalizes_time', () => {
test('task_center_variant_query_builder_keeps_paging', () => {
const empty = buildVariantQuery({ status: '' }, 1, 20)
- assert.equal(empty.status, undefined)
+ assert.equal(empty.status, undefined, '空状态不下传 status ⇒ 后端按在跑(0∪1)合并')
assert.equal(empty.page, 1)
- const filtered = buildVariantQuery({ status: '3' }, 3, 50)
- assert.equal(filtered.status, 3)
+ const filtered = buildVariantQuery({ status: '1' }, 3, 50)
+ assert.equal(filtered.status, 1)
+ assert.equal(buildVariantQuery({ status: '0' }, 1, 20).status, 0, '状态 0 是 falsy,不能被当成「没选」')
assert.equal(filtered.page, 3)
assert.equal(filtered.pageSize, 50)
})
@@ -189,7 +219,7 @@ test('task_center_page_handles_empty_and_error_states', () => {
const page = readSource(PAGE)
assert.match(page, /暂无符合条件的任务/, '任务空态')
assert.match(page, /暂无在跑店铺/, '店铺面板空态')
- assert.match(page, /暂无变体采集任务/, '变体空态')
+ assert.match(page, /暂无在跑的变体采集任务/, '变体空态:口径是在跑不是全部')
assert.match(page, /ElMessage\.error/, '接口失败提示')
assert.match(page, /resetFilter/, '筛选重置接线')
assert.match(page, /@size-change="changeTaskSize"/, '分页每页条数切换')
diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/controller/AdminTaskCenterController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/controller/AdminTaskCenterController.java
index 7c75f54a3..c7cdc1d36 100644
--- a/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/controller/AdminTaskCenterController.java
+++ b/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/controller/AdminTaskCenterController.java
@@ -94,9 +94,10 @@ public class AdminTaskCenterController {
}
@GetMapping("/variant-tasks")
- @Operation(summary = "变体采集列表",
+ @Operation(summary = "变体采集列表(只看在跑)",
description = "代理麦象 console 批量任务(默认只看 variant-collection):非超管按可见用户 uid 过滤,"
- + "超管看全部;麦象未配置或不可达时返回空页。status 为麦象状态码:0 等待/1 处理中/2 已完成/3 失败。")
+ + "超管看全部;麦象未配置或不可达时返回空页。status 为麦象状态码:0 等待/1 处理中/2 已完成/3 失败;"
+ + "不传 status = 只看在跑(0∪1 合并,历史不再展示)。")
public ApiResponse
variantTasks(HttpServletRequest request,
@RequestParam(required = false) Integer status,
@RequestParam(required = false) String taskType,
diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/mapper/TaskCenterQueryMapper.java b/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/mapper/TaskCenterQueryMapper.java
index 4eb1d9812..c33c8906e 100644
--- a/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/mapper/TaskCenterQueryMapper.java
+++ b/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/mapper/TaskCenterQueryMapper.java
@@ -1,5 +1,6 @@
package com.nanri.aiimage.modules.taskcenter.mapper;
+import com.nanri.aiimage.modules.taskcenter.model.dto.TaskCenterCollectStatsRow;
import com.nanri.aiimage.modules.taskcenter.model.dto.TaskCenterDeviceRow;
import com.nanri.aiimage.modules.taskcenter.model.dto.TaskCenterShopRow;
import com.nanri.aiimage.modules.taskcenter.model.dto.TaskCenterShopStatRow;
@@ -327,6 +328,23 @@ public interface TaskCenterQueryMapper {
+ "")
List selectSnapshots(@Param("taskIds") List taskIds);
+ /**
+ * 采集数据任务的关键词级进度(客户端回写的 {@code result_json} 里只抽
+ * {@code $.totalRows / $.processedRows} 两个数,不把大 JSON 拉回服务层)。
+ *
+ * 列是原生 JSON 类型,缺键只会得到 NULL(服务层按「无进度」读),不会让整页查询报错。
+ */
+ @Select("")
+ List selectCollectDataKeywordStats(@Param("taskIds") List taskIds);
+
/** 详情:按任务号取单行(只认 12 个客户端模块,其余模块不在看板范围)。 */
@Select("SELECT t.id AS id, t.task_no AS taskNo, UPPER(t.module_type) AS moduleType,"
+ " " + STATUS_T + " AS status, t.user_id AS userId, t.device_id AS deviceId,"
diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/dto/TaskCenterCollectStatsRow.java b/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/dto/TaskCenterCollectStatsRow.java
new file mode 100644
index 000000000..f7c08419b
--- /dev/null
+++ b/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/dto/TaskCenterCollectStatsRow.java
@@ -0,0 +1,17 @@
+package com.nanri.aiimage.modules.taskcenter.model.dto;
+
+import lombok.Data;
+
+/**
+ * 采集数据任务的关键词级进度:从 {@code biz_file_task.result_json} 抽出的两个数,
+ * 与客户端进度条同源(collectStage 等其余字段看板不读)。
+ *
+ * JSON_UNQUOTE 的产物是字符串,脏值(非数字/缺失)由服务层按无进度处理。
+ */
+@Data
+public class TaskCenterCollectStatsRow {
+
+ private Long taskId;
+ private String totalRows;
+ private String processedRows;
+}
diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/service/TaskCenterQueryService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/service/TaskCenterQueryService.java
index 5acafecea..5328e83c8 100644
--- a/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/service/TaskCenterQueryService.java
+++ b/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/service/TaskCenterQueryService.java
@@ -2,6 +2,7 @@ package com.nanri.aiimage.modules.taskcenter.service;
import com.nanri.aiimage.common.module.TaskModuleRegistry;
import com.nanri.aiimage.modules.taskcenter.mapper.TaskCenterQueryMapper;
+import com.nanri.aiimage.modules.taskcenter.model.dto.TaskCenterCollectStatsRow;
import com.nanri.aiimage.modules.taskcenter.model.dto.TaskCenterDeviceRow;
import com.nanri.aiimage.modules.taskcenter.model.dto.TaskCenterShopRow;
import com.nanri.aiimage.modules.taskcenter.model.dto.TaskCenterShopStatRow;
@@ -259,9 +260,11 @@ public class TaskCenterQueryService {
: toUserNames(safe(queryMapper.selectUsernames(userIds)));
Map snapshots = row.getId() == null ? Map.of()
: toSnapshots(safe(queryMapper.selectSnapshots(List.of(row.getId()))));
+ Map collectStats = row.getId() == null ? Map.of()
+ : selectCollectStats(List.of(row), snapshots);
TaskCenterTaskDetailVo vo = fillRow(new TaskCenterTaskDetailVo(), row, usernames, deviceNames,
- snapshots, collectShops(bizIds), LocalDateTime.now());
+ snapshots, collectStats, collectShops(bizIds), LocalDateTime.now());
vo.setShops(shopStats(row));
vo.setErrorMessage(row.getErrorMessage());
return vo;
@@ -311,12 +314,14 @@ public class TaskCenterQueryService {
: toUserNames(safe(queryMapper.selectUsernames(userIds)));
Map snapshots = rowIds.isEmpty() ? Map.of()
: toSnapshots(safe(queryMapper.selectSnapshots(rowIds)));
+ Map collectStats = selectCollectStats(rows, snapshots);
Map> shops = collectShops(bizIds);
LocalDateTime now = LocalDateTime.now();
List items = new ArrayList<>(rows.size());
for (TaskCenterTaskRow row : rows) {
- items.add(fillRow(new TaskCenterTaskRowVo(), row, usernames, Map.of(), snapshots, shops, now));
+ items.add(fillRow(new TaskCenterTaskRowVo(), row, usernames, Map.of(), snapshots,
+ collectStats, shops, now));
}
return items;
}
@@ -398,6 +403,7 @@ public class TaskCenterQueryService {
Map usernames,
Map deviceNames,
Map snapshots,
+ Map collectStats,
Map> shops,
LocalDateTime now) {
vo.setId(row.getId());
@@ -423,9 +429,7 @@ public class TaskCenterQueryService {
vo.setCurrentScope(snapshot.getCurrentScopeKey());
vo.setMessage(snapshot.getMessage());
} else {
- vo.setProgressTotal(nullToZero(row.getTotalCount()));
- vo.setProgressSuccess(nullToZero(row.getSuccessCount()));
- vo.setProgressFailed(nullToZero(row.getFailedCount()));
+ fillFallbackProgress(vo, row, collectStats.get(row.getId()));
}
// 品牌检测按关键字执行、不落店铺;品牌行的 current_scope_key 是品牌名,不能当店铺用。
@@ -439,6 +443,70 @@ public class TaskCenterQueryService {
return vo;
}
+ /**
+ * 无快照时的进度回退,口径 = 客户端画不画进度条(用户 2026-10-04 定案):
+ *
+ * - 采集数据:客户端进度条是关键词进度(result_json 的 processedRows/totalRows),看板用同一份数;
+ * - 上架 / 删除ASIN / 品牌行:客户端进度条的单位本就是文件数 / 品牌行数,沿用行内计数;
+ * - 其余(跟价、定时匹配等):客户端没有进度条,进度置 0,前端画「—」——
+ * 旧的「输入文件数」回退让单文件任务恒显示 0/1,是误导。
+ *
+ */
+ private static void fillFallbackProgress(TaskCenterTaskRowVo vo, TaskCenterTaskRow row,
+ TaskCenterCollectStatsRow collectStat) {
+ String module = row.getModuleType();
+ if (row.isBrand() || "PUBLISH".equals(module) || "DELETE_BRAND".equals(module)) {
+ vo.setProgressTotal(nullToZero(row.getTotalCount()));
+ vo.setProgressSuccess(nullToZero(row.getSuccessCount()));
+ vo.setProgressFailed(nullToZero(row.getFailedCount()));
+ return;
+ }
+ if ("COLLECT_DATA".equals(module)) {
+ long total = parseStatNumber(collectStat == null ? null : collectStat.getTotalRows());
+ long processed = parseStatNumber(collectStat == null ? null : collectStat.getProcessedRows());
+ vo.setProgressTotal(Math.max(0, total));
+ // 已完成 = 已处理关键词数(与客户端「关键词进度:第 X/N 个」同数)
+ vo.setProgressSuccess(total <= 0 ? 0 : Math.min(Math.max(0, processed), total));
+ vo.setProgressFailed(0);
+ return;
+ }
+ vo.setProgressTotal(0);
+ vo.setProgressSuccess(0);
+ vo.setProgressFailed(0);
+ }
+
+ /** JSON_UNQUOTE 的产物是字符串:非数字/缺失一律按无进度(0),不猜。 */
+ private static long parseStatNumber(String value) {
+ if (value == null || value.isBlank()) {
+ return 0;
+ }
+ try {
+ return Long.parseLong(value.trim());
+ } catch (NumberFormatException ex) {
+ return 0;
+ }
+ }
+
+ /** 采集数据且无快照的行才需要关键词进度;页内没有这种行就不发查询。 */
+ private Map selectCollectStats(List rows,
+ Map snapshots) {
+ List ids = rows.stream()
+ .filter(row -> !row.isBrand() && "COLLECT_DATA".equals(row.getModuleType()))
+ .filter(row -> row.getId() != null
+ && !snapshots.containsKey(snapshotKey(row.getId(), row.getModuleType())))
+ .map(TaskCenterTaskRow::getId).distinct().toList();
+ if (ids.isEmpty()) {
+ return Map.of();
+ }
+ Map stats = new HashMap<>();
+ for (TaskCenterCollectStatsRow row : safe(queryMapper.selectCollectDataKeywordStats(ids))) {
+ if (row.getTaskId() != null) {
+ stats.put(row.getTaskId(), row);
+ }
+ }
+ return stats;
+ }
+
private static boolean isStuck(TaskCenterTaskRow row, LocalDateTime now) {
if (row.getStatus() == null || !ACTIVE_STATUSES.contains(row.getStatus())) {
return false;
diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/service/TaskCenterVariantService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/service/TaskCenterVariantService.java
index 868cb9bdc..414d269de 100644
--- a/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/service/TaskCenterVariantService.java
+++ b/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/service/TaskCenterVariantService.java
@@ -12,6 +12,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
+import java.util.Comparator;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
@@ -24,6 +25,9 @@ import java.util.stream.Collectors;
*
* 可见范围靠 uid 过滤实现:非超管把可见用户号拼成逗号分隔的 uid 参数(麦象侧拆分后 IN),
* 超管不传 uid(看全部)。麦象未配置或不可达时返回空页并记日志,页面不因外部依赖炸掉。
+ *
+ * 不传 status 时只看在跑(等待 0 ∪ 处理中 1):麦象一次只能筛一个状态,
+ * 服务层各拉一页合并;历史终态不再作为页签默认口径(徽章说的必须是「在跑几条」)。
*/
@Service
@Slf4j
@@ -33,6 +37,12 @@ public class TaskCenterVariantService {
/** 页签默认只看变体采集这一类批量任务;传 taskType 可覆盖。 */
public static final String VARIANT_TASK_TYPE = "variant-collection";
+ /** 麦象状态码:0 等待 / 1 处理中,两者合起来才是「在跑」。 */
+ private static final int STATUS_WAITING = 0;
+ private static final int STATUS_PROCESSING = 1;
+ /** 在跑任务正常在几十量级;触顶时 total 仍按麦象回值,但翻页尾部会缺行(记 warn)。 */
+ private static final int ACTIVE_FETCH_SIZE = 200;
+
private static final long DEFAULT_PAGE_SIZE = 20;
private static final long MAX_PAGE_SIZE = 100;
@@ -60,13 +70,43 @@ public class TaskCenterVariantService {
String uidsCsv = scope.allUsers() ? null
: scope.visibleUserIds().stream().sorted().map(String::valueOf).collect(Collectors.joining(","));
- BatchTaskPage maixiang = consoleClient.batchTasksPage(uidsCsv, status, type,
- (int) normalizedPage, (int) normalizedSize);
- vo.setTotal(maixiang.total());
- vo.setItems(assemble(maixiang.items()));
+ int size = (int) normalizedSize;
+ if (status != null) {
+ BatchTaskPage maixiang = consoleClient.batchTasksPage(uidsCsv, status, type,
+ (int) normalizedPage, size);
+ vo.setTotal(maixiang.total());
+ vo.setItems(assemble(maixiang.items()));
+ return vo;
+ }
+
+ // 不传状态 = 只看在跑(用户 2026-10-04 定案:历史的不看了)。
+ // 麦象一次只能筛一个状态,等待(0) 与处理中(1) 各拉一页后在内存合并分页。
+ BatchTaskPage waiting = consoleClient.batchTasksPage(uidsCsv, STATUS_WAITING, type, 1, ACTIVE_FETCH_SIZE);
+ BatchTaskPage processing = consoleClient.batchTasksPage(uidsCsv, STATUS_PROCESSING, type, 1, ACTIVE_FETCH_SIZE);
+ List active = new ArrayList<>(waiting.items());
+ active.addAll(processing.items());
+ active.sort(Comparator.comparing(BatchTaskItem::createTime,
+ Comparator.nullsLast(Comparator.reverseOrder())));
+ // total 用麦象回值(-1 哨兵或缺字段时回落为已拉到的行数),保证徽章说的是「在跑」而不是历史全量。
+ long total = effectiveTotal(waiting) + effectiveTotal(processing);
+ vo.setTotal(total);
+ if (total > active.size()) {
+ log.warn("[task-center] 变体采集在跑数 {} 超过单状态拉取上限 {},翻页尾部会缺行",
+ total, ACTIVE_FETCH_SIZE);
+ }
+ long from = (normalizedPage - 1) * normalizedSize;
+ if (from >= active.size()) {
+ return vo;
+ }
+ long to = Math.min(from + normalizedSize, active.size());
+ vo.setItems(assemble(active.subList((int) from, (int) to)));
return vo;
}
+ private static long effectiveTotal(BatchTaskPage page) {
+ return Math.max(page.total(), page.items().size());
+ }
+
/** uid → 账号名映射只对数字 uid 生效;麦象任务可能带非数字伪 uid(如 collect-27475)。 */
private List assemble(List items) {
Set userIds = new LinkedHashSet<>();
diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/taskcenter/mapper/TaskCenterQueryMapperSqlTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/taskcenter/mapper/TaskCenterQueryMapperSqlTest.java
index 56806c4b1..9e616f741 100644
--- a/backend-java/src/test/java/com/nanri/aiimage/modules/taskcenter/mapper/TaskCenterQueryMapperSqlTest.java
+++ b/backend-java/src/test/java/com/nanri/aiimage/modules/taskcenter/mapper/TaskCenterQueryMapperSqlTest.java
@@ -290,6 +290,27 @@ class TaskCenterQueryMapperSqlTest {
assertEquals(2, boundSql.getParameterMappings().size());
}
+ /**
+ * 关键词进度只从 result_json 抽两个数:整列拉回服务层会把 30s 轮询的载荷撑爆
+ * (result_json 装的是采集统计 + 明细),所以选列必须钉死成这三列。
+ */
+ @Test
+ void collectDataKeywordStatsReadsOnlyTwoJsonPaths() {
+ BoundSql boundSql = render("selectCollectDataKeywordStats", params("taskIds", List.of(1L, 2L)));
+ String sql = sqlOf(boundSql);
+
+ assertTrue(sql.startsWith("SELECT t.id AS taskId,"
+ + "JSON_UNQUOTE(JSON_EXTRACT(t.result_json,'$.totalRows')) AS totalRows,"
+ + "JSON_UNQUOTE(JSON_EXTRACT(t.result_json,'$.processedRows')) AS processedRows"
+ + " FROM biz_file_task t"), "只回三列,大 JSON 不出库:" + sql);
+ assertTrue(sql.contains("UPPER(t.module_type) = 'COLLECT_DATA'"), "只有采集数据有关键词进度");
+ assertTrue(sql.contains("AND t.result_json IS NOT NULL"), "没有回写过统计的任务不参与");
+ assertFalse(sql.contains("JSON_VALID"), "列是原生 JSON,不需要文本合法性守卫");
+ assertEquals(2, boundSql.getParameterMappings().size(), "一次批量按任务号取");
+ assertEquals(1L, boundSql.getAdditionalParameter("__frch_tid_0"));
+ assertEquals(2L, boundSql.getAdditionalParameter("__frch_tid_1"));
+ }
+
/** 店铺只有两个真来源:上架结果文件的 shop_name、逐店落行的模块的 source_filename。 */
@Test
void shopSourcesAreBatchedByTaskId() {
diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/taskcenter/service/TaskCenterQueryServiceTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/taskcenter/service/TaskCenterQueryServiceTest.java
index 3c5456474..62dc4f0c0 100644
--- a/backend-java/src/test/java/com/nanri/aiimage/modules/taskcenter/service/TaskCenterQueryServiceTest.java
+++ b/backend-java/src/test/java/com/nanri/aiimage/modules/taskcenter/service/TaskCenterQueryServiceTest.java
@@ -1,6 +1,7 @@
package com.nanri.aiimage.modules.taskcenter.service;
import com.nanri.aiimage.modules.taskcenter.mapper.TaskCenterQueryMapper;
+import com.nanri.aiimage.modules.taskcenter.model.dto.TaskCenterCollectStatsRow;
import com.nanri.aiimage.modules.taskcenter.model.dto.TaskCenterDeviceRow;
import com.nanri.aiimage.modules.taskcenter.model.dto.TaskCenterShopRow;
import com.nanri.aiimage.modules.taskcenter.model.dto.TaskCenterShopStatRow;
@@ -47,7 +48,9 @@ import static org.mockito.Mockito.when;
* ① 卡住只有一个窗口(进行中且 10 分钟无上报);
* ② 汇总卡的「在跑店铺」与店铺面板行数同源,且都不把「不挂店铺」桶算成店铺;
* ③ 每个进行中任务必须在面板里出现(无店铺归属的落合成桶,不许静默消失);
- * ④ 店铺只认真来源(上架文件 / 逐店落行文件),快照的 {@code current_scope_key} 是实例锁,不是店铺。
+ * ④ 店铺只认真来源(上架文件 / 逐店落行文件),快照的 {@code current_scope_key} 是实例锁,不是店铺;
+ * ⑤ 无快照的进度回退跟客户端「有没有进度条」对齐(用户 2026-10-04 定案):采集数据用关键词进度,
+ * 上架/删除ASIN/品牌沿用文件·行计数,客户端压根不画条的业务不许回退成误导的 0/1。
* SQL 本身由 TaskCenterQueryMapperSqlTest 守。
*/
@ExtendWith(MockitoExtension.class)
@@ -132,6 +135,14 @@ class TaskCenterQueryServiceTest {
return row;
}
+ private static TaskCenterCollectStatsRow collectStatsRow(long taskId, String totalRows, String processedRows) {
+ TaskCenterCollectStatsRow row = new TaskCenterCollectStatsRow();
+ row.setTaskId(taskId);
+ row.setTotalRows(totalRows);
+ row.setProcessedRows(processedRows);
+ return row;
+ }
+
private static TaskCenterDeviceRow deviceNameRow(String deviceId, String deviceName) {
TaskCenterDeviceRow row = new TaskCenterDeviceRow();
row.setDeviceId(deviceId);
@@ -480,6 +491,65 @@ class TaskCenterQueryServiceTest {
assertEquals(0L, second.getShopCount());
}
+ @Test
+ void collectDataRowWithoutSnapshotUsesKeywordProgress() {
+ LocalDateTime now = LocalDateTime.now();
+ TaskCenterTaskRow row = taskRow(1L, "COLLECT_DATA", "RUNNING", now, now);
+ row.setTotalCount(1L);
+ row.setSuccessCount(0L);
+
+ stubPage(List.of(row));
+ when(queryMapper.selectSnapshots(any())).thenReturn(List.of());
+ when(queryMapper.selectCollectDataKeywordStats(List.of(1L)))
+ .thenReturn(List.of(collectStatsRow(1L, "60", "12")));
+ stubPublishShops(List.of());
+ stubFileResultShops(List.of());
+
+ TaskCenterTaskRowVo vo = item(service.tasks(superScope(), new TaskCenterTaskQuery()), 1L);
+
+ assertEquals(60L, vo.getProgressTotal(), "总 = 关键词数(与客户端「关键词进度:第 X/N 个」同源)");
+ assertEquals(12L, vo.getProgressSuccess(), "已完成 = 已处理关键词数,不是输入文件数");
+ assertEquals(0L, vo.getProgressFailed());
+ }
+
+ @Test
+ void modulesWithoutClientProgressBarHaveNoFallbackCount() {
+ LocalDateTime now = LocalDateTime.now();
+ TaskCenterTaskRow priceTrack = taskRow(1L, "PRICE_TRACK", "RUNNING", now, now);
+ priceTrack.setTotalCount(1L);
+ priceTrack.setSuccessCount(0L);
+ TaskCenterTaskRow shopMatch = taskRow(2L, "SHOP_MATCH", "RUNNING", now, now);
+ shopMatch.setTotalCount(1L);
+
+ stubPage(List.of(priceTrack, shopMatch));
+ when(queryMapper.selectSnapshots(any())).thenReturn(List.of());
+ stubPublishShops(List.of());
+ stubFileResultShops(List.of());
+
+ TaskCenterTaskPageVo page = service.tasks(superScope(), new TaskCenterTaskQuery());
+
+ assertEquals(0L, item(page, 1L).getProgressTotal(), "跟价客户端没进度条 → 不回退文件数,前端画「—」");
+ assertEquals(0L, item(page, 2L).getProgressTotal(), "定时匹配同理");
+ verify(queryMapper, never()).selectCollectDataKeywordStats(any());
+ }
+
+ @Test
+ void collectDataWithoutStatsPayloadDegradesToNoProgress() {
+ LocalDateTime now = LocalDateTime.now();
+ TaskCenterTaskRow row = taskRow(1L, "COLLECT_DATA", "PENDING", now, now);
+ row.setTotalCount(1L);
+
+ stubPage(List.of(row));
+ when(queryMapper.selectSnapshots(any())).thenReturn(List.of());
+ when(queryMapper.selectCollectDataKeywordStats(List.of(1L))).thenReturn(List.of(
+ collectStatsRow(1L, "abc", null)));
+ stubPublishShops(List.of());
+ stubFileResultShops(List.of());
+
+ assertEquals(0L, item(service.tasks(superScope(), new TaskCenterTaskQuery()), 1L).getProgressTotal(),
+ "脏值/缺字段按无进度处理,不拿文件数兜底");
+ }
+
@Test
void shopSourcesDedupeAcrossBothTables() {
LocalDateTime now = LocalDateTime.now();
diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/taskcenter/service/TaskCenterVariantServiceTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/taskcenter/service/TaskCenterVariantServiceTest.java
index 8e66f9bde..4c63acbdf 100644
--- a/backend-java/src/test/java/com/nanri/aiimage/modules/taskcenter/service/TaskCenterVariantServiceTest.java
+++ b/backend-java/src/test/java/com/nanri/aiimage/modules/taskcenter/service/TaskCenterVariantServiceTest.java
@@ -6,6 +6,7 @@ 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;
@@ -29,7 +30,8 @@ import static org.mockito.Mockito.when;
/**
* 变体采集页签的 Java 侧口径:可见用户 → uid 集合(逗号拼接、排序稳定)、
- * 分页归一化、uid → 账号名映射、麦象不可达/未配置时返回空页。
+ * 分页归一化、uid → 账号名映射、麦象不可达/未配置时返回空页;
+ * 不传 status = 只看在跑(等待 0 ∪ 处理中 1 合并,历史终态不进默认口径)。
*/
@ExtendWith(MockitoExtension.class)
class TaskCenterVariantServiceTest {
@@ -52,6 +54,11 @@ 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);
@@ -106,17 +113,58 @@ class TaskCenterVariantServiceTest {
}
@Test
- void superAdminPassesNoUidFilterAndDefaultPaging() {
+ void superAdminWithoutStatusSeesOnlyActiveMergedFromBothStatuses() {
when(consoleClient.configured()).thenReturn(true);
- when(consoleClient.batchTasksPage(isNull(), isNull(), eq("variant-collection"), eq(1), eq(20)))
- .thenReturn(BatchTaskPage.EMPTY);
+ 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(queryMapper.selectUsernames(List.of(5L))).thenReturn(List.of(userRow(5L, "ali")));
TaskCenterVariantPageVo page = service.variantTasks(superScope(), null, null, null, null);
- assertEquals(0, page.getItems().size());
+ assertEquals(3, page.getTotal(), "不传 status = 在跑(等待+处理中)之和,不再是历史全量 106");
+ assertEquals(2, page.getItems().size());
assertEquals(1, page.getPage());
assertEquals(20, page.getPageSize());
- verify(queryMapper, never()).selectUsernames(any());
+ 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 哨兵不能把在跑数算成负数");
}
@Test
@@ -133,10 +181,12 @@ class TaskCenterVariantServiceTest {
@Test
void nonNumericUidAndUnknownStatusDegradeGracefully() {
when(consoleClient.configured()).thenReturn(true);
- when(consoleClient.batchTasksPage("5", null, "variant-collection", 1, 20))
+ when(consoleClient.batchTasksPage("5", 0, "variant-collection", 1, 200))
.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);
diff --git a/docs/specs/16-client-task-console.md b/docs/specs/16-client-task-console.md
index f8d5745e9..4815c4c6b 100644
--- a/docs/specs/16-client-task-console.md
+++ b/docs/specs/16-client-task-console.md
@@ -38,7 +38,8 @@
展示名回落 `device_log_file`(V127)
- 店铺库:`biz_shop_manage`(`shop_name` 唯一、`created_by_id` 归组,无软删列)
- 逐店落行的结果文件:`biz_file_result.source_filename`(仅 6 个模块按店铺建行)
-- 进度口径:`biz_task_progress_snapshot` 优先,文件计数兜底
+- 进度口径:`biz_task_progress_snapshot` 优先;无快照按模块分档(采集=关键词数、上架/删除ASIN/品牌=文件数、
+ 其余=无进度),见「进度口径」节
- 麦象 console:`MaixiangConsoleClient`(复用,token 查询参数鉴权)
## 数据口径
@@ -116,10 +117,15 @@ COLLECT_DATA / SIMILAR_ASIN / APPEARANCE_PATENT / BRAND 这些不落店铺,面
1. `biz_task_progress_snapshot`(task_id + module_type)优先:total/success/failed/pending +
`current_scope_key` + `message`;
-2. 无快照 → `biz_file_task` 文件计数(source/success/failed_file_count);
-3. BRAND → `brand_crawl_tasks.progress_current/progress_total`。
+2. BRAND 行 → `brand_crawl_tasks.progress_current/progress_total`;
+3. 无快照的采集数据(COLLECT_DATA)→ `biz_file_task.result_json` 的 `$.totalRows / $.processedRows`,
+ 与客户端「关键词进度:第 X/N 个」同一份数、同一比值口径(SQL 侧只抽这两列,大 JSON 不出库);
+4. 无快照的上架 / 删除ASIN → 行内文件计数(客户端进度条单位本就是文件);
+5. 其余无快照模块(跟价、定时匹配…)→ 进度置 0,**不回退文件数**:客户端在这些模块没有进度条,
+ 而单文件任务回退成「已完成 0 / 总 1」会被读成"一步没跑",是误导。
-前端展示「成功 X / 总 Y(失败 Z)」+ 百分比进度条。
+前端展示「已完成 X / 总 Y(失败 Z 徽标)」+ 百分比进度条;`progressTotal ≤ 0` 时只显示「—」,
+不画 0% 空进度轨(空轨="进度 0%",与"这里没有进度可看"是两件事)。
### 「是否正常在跑」判定
@@ -162,7 +168,7 @@ SQL 用 `@Select` 注解 mapper + 手写 LIMIT/OFFSET 分页(先例 `ImageVide
| `GET /api/admin/task-center/shop-options` | 店铺筛选候选:`biz_shop_manage` 去重店铺名(`LIMIT 2000`,只取 `shop_name` 一列,不带 account/password/zn_username) |
| `GET /api/admin/task-center/tasks` | 任务列表(分页 + 筛选:page、pageSize、username、moduleType、status、shop、startTime/endTime);字段:id、taskNo、moduleType、moduleLabel、status、userId、username、deviceId、webDevice、shopName、shopCount、createdAt、finishedAt、lastReportAt、progressTotal/progressSuccess/progressFailed、currentScope、message、stuck(`deviceName` 只在详情装配) |
| `GET /api/admin/task-center/tasks/detail` | 任务详情(参数 `taskNo`,品牌任务为 `brand-`):基础信息 + 进度快照 + 店铺/文件明细 |
-| `GET /api/admin/task-center/variant-tasks` | 变体采集列表(代理麦象 console):uid 集合 = 可见用户;page/pageSize + status/taskType 筛选 |
+| `GET /api/admin/task-center/variant-tasks` | 变体采集列表(代理麦象 console):uid 集合 = 可见用户;page/pageSize + status/taskType 筛选;**不传 status = 只看在跑**(等待 0 ∪ 处理中 1 各拉一页合并,历史终态不再展示) |
## 前端页面
@@ -178,7 +184,9 @@ SQL 用 `@Select` 注解 mapper + 手写 LIMIT/OFFSET 分页(先例 `ImageVide
(店铺已删、但任务还在的情形也筛得动);
- 页签一「客户端任务」:表格(账号、店铺、业务、状态、任务ID、开始、最近上报、结束、进度)
+ 详情 `el-drawer`(设备名、当前处理与分组明细只在详情出现;「操作」列已删,任务ID 单元格是详情入口);
-- 页签二「变体采集」:状态筛选 + 表格(账号、任务号、状态、开始/更新时间、进度文字 res_mes);
+- 页签二「变体采集」:**只看在跑**——状态下拉三项(在跑=不传 status/等待执行/处理中,历史终态不提供入口),
+ 表格(账号、任务号、状态、开始/更新时间、进度文字 res_mes);徽章是在跑条数,麦象单状态拉取上限 200,
+ 触顶时服务层记 warn 且翻页尾部会缺行;
- 30s 轮询:`document.hidden` 暂停、卸载清理、手动刷新按钮。
注册点: