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 eee3a0c27..a54d8fccc 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 @@ -4,8 +4,10 @@ import com.nanri.aiimage.common.api.ApiResponse; import com.nanri.aiimage.common.model.entity.AdminUserEntity; import com.nanri.aiimage.common.security.AdminAuthSupport; import com.nanri.aiimage.modules.permission.service.PermissionMenuService; +import com.nanri.aiimage.modules.taskcenter.model.dto.TaskCenterTaskQuery; import com.nanri.aiimage.modules.taskcenter.model.vo.TaskCenterDeviceVo; import com.nanri.aiimage.modules.taskcenter.model.vo.TaskCenterOverviewVo; +import com.nanri.aiimage.modules.taskcenter.model.vo.TaskCenterTaskPageVo; import com.nanri.aiimage.modules.taskcenter.service.TaskCenterQueryService; import com.nanri.aiimage.modules.taskcenter.service.TaskCenterScopeService; import io.swagger.v3.oas.annotations.Operation; @@ -52,6 +54,15 @@ public class AdminTaskCenterController { return ApiResponse.success(queryService.devices(scope)); } + @GetMapping("/tasks") + @Operation(summary = "任务分页列表", + description = "biz_file_task(12 个客户端模块)∪ brand_crawl_tasks 按创建时间倒序;" + + "店铺跨 4 个来源模糊匹配;进行中且 >10 分钟无更新标记 stuck。") + public ApiResponse tasks(HttpServletRequest request, TaskCenterTaskQuery query) { + TaskCenterScopeService.ScopeContext scope = resolveScope(request); + return ApiResponse.success(queryService.tasks(scope, query)); + } + private TaskCenterScopeService.ScopeContext resolveScope(HttpServletRequest request) { AdminUserEntity operator = adminAuthSupport.requireAdminOrInternal(request); permissionMenuService.requireClientTaskCenterAccess(operator); 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 190f45f9a..0a459dab3 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,12 +1,18 @@ package com.nanri.aiimage.modules.taskcenter.mapper; 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.TaskCenterSnapshotRow; +import com.nanri.aiimage.modules.taskcenter.model.dto.TaskCenterTaskRow; +import com.nanri.aiimage.modules.taskcenter.model.dto.TaskCenterUserRow; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.time.LocalDateTime; import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; /** * 客户端任务管理(后台看板)只读查询。 @@ -26,17 +32,32 @@ public interface TaskCenterQueryMapper { + "'SHOP_MATCH','PATROL_DELETE','QUERY_ASIN','WITHDRAW','APPEARANCE_PATENT'," + "'SIMILAR_ASIN','COLLECT_DATA','SHOP_DATA_CRAWL'"; - /** biz_file_task 进行中状态。 */ - String ACTIVE_STATUSES = "'PENDING','RUNNING','SCHEDULED'"; + /** + * 状态口径的单一来源。{@code @Select} 注解值必须是编译期常量,所以 SQL 里用下面 + * 的字符串字面量、Java 侧判卡住用这里的集合,两者由 + * {@code TaskCenterQueryMapperSqlTest.statusLiteralsStayInSyncWithSets} 守同步。 + */ + Set ACTIVE_STATUS_SET = Set.of("PENDING", "RUNNING", "SCHEDULED"); - /** biz_file_task 终态。 */ - String TERMINAL_STATUSES = "'SUCCESS','FAILED','CANCELLED','CANCELED'"; + /** biz_file_task 终态(CANCELLED 与历史脏值 CANCELED 并存)。 */ + Set TERMINAL_STATUS_SET = Set.of("SUCCESS", "FAILED", "CANCELLED", "CANCELED"); /** brand_crawl_tasks 进行中(该表状态小写)。 */ - String BRAND_ACTIVE_STATUSES = "'pending','running'"; + Set BRAND_ACTIVE_STATUS_SET = Set.of("pending", "running"); /** brand_crawl_tasks 终态。 */ - String BRAND_TERMINAL_STATUSES = "'success','failed','cancelled'"; + Set BRAND_TERMINAL_STATUS_SET = Set.of("success", "failed", "cancelled"); + + String ACTIVE_STATUSES = "'PENDING','RUNNING','SCHEDULED'"; + String TERMINAL_STATUSES = "'CANCELED','CANCELLED','FAILED','SUCCESS'"; + String BRAND_ACTIVE_STATUSES = "'pending','running'"; + String BRAND_TERMINAL_STATUSES = "'cancelled','failed','success'"; + + /** 拼 SQL IN 列表;排序保证渲染结果稳定(测试与日志可断言)。 */ + static String sqlList(Set values) { + return values.stream().sorted().map(value -> "'" + value + "'") + .collect(Collectors.joining(",")); + } /** * 任务设备原始行:近 N 天创建过任务、设备号非空(biz_file_task ∪ brand_crawl_tasks)。 @@ -180,4 +201,159 @@ public interface TaskCenterQueryMapper { + " GROUP BY u.deviceId" + "") List countRunningTasksByDevice(@Param("userIds") List userIds); + + /** 状态归一化:CANCELED 并入 CANCELLED(历史脏值),前端只认一套。 */ + String STATUS_T = "CASE WHEN UPPER(t.status) = 'CANCELED' THEN 'CANCELLED' ELSE UPPER(t.status) END"; + + /** 品牌表状态本是小写,统一 UPPER 输出。 */ + String STATUS_B = "CASE WHEN UPPER(b.status) = 'CANCELED' THEN 'CANCELLED' ELSE UPPER(b.status) END"; + + /** + * 店铺筛选:四个来源任一命中即可(去重靠 EXISTS,不需要 JOIN 放大行数)。 + * 四张表都有 task_id 索引,子查询由外层行驱动;request_json 兜底不参与筛选。 + */ + String SHOP_FILTER_T = "" + + " AND (EXISTS (SELECT 1 FROM biz_publish_file p" + + " WHERE p.task_id = t.id AND p.shop_name LIKE CONCAT('%', #{shop}, '%'))" + + " OR EXISTS (SELECT 1 FROM biz_task_result_item i" + + " WHERE i.task_id = t.id AND i.scope_key LIKE CONCAT('%', #{shop}, '%'))" + + " OR EXISTS (SELECT 1 FROM biz_file_result f" + + " WHERE f.task_id = t.id AND f.source_filename LIKE CONCAT('%', #{shop}, '%'))" + + " OR EXISTS (SELECT 1 FROM biz_task_progress_snapshot s" + + " WHERE s.task_id = t.id AND s.current_scope_key LIKE CONCAT('%', #{shop}, '%')))" + + ""; + + /** biz_file_task 分支筛选(账号范围 + 业务/状态/设备/时间范围 + 店铺)。 */ + String TASK_FILTER_T = " AND t.user_id IN" + + " #{uid}" + + " AND UPPER(t.module_type) = #{moduleType}" + + " AND " + STATUS_T + " = #{status}" + + " AND t.device_id = #{deviceId}" + + " AND t.created_at >= #{startTime}" + + " AND t.created_at <= #{endTime}" + + SHOP_FILTER_T; + + /** + * 品牌分支筛选:业务名固定 BRAND(选了别的业务则该分支恒空);品牌任务不存店铺, + * 带店铺筛选时直接排除——否则品牌 id 与 biz id 撞号会被 EXISTS 误判命中。 + */ + String TASK_FILTER_B = " AND b.user_id IN" + + " #{uid}" + + " AND 'BRAND' = #{moduleType}" + + " AND " + STATUS_B + " = #{status}" + + " AND b.device_id = #{deviceId}" + + " AND b.created_at >= #{startTime}" + + " AND b.created_at <= #{endTime}" + + " AND 1 = 0"; + + /** + * 任务列表行:biz_file_task(12 个客户端模块)∪ brand_crawl_tasks。 + * 品牌行 task_no 合成 {@code brand-},终态时用 updated_at 充当 finished_at。 + */ + String TASK_LIST_ROWS = "(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," + + " t.created_at AS createdAt, t.finished_at AS finishedAt, t.updated_at AS updatedAt," + + " t.source_file_count AS totalCount, t.success_file_count AS successCount," + + " t.failed_file_count AS failedCount, 0 AS brand" + + " FROM biz_file_task t" + + " WHERE t.module_type IN (" + CLIENT_MODULE_TYPES + ")" + + TASK_FILTER_T + + " UNION ALL" + + " SELECT b.id, CONCAT('brand-', b.id), 'BRAND', " + STATUS_B + ", b.user_id, b.device_id," + + " b.created_at, CASE WHEN b.status IN (" + BRAND_TERMINAL_STATUSES + ")" + + " THEN b.updated_at END, b.updated_at," + + " b.progress_total, b.progress_current, 0, 1" + + " FROM brand_crawl_tasks b" + + " WHERE 1 = 1" + + TASK_FILTER_B + + ")"; + + @Select("") + List selectTaskPage(@Param("userIds") List userIds, + @Param("moduleType") String moduleType, + @Param("status") String status, + @Param("deviceId") String deviceId, + @Param("shop") String shop, + @Param("startTime") LocalDateTime startTime, + @Param("endTime") LocalDateTime endTime, + @Param("limit") long limit, + @Param("offset") long offset); + + @Select("") + long countTaskPage(@Param("userIds") List userIds, + @Param("moduleType") String moduleType, + @Param("status") String status, + @Param("deviceId") String deviceId, + @Param("shop") String shop, + @Param("startTime") LocalDateTime startTime, + @Param("endTime") LocalDateTime endTime); + + /** 账号名筛选 → 用户号(与可见账号集合求交由服务层负责)。 */ + @Select("SELECT id FROM users WHERE username LIKE CONCAT('%', #{keyword}, '%') LIMIT 500") + List selectUserIdsByUsername(@Param("keyword") String keyword); + + @Select("") + List selectUsernames(@Param("userIds") List userIds); + + /** 设备展示名(不限窗口:设备名与任务时间无关)。 */ + @Select("") + List selectDeviceNames(@Param("deviceIds") List deviceIds); + + /** 店铺来源一:上架结果文件(shop_name)。 */ + @Select("") + List selectPublishShops(@Param("taskIds") List taskIds); + + /** 店铺来源二:任务结果分组(scope_key)。 */ + @Select("") + List selectResultItemShops(@Param("taskIds") List taskIds); + + /** 店铺来源三:结果文件名(跟价/定时匹配的文件名里带店铺)。 */ + @Select("") + List selectFileResultShops(@Param("taskIds") List taskIds); + + /** 进度快照(同时充当店铺来源四:current_scope_key)。按 (taskId, moduleType) 由服务层匹配。 */ + @Select("") + List selectSnapshots(@Param("taskIds") List taskIds); + + /** 店铺兜底:请求体 items[].shopName(只在前面四个来源都为空时按需拉取,避免列表查询带大 JSON 列)。 */ + @Select("") + List selectRequestJson(@Param("taskIds") List taskIds); } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/dto/TaskCenterShopRow.java b/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/dto/TaskCenterShopRow.java new file mode 100644 index 000000000..c5d04b007 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/dto/TaskCenterShopRow.java @@ -0,0 +1,11 @@ +package com.nanri.aiimage.modules.taskcenter.model.dto; + +import lombok.Data; + +/** 任务 → 店铺候选行(publish_file.shop_name / result_item.scope_key / file_result.source_filename / 快照 scope)。 */ +@Data +public class TaskCenterShopRow { + + private Long taskId; + private String shop; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/dto/TaskCenterSnapshotRow.java b/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/dto/TaskCenterSnapshotRow.java new file mode 100644 index 000000000..e41b27e09 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/dto/TaskCenterSnapshotRow.java @@ -0,0 +1,17 @@ +package com.nanri.aiimage.modules.taskcenter.model.dto; + +import lombok.Data; + +/** 进度快照行(biz_task_progress_snapshot),按 (taskId, moduleType) 与列表行匹配。 */ +@Data +public class TaskCenterSnapshotRow { + + private Long taskId; + private String moduleType; + private Long totalCount; + private Long successCount; + private Long failedCount; + private Long pendingCount; + private String currentScopeKey; + private String message; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/dto/TaskCenterTaskQuery.java b/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/dto/TaskCenterTaskQuery.java new file mode 100644 index 000000000..aaf9accdf --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/dto/TaskCenterTaskQuery.java @@ -0,0 +1,28 @@ +package com.nanri.aiimage.modules.taskcenter.model.dto; + +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; + +/** 任务列表查询条件(账号/业务/状态/设备/店铺/时间范围 + 分页)。 */ +@Data +public class TaskCenterTaskQuery { + + /** 账号名模糊匹配(users.username LIKE),命中后与可见账号求交。 */ + private String username; + private String moduleType; + /** 大写状态:PENDING/RUNNING/SCHEDULED/SUCCESS/FAILED/CANCELLED。 */ + private String status; + private String deviceId; + /** 店铺模糊匹配(跨 4 个来源的 EXISTS)。 */ + private String shop; + /** 任务创建时间(含),ISO-8601。 */ + @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) + private LocalDateTime startTime; + /** 任务创建时间(含),ISO-8601。 */ + @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) + private LocalDateTime endTime; + private Long page; + private Long pageSize; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/dto/TaskCenterTaskRow.java b/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/dto/TaskCenterTaskRow.java new file mode 100644 index 000000000..353aa516a --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/dto/TaskCenterTaskRow.java @@ -0,0 +1,33 @@ +package com.nanri.aiimage.modules.taskcenter.model.dto; + +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * 任务列表行:两表 UNION 的扁平行(biz_file_task ∪ brand_crawl_tasks)。 + * + *

{@code brand} 区分来源表:品牌任务 id 与 biz 表 id 可能撞号,快照匹配必须带上 moduleType。

+ */ +@Data +public class TaskCenterTaskRow { + + private Long id; + private String taskNo; + private String moduleType; + /** 已归一化的大写状态(CANCELED 归并到 CANCELLED)。 */ + private String status; + private Long userId; + private String deviceId; + private LocalDateTime createdAt; + /** 品牌表无 finished_at,终态时取 updated_at。 */ + private LocalDateTime finishedAt; + private LocalDateTime updatedAt; + /** 文件计数(biz 表 source/success/failed_file_count;品牌表 progress_total/progress_current)。 */ + private Long totalCount; + private Long successCount; + private Long failedCount; + private boolean brand; + /** 仅店铺兜底查询填充(列表主查询不拉大 JSON 列)。 */ + private String requestJson; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/dto/TaskCenterUserRow.java b/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/dto/TaskCenterUserRow.java new file mode 100644 index 000000000..729ba49ae --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/dto/TaskCenterUserRow.java @@ -0,0 +1,11 @@ +package com.nanri.aiimage.modules.taskcenter.model.dto; + +import lombok.Data; + +/** 账号展示名行(users)。 */ +@Data +public class TaskCenterUserRow { + + private Long userId; + private String username; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/vo/TaskCenterTaskPageVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/vo/TaskCenterTaskPageVo.java new file mode 100644 index 000000000..5b5b9063b --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/vo/TaskCenterTaskPageVo.java @@ -0,0 +1,24 @@ +package com.nanri.aiimage.modules.taskcenter.model.vo; + +import lombok.Data; + +import java.util.List; + +/** 任务列表分页结果。 */ +@Data +public class TaskCenterTaskPageVo { + + private List items; + private long total; + private long page; + private long pageSize; + + public static TaskCenterTaskPageVo empty(long page, long pageSize) { + TaskCenterTaskPageVo vo = new TaskCenterTaskPageVo(); + vo.setItems(List.of()); + vo.setTotal(0); + vo.setPage(page); + vo.setPageSize(pageSize); + return vo; + } +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/vo/TaskCenterTaskRowVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/vo/TaskCenterTaskRowVo.java new file mode 100644 index 000000000..258e9c918 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/vo/TaskCenterTaskRowVo.java @@ -0,0 +1,37 @@ +package com.nanri.aiimage.modules.taskcenter.model.vo; + +import lombok.Data; + +import java.time.LocalDateTime; + +/** 任务列表行(客户端任务页签)。 */ +@Data +public class TaskCenterTaskRowVo { + + private Long id; + private String taskNo; + private String moduleType; + /** 中文业务名(TaskModuleRegistry.labels())。 */ + private String moduleLabel; + /** 大写状态;品牌任务同样大写输出。 */ + private String status; + private Long userId; + private String username; + private String deviceId; + /** device_log_file 的设备名;查不到时前端按 deviceId 截断显示。 */ + private String deviceName; + private boolean webDevice; + /** 店铺:主来源的第一个店铺名(多店铺时前端显示「共 N 个」)。 */ + private String shopName; + private long shopCount; + private LocalDateTime createdAt; + private LocalDateTime finishedAt; + private long progressTotal; + private long progressSuccess; + private long progressFailed; + /** 当前处理对象(快照 current_scope_key)。 */ + private String currentScope; + private String message; + /** 进行中且超过 10 分钟无更新。 */ + private boolean stuck; +} 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 02ca0b8a5..91abb6724 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 @@ -1,9 +1,20 @@ package com.nanri.aiimage.modules.taskcenter.service; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.nanri.aiimage.common.module.TaskModuleRegistry; import com.nanri.aiimage.modules.taskcenter.mapper.TaskCenterQueryMapper; 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.TaskCenterSnapshotRow; +import com.nanri.aiimage.modules.taskcenter.model.dto.TaskCenterTaskQuery; +import com.nanri.aiimage.modules.taskcenter.model.dto.TaskCenterTaskRow; +import com.nanri.aiimage.modules.taskcenter.model.dto.TaskCenterUserRow; import com.nanri.aiimage.modules.taskcenter.model.vo.TaskCenterDeviceVo; import com.nanri.aiimage.modules.taskcenter.model.vo.TaskCenterOverviewVo; +import com.nanri.aiimage.modules.taskcenter.model.vo.TaskCenterTaskPageVo; +import com.nanri.aiimage.modules.taskcenter.model.vo.TaskCenterTaskRowVo; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -11,9 +22,15 @@ import java.time.LocalDate; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Comparator; +import java.util.HashMap; import java.util.LinkedHashMap; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Locale; import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.function.Function; /** * 客户端任务管理的只读查询。时间口径:卡住 10 分钟、在线 5 分钟、 @@ -27,6 +44,13 @@ public class TaskCenterQueryService { private static final long ONLINE_WINDOW_MINUTES = 5; private static final long TASK_DEVICE_WINDOW_DAYS = 30; private static final long LOG_DEVICE_WINDOW_DAYS = 7; + private static final long DEFAULT_PAGE_SIZE = 20; + private static final long MAX_PAGE_SIZE = 100; + + /** 进行中状态与 mapper SQL 同源,避免「计数说在跑、卡住判定说不在跑」。 */ + private static final Set ACTIVE_STATUSES = TaskCenterQueryMapper.ACTIVE_STATUS_SET; + + private static final ObjectMapper JSON = new ObjectMapper(); private final TaskCenterQueryMapper queryMapper; @@ -94,4 +118,282 @@ public class TaskCenterQueryService { return vo; }); } + + /** 任务列表:两表 UNION 分页 + 当页行的账号/设备名/店铺/进度装配。 */ + public TaskCenterTaskPageVo tasks(TaskCenterScopeService.ScopeContext scope, TaskCenterTaskQuery query) { + long page = query.getPage() == null || query.getPage() < 1 ? 1 : query.getPage(); + long pageSize = query.getPageSize() == null || query.getPageSize() < 1 ? DEFAULT_PAGE_SIZE + : Math.min(query.getPageSize(), MAX_PAGE_SIZE); + + List userIds = resolveUserIds(scope, query.getUsername()); + if (userIds != null && userIds.isEmpty()) { + return TaskCenterTaskPageVo.empty(page, pageSize); + } + + long total = queryMapper.countTaskPage(userIds, query.getModuleType(), query.getStatus(), + query.getDeviceId(), query.getShop(), query.getStartTime(), query.getEndTime()); + if (total <= 0) { + return TaskCenterTaskPageVo.empty(page, pageSize); + } + + List rows = queryMapper.selectTaskPage(userIds, query.getModuleType(), + query.getStatus(), query.getDeviceId(), query.getShop(), query.getStartTime(), + query.getEndTime(), pageSize, (page - 1) * pageSize); + if (rows == null || rows.isEmpty()) { + return TaskCenterTaskPageVo.empty(page, pageSize); + } + + TaskCenterTaskPageVo vo = new TaskCenterTaskPageVo(); + vo.setItems(assembleRows(rows, collectShops(rows))); + vo.setTotal(total); + vo.setPage(page); + vo.setPageSize(pageSize); + return vo; + } + + /** + * 账号名 → 可见账号集合:超管用命中的全部账号,非超管与可见集合求交。 + * 未传账号名时返回 {@code scope.sqlUserIds()}(超管为 null = 不裁剪)。 + */ + private List resolveUserIds(TaskCenterScopeService.ScopeContext scope, String username) { + if (username == null || username.isBlank()) { + return scope.sqlUserIds(); + } + List matched = safe(queryMapper.selectUserIdsByUsername(username.trim())).stream() + .filter(Objects::nonNull).toList(); + if (matched.isEmpty()) { + return List.of(); + } + if (scope.allUsers()) { + return matched; + } + List hit = matched.stream().filter(scope.visibleUserIds()::contains).toList(); + return hit.isEmpty() ? List.of() : hit; + } + + private List assembleRows(List rows, Map> shops) { + List deviceIds = rows.stream().map(TaskCenterTaskRow::getDeviceId) + .filter(id -> id != null && !id.isBlank()).distinct().toList(); + List userIds = rows.stream().map(TaskCenterTaskRow::getUserId) + .filter(id -> id != null && id > 0).distinct().toList(); + List rowIds = rows.stream().map(TaskCenterTaskRow::getId) + .filter(Objects::nonNull).distinct().toList(); + + Map usernames = userIds.isEmpty() ? Map.of() + : toUserNames(safe(queryMapper.selectUsernames(userIds))); + Map deviceNames = deviceIds.isEmpty() ? Map.of() + : toDeviceNames(safe(queryMapper.selectDeviceNames(deviceIds))); + Map snapshots = rowIds.isEmpty() ? Map.of() + : toSnapshots(safe(queryMapper.selectSnapshots(rowIds))); + Map> requestShops = collectRequestShops(rows, shops, snapshots); + + LocalDateTime now = LocalDateTime.now(); + List items = new ArrayList<>(rows.size()); + for (TaskCenterTaskRow row : rows) { + items.add(toRowVo(row, usernames, deviceNames, snapshots, shops, requestShops, now)); + } + return items; + } + + private static Map toUserNames(List rows) { + Map map = new HashMap<>(); + for (TaskCenterUserRow row : rows) { + if (row.getUserId() != null) { + map.put(row.getUserId(), row.getUsername()); + } + } + return map; + } + + private static Map toDeviceNames(List rows) { + Map map = new HashMap<>(); + for (TaskCenterDeviceRow row : rows) { + if (row.getDeviceId() != null && row.getDeviceName() != null) { + map.put(row.getDeviceId(), row.getDeviceName()); + } + } + return map; + } + + private static Map toSnapshots(List rows) { + Map map = new HashMap<>(); + for (TaskCenterSnapshotRow row : rows) { + if (row.getTaskId() != null && row.getModuleType() != null) { + map.put(snapshotKey(row.getTaskId(), row.getModuleType()), row); + } + } + return map; + } + + /** 品牌任务 id 与 biz 表 id 可能撞号,快照必须以 (moduleType, taskId) 为键。 */ + private static String snapshotKey(Long taskId, String moduleType) { + if (taskId == null || moduleType == null) { + return ""; + } + return moduleType.toUpperCase(Locale.ROOT) + "#" + taskId; + } + + /** + * 店铺候选:按来源优先级依次取第一个非空的来源 + * (上架结果文件 → 任务结果分组 → 结果文件名 → 进度快照 → 请求体 items[].shopName)。 + * 与各模块的主来源一致,未列出的模块自动降级到下一来源。品牌行不取店铺。 + */ + private Map> collectShops(List rows) { + List bizIds = rows.stream().filter(row -> !row.isBrand()) + .map(TaskCenterTaskRow::getId).filter(Objects::nonNull).distinct().toList(); + if (bizIds.isEmpty()) { + return Map.of(); + } + Map> shops = new HashMap<>(); + lazyMerge(bizIds, shops, missing -> toShops(safe(queryMapper.selectPublishShops(missing)))); + lazyMerge(bizIds, shops, missing -> toShops(safe(queryMapper.selectResultItemShops(missing)))); + lazyMerge(bizIds, shops, missing -> toShops(safe(queryMapper.selectFileResultShops(missing)))); + return shops; + } + + /** 只对仍缺店铺的任务打这个来源的批量查询;已命中的任务保持更高优先级。 */ + private void lazyMerge(List ids, Map> target, + Function, Map>> source) { + List missing = ids.stream().filter(id -> !target.containsKey(id)).toList(); + if (missing.isEmpty()) { + return; + } + for (Map.Entry> entry : source.apply(missing).entrySet()) { + target.putIfAbsent(entry.getKey(), entry.getValue()); + } + } + + private static Map> toShops(List rows) { + Map> map = new HashMap<>(); + for (TaskCenterShopRow row : rows) { + if (row.getTaskId() != null && row.getShop() != null && !row.getShop().isBlank()) { + map.computeIfAbsent(row.getTaskId(), key -> new ArrayList<>()).add(row.getShop().trim()); + } + } + return map; + } + + /** 兜底:前四个来源都空时批量拉一次 request_json(列表主查询刻意不拉大 JSON 列)。 */ + private Map> collectRequestShops(List rows, + Map> shops, + Map snapshots) { + List candidates = rows.stream() + .filter(row -> !row.isBrand() && row.getId() != null) + .filter(row -> { + List hit = shops.get(row.getId()); + if (hit != null && !hit.isEmpty()) { + return false; + } + TaskCenterSnapshotRow snapshot = snapshots.get(snapshotKey(row.getId(), row.getModuleType())); + return snapshot == null || snapshot.getCurrentScopeKey() == null + || snapshot.getCurrentScopeKey().isBlank(); + }) + .map(TaskCenterTaskRow::getId).distinct().toList(); + if (candidates.isEmpty()) { + return Map.of(); + } + Map> result = new HashMap<>(); + for (TaskCenterTaskRow row : safe(queryMapper.selectRequestJson(candidates))) { + if (row.getId() == null || row.getRequestJson() == null) { + continue; + } + List names = extractShopNames(row.getRequestJson()); + if (!names.isEmpty()) { + result.put(row.getId(), names); + } + } + return result; + } + + /** 解析 request_json 里的 items[].shopName(去重保序,容忍结构不认识)。 */ + private static List extractShopNames(String requestJson) { + if (requestJson.isBlank()) { + return List.of(); + } + try { + JsonNode items = JSON.readTree(requestJson).path("items"); + if (!items.isArray()) { + return List.of(); + } + LinkedHashSet names = new LinkedHashSet<>(); + for (JsonNode item : items) { + String shopName = item.path("shopName").asText(null); + if (shopName != null && !shopName.isBlank()) { + names.add(shopName.trim()); + } + } + return List.copyOf(names); + } catch (JsonProcessingException ex) { + return List.of(); + } + } + + private TaskCenterTaskRowVo toRowVo(TaskCenterTaskRow row, + Map usernames, + Map deviceNames, + Map snapshots, + Map> shops, + Map> requestShops, + LocalDateTime now) { + TaskCenterTaskRowVo vo = new TaskCenterTaskRowVo(); + vo.setId(row.getId()); + vo.setTaskNo(row.getTaskNo()); + vo.setModuleType(row.getModuleType()); + vo.setModuleLabel(TaskModuleRegistry.labelOf(row.getModuleType())); + vo.setStatus(row.getStatus()); + vo.setUserId(row.getUserId()); + vo.setUsername(row.getUserId() == null ? null : usernames.get(row.getUserId())); + vo.setDeviceId(row.getDeviceId()); + vo.setDeviceName(row.getDeviceId() == null ? null : deviceNames.get(row.getDeviceId())); + vo.setWebDevice(row.getDeviceId() != null && row.getDeviceId().startsWith("web-")); + vo.setCreatedAt(row.getCreatedAt()); + vo.setFinishedAt(row.getFinishedAt()); + vo.setStuck(isStuck(row, now)); + + TaskCenterSnapshotRow snapshot = snapshots.get(snapshotKey(row.getId(), row.getModuleType())); + if (snapshot != null) { + vo.setProgressTotal(nullToZero(snapshot.getTotalCount())); + vo.setProgressSuccess(nullToZero(snapshot.getSuccessCount())); + vo.setProgressFailed(nullToZero(snapshot.getFailedCount())); + vo.setCurrentScope(snapshot.getCurrentScopeKey()); + vo.setMessage(snapshot.getMessage()); + } else { + vo.setProgressTotal(nullToZero(row.getTotalCount())); + vo.setProgressSuccess(nullToZero(row.getSuccessCount())); + vo.setProgressFailed(nullToZero(row.getFailedCount())); + } + + // 品牌检测按关键字执行、不落店铺;品牌行的 current_scope_key 是品牌名,不能当店铺用。 + if (!row.isBrand()) { + List rowShops = shops.get(row.getId()); + if ((rowShops == null || rowShops.isEmpty()) && snapshot != null + && snapshot.getCurrentScopeKey() != null && !snapshot.getCurrentScopeKey().isBlank()) { + rowShops = List.of(snapshot.getCurrentScopeKey().trim()); + } + if (rowShops == null || rowShops.isEmpty()) { + rowShops = requestShops.get(row.getId()); + } + if (rowShops != null && !rowShops.isEmpty()) { + vo.setShopName(rowShops.get(0)); + vo.setShopCount(rowShops.size()); + } + } + return vo; + } + + private static boolean isStuck(TaskCenterTaskRow row, LocalDateTime now) { + if (row.getStatus() == null || !ACTIVE_STATUSES.contains(row.getStatus())) { + return false; + } + LocalDateTime lastSeen = row.getUpdatedAt() == null ? row.getCreatedAt() : row.getUpdatedAt(); + return lastSeen != null && lastSeen.isBefore(now.minusMinutes(STUCK_IDLE_MINUTES)); + } + + private static long nullToZero(Long value) { + return value == null ? 0L : value; + } + + private static List safe(List rows) { + return rows == null ? List.of() : rows; + } } 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 c9c12b2f9..cc186623d 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 @@ -169,4 +169,147 @@ class TaskCenterQueryMapperSqlTest { assertFalse(sql.contains("'SPLIT'")); assertFalse(sql.contains("'CONVERT'")); } + + // ── 任务列表(Task 5)────────────────────────────────────────────── + + @Test + void taskListUnionsBizAndBrandWithoutTouchingRequestJson() { + BoundSql boundSql = render("selectTaskPage", + params("userIds", null, "moduleType", null, "status", null, "deviceId", null, + "shop", null, "startTime", null, "endTime", null, "limit", 20L, "offset", 0L)); + String sql = sqlOf(boundSql); + + assertTrue(sql.contains("SELECT m.* FROM(SELECT t.id AS id")); + assertTrue(sql.contains("UNION ALL")); + assertTrue(sql.contains("CONCAT('brand-',b.id)"), "品牌任务号合成 brand-"); + assertTrue(sql.contains("CASE WHEN UPPER(t.status) = 'CANCELED' THEN 'CANCELLED' ELSE UPPER(t.status) END AS status"), + "历史脏值 CANCELED 并入 CANCELLED"); + assertTrue(sql.contains("0 AS brand")); + assertTrue(sql.contains("b.progress_total,b.progress_current,0,1"), "品牌进度取自有列"); + assertTrue(sql.contains("CASE WHEN b.status IN('cancelled','failed','success') THEN b.updated_at END"), + "品牌表无 finished_at,终态用 updated_at"); + assertTrue(sql.contains("ORDER BY m.createdAt DESC,m.id DESC")); + assertTrue(sql.contains("LIMIT ? OFFSET ?")); + assertEquals(2, boundSql.getParameterMappings().size(), "只有分页两个参数"); + assertFalse(sql.contains("request_json"), "列表主查询不拉大 JSON 列"); + } + + @Test + void taskListFiltersReachBothBranchesAndBrandDropsShopFilter() { + BoundSql boundSql = render("selectTaskPage", + params("userIds", List.of(5L, 11L), "moduleType", "PUBLISH", "status", "RUNNING", + "deviceId", "pc-0001", "shop", "旗舰店", + "startTime", LocalDateTime.of(2026, 9, 1, 0, 0), + "endTime", LocalDateTime.of(2026, 9, 28, 0, 0), + "limit", 20L, "offset", 20L)); + String sql = sqlOf(boundSql); + + assertTrue(sql.contains("AND UPPER(t.module_type) = ?")); + assertTrue(sql.contains("AND t.user_id IN(?,?)")); + assertTrue(sql.contains("AND b.user_id IN(?,?)")); + assertTrue(sql.contains("AND t.device_id = ?")); + assertTrue(sql.contains("AND t.created_at >= ?")); + assertTrue(sql.contains("AND t.created_at <= ?")); + assertTrue(sql.contains("AND 'BRAND' = ?"), "选了具体业务时品牌分支恒空"); + assertTrue(sql.contains("AND 1 = 0"), "品牌任务不存店铺:带店铺筛选直接排除该分支"); + + assertTrue(sql.contains("EXISTS(SELECT 1 FROM biz_publish_file p WHERE p.task_id = t.id AND p.shop_name LIKE CONCAT('%',?,'%'))")); + assertTrue(sql.contains("EXISTS(SELECT 1 FROM biz_task_result_item i WHERE i.task_id = t.id AND i.scope_key LIKE CONCAT('%',?,'%'))")); + assertTrue(sql.contains("EXISTS(SELECT 1 FROM biz_file_result f WHERE f.task_id = t.id AND f.source_filename LIKE CONCAT('%',?,'%'))")); + assertTrue(sql.contains("EXISTS(SELECT 1 FROM biz_task_progress_snapshot s WHERE s.task_id = t.id AND s.current_scope_key LIKE CONCAT('%',?,'%'))")); + + assertEquals(5L, boundSql.getAdditionalParameter("__frch_uid_0")); + assertEquals(20, boundSql.getParameterMappings().size(), + "biz 11(账号×2/业务/状态/设备/起止/店铺×4)+ 品牌 7(账号×2/业务/状态/设备/起止)+ 分页 2"); + } + + @Test + void taskListWithoutFiltersOnlyBindsPaging() { + BoundSql boundSql = render("selectTaskPage", + params("userIds", null, "moduleType", null, "status", null, "deviceId", null, + "shop", null, "startTime", null, "endTime", null, "limit", 100L, "offset", 0L)); + String sql = sqlOf(boundSql); + + assertFalse(sql.contains("AND UPPER(t.module_type)"), "未选业务不加条件"); + assertFalse(sql.contains("AND 1 = 0"), "未选店铺时品牌分支照常入列"); + assertFalse(sql.contains("EXISTS"), "未选店铺不做 EXISTS 子查询"); + assertFalse(sql.contains("__frch"), "超管不渲染账号占位符"); + assertEquals(2, boundSql.getParameterMappings().size()); + } + + @Test + void taskCountSharesTheUnionBody() { + BoundSql boundSql = render("countTaskPage", + params("userIds", null, "moduleType", "BRAND", "status", "RUNNING", "deviceId", null, + "shop", null, "startTime", null, "endTime", null)); + String sql = sqlOf(boundSql); + + assertTrue(sql.contains("SELECT COUNT(*) FROM(SELECT t.id AS id")); + assertTrue(sql.contains("brand_crawl_tasks")); + assertTrue(sql.contains("AND 'BRAND' = ?")); + assertTrue(sql.contains("AND CASE WHEN UPPER(b.status) = 'CANCELED' THEN 'CANCELLED' ELSE UPPER(b.status) END = ?")); + assertEquals(4, boundSql.getParameterMappings().size(), "业务 + 状态在两张表各绑一次"); + } + + @Test + void usernameLookupIsFuzzyAndBounded() { + BoundSql boundSql = render("selectUserIdsByUsername", params("keyword", "ali")); + String sql = sqlOf(boundSql); + + assertTrue(sql.contains("WHERE username LIKE CONCAT('%',?,'%')")); + assertTrue(sql.contains("LIMIT 500"), "模糊匹配有上界,防全表命中"); + } + + @Test + void snapshotLookupKeepsModuleTypeForCollisionSafety() { + BoundSql boundSql = render("selectSnapshots", params("taskIds", List.of(7L, 8L))); + String sql = sqlOf(boundSql); + + assertTrue(sql.contains("s.module_type AS moduleType"), "品牌 id 与 biz id 可能撞号,必须带业务名"); + assertTrue(sql.contains("s.current_scope_key AS currentScopeKey")); + assertEquals(2, boundSql.getParameterMappings().size()); + } + + @Test + void shopSourcesAreBatchedByTaskId() { + assertTrue(sqlOf(render("selectPublishShops", params("taskIds", List.of(1L)))) + .contains("GROUP BY p.task_id,p.shop_name")); + assertTrue(sqlOf(render("selectResultItemShops", params("taskIds", List.of(1L)))) + .contains("GROUP BY i.task_id,i.scope_key")); + assertTrue(sqlOf(render("selectFileResultShops", params("taskIds", List.of(1L)))) + .contains("GROUP BY f.task_id,f.source_filename")); + } + + @Test + void requestJsonLookupIsBatchedAndNarrow() { + BoundSql boundSql = render("selectRequestJson", params("taskIds", List.of(1L, 2L))); + String sql = sqlOf(boundSql); + + assertTrue(sql.contains("t.request_json AS requestJson")); + assertTrue(sql.contains("IN(?,?)"), "一次批量拉取,避免逐行 N+1"); + assertEquals(2, boundSql.getParameterMappings().size()); + } + + @Test + void deviceNameLookupAggregatesWithoutWindow() { + BoundSql boundSql = render("selectDeviceNames", params("deviceIds", List.of("dev-a"))); + String sql = sqlOf(boundSql); + + assertTrue(sql.contains("MAX(d.device_name) AS deviceName")); + assertTrue(sql.contains("GROUP BY d.device_id")); + assertFalse(sql.contains("last_upload_at"), "设备名与任务时间无关,不限窗口"); + } + + /** 注解值必须是编译期常量,SQL 里只能写字面量;这条测试守住它与 Java 集合不漂移。 */ + @Test + void statusLiteralsStayInSyncWithSets() { + assertEquals(TaskCenterQueryMapper.sqlList(TaskCenterQueryMapper.ACTIVE_STATUS_SET), + TaskCenterQueryMapper.ACTIVE_STATUSES, "进行中状态(服务层判卡住复用同一集合)"); + assertEquals(TaskCenterQueryMapper.sqlList(TaskCenterQueryMapper.TERMINAL_STATUS_SET), + TaskCenterQueryMapper.TERMINAL_STATUSES); + assertEquals(TaskCenterQueryMapper.sqlList(TaskCenterQueryMapper.BRAND_ACTIVE_STATUS_SET), + TaskCenterQueryMapper.BRAND_ACTIVE_STATUSES); + assertEquals(TaskCenterQueryMapper.sqlList(TaskCenterQueryMapper.BRAND_TERMINAL_STATUS_SET), + TaskCenterQueryMapper.BRAND_TERMINAL_STATUSES); + } } 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 8b49b2683..a3bcf0d95 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 @@ -2,8 +2,14 @@ package com.nanri.aiimage.modules.taskcenter.service; import com.nanri.aiimage.modules.taskcenter.mapper.TaskCenterQueryMapper; 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.TaskCenterSnapshotRow; +import com.nanri.aiimage.modules.taskcenter.model.dto.TaskCenterTaskQuery; +import com.nanri.aiimage.modules.taskcenter.model.dto.TaskCenterTaskRow; import com.nanri.aiimage.modules.taskcenter.model.vo.TaskCenterDeviceVo; import com.nanri.aiimage.modules.taskcenter.model.vo.TaskCenterOverviewVo; +import com.nanri.aiimage.modules.taskcenter.model.vo.TaskCenterTaskPageVo; +import com.nanri.aiimage.modules.taskcenter.model.vo.TaskCenterTaskRowVo; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; @@ -21,15 +27,19 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.isNull; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; /** * 只读查询的 Java 侧口径:时间窗口(卡住 10 分钟 / 在线 5 分钟 / 任务 30 天 / 日志 7 天)、 - * 设备花名册合并与在线判定、账号范围透传。SQL 本身由 TaskCenterQueryMapperSqlTest 守。 + * 设备花名册合并与在线判定、账号范围透传、任务列表装配(店铺来源优先级 / 快照匹配 / 分页)。 + * SQL 本身由 TaskCenterQueryMapperSqlTest 守。 */ @ExtendWith(MockitoExtension.class) class TaskCenterQueryServiceTest { @@ -216,4 +226,236 @@ class TaskCenterQueryServiceTest { verify(queryMapper).listRosterDevices(eq(List.of(5L)), any(), any()); verify(queryMapper).countRunningTasksByDevice(eq(List.of(5L))); } + + // ── 任务列表(Task 5)────────────────────────────────────────────── + + private static TaskCenterTaskRow taskRow(long id, String moduleType, String status, + LocalDateTime createdAt, LocalDateTime updatedAt) { + TaskCenterTaskRow row = new TaskCenterTaskRow(); + row.setId(id); + row.setTaskNo(moduleType + "-" + id); + row.setModuleType(moduleType); + row.setStatus(status); + row.setCreatedAt(createdAt); + row.setUpdatedAt(updatedAt); + return row; + } + + private static TaskCenterSnapshotRow snapshotRow(long taskId, String moduleType, long total, + long success, long failed, String scope, String message) { + TaskCenterSnapshotRow row = new TaskCenterSnapshotRow(); + row.setTaskId(taskId); + row.setModuleType(moduleType); + row.setTotalCount(total); + row.setSuccessCount(success); + row.setFailedCount(failed); + row.setCurrentScopeKey(scope); + row.setMessage(message); + return row; + } + + private static TaskCenterShopRow shopRow(long taskId, String shop) { + TaskCenterShopRow row = new TaskCenterShopRow(); + row.setTaskId(taskId); + row.setShop(shop); + return row; + } + + private static TaskCenterTaskRowVo item(TaskCenterTaskPageVo page, long id) { + return page.getItems().stream().filter(row -> Long.valueOf(id).equals(row.getId())) + .findFirst().orElseThrow(() -> new AssertionError("任务缺失: " + id)); + } + + private void stubPage(List rows) { + when(queryMapper.countTaskPage(any(), any(), any(), any(), any(), any(), any())) + .thenReturn((long) rows.size()); + when(queryMapper.selectTaskPage(any(), any(), any(), any(), any(), any(), any(), anyLong(), anyLong())) + .thenReturn(rows); + } + + @Test + void usernameFilterIntersectsVisibleUsers() { + when(queryMapper.selectUserIdsByUsername("ali")).thenReturn(List.of(11L, 99L)); + when(queryMapper.countTaskPage(any(), any(), any(), any(), any(), any(), any())).thenReturn(0L); + + TaskCenterTaskQuery query = new TaskCenterTaskQuery(); + query.setUsername("ali"); + TaskCenterTaskPageVo page = service.tasks(scoped(5L, 11L), query); + + assertEquals(0, page.getTotal(), "只有 11 在本组可见集合内,99 越界"); + verify(queryMapper).countTaskPage(argThat(ids -> List.of(11L).equals(ids)), + isNull(), isNull(), isNull(), isNull(), isNull(), isNull()); + } + + @Test + void usernameFilterNoHitSkipsQueriesEntirely() { + when(queryMapper.selectUserIdsByUsername("ghost")).thenReturn(List.of()); + + TaskCenterTaskQuery query = new TaskCenterTaskQuery(); + query.setUsername("ghost"); + TaskCenterTaskPageVo page = service.tasks(scoped(5L), query); + + assertEquals(0, page.getTotal()); + assertEquals(1, page.getPage()); + assertEquals(20, page.getPageSize(), "空页也带默认分页口径"); + verify(queryMapper, never()).countTaskPage(any(), any(), any(), any(), any(), any(), any()); + } + + @Test + void superAdminUsernameFilterKeepsAllMatches() { + when(queryMapper.selectUserIdsByUsername("ali")).thenReturn(List.of(11L, 99L)); + when(queryMapper.countTaskPage(any(), any(), any(), any(), any(), any(), any())).thenReturn(0L); + + TaskCenterTaskQuery query = new TaskCenterTaskQuery(); + query.setUsername("ali"); + service.tasks(superScope(), query); + + verify(queryMapper).countTaskPage(argThat(ids -> List.of(11L, 99L).equals(ids)), + isNull(), isNull(), isNull(), isNull(), isNull(), isNull()); + } + + @Test + void filtersPassThroughAndPageSizeIsCapped() { + LocalDateTime start = LocalDateTime.of(2026, 9, 1, 0, 0); + LocalDateTime end = LocalDateTime.of(2026, 9, 28, 23, 59); + when(queryMapper.countTaskPage(any(), any(), any(), any(), any(), any(), any())).thenReturn(1L); + when(queryMapper.selectTaskPage(any(), any(), any(), any(), any(), any(), any(), anyLong(), anyLong())) + .thenReturn(List.of()); + + TaskCenterTaskQuery query = new TaskCenterTaskQuery(); + query.setModuleType("PUBLISH"); + query.setStatus("RUNNING"); + query.setDeviceId("pc-0001"); + query.setShop("旗舰店"); + query.setStartTime(start); + query.setEndTime(end); + query.setPage(3L); + query.setPageSize(500L); + + service.tasks(superScope(), query); + + verify(queryMapper).countTaskPage(isNull(), eq("PUBLISH"), eq("RUNNING"), eq("pc-0001"), + eq("旗舰店"), eq(start), eq(end)); + verify(queryMapper).selectTaskPage(isNull(), eq("PUBLISH"), eq("RUNNING"), eq("pc-0001"), + eq("旗舰店"), eq(start), eq(end), eq(100L), eq(200L)); + } + + @Test + void stuckFlagBoundary() { + LocalDateTime now = LocalDateTime.now(); + List rows = List.of( + taskRow(1L, "PUBLISH", "RUNNING", now.minusHours(1), now.minusMinutes(9).minusSeconds(59)), + taskRow(2L, "PUBLISH", "RUNNING", now.minusHours(1), now.minusMinutes(10).minusSeconds(1)), + taskRow(3L, "PUBLISH", "SUCCESS", now.minusHours(3), now.minusHours(2)), + taskRow(4L, "PUBLISH", "RUNNING", now.minusMinutes(11), null)); + stubPage(rows); + when(queryMapper.selectSnapshots(any())).thenReturn(List.of()); + when(queryMapper.selectPublishShops(any())).thenReturn(List.of()); + when(queryMapper.selectResultItemShops(any())).thenReturn(List.of()); + when(queryMapper.selectFileResultShops(any())).thenReturn(List.of()); + when(queryMapper.selectRequestJson(any())).thenReturn(List.of()); + + TaskCenterTaskPageVo page = service.tasks(superScope(), new TaskCenterTaskQuery()); + + assertEquals(4, page.getTotal()); + assertFalse(item(page, 1L).isStuck(), "进行中 9:59 未更新 → 不算卡住"); + assertTrue(item(page, 2L).isStuck(), "进行中 10:01 未更新 → 卡住"); + assertFalse(item(page, 3L).isStuck(), "终态不判卡住"); + assertTrue(item(page, 4L).isStuck(), "updated_at 缺失时用 created_at 判老"); + } + + @Test + void progressAndShopsPreferSnapshotThenFileCount() { + LocalDateTime now = LocalDateTime.now(); + TaskCenterTaskRow plain = taskRow(1L, "PUBLISH", "SUCCESS", now, now); + plain.setTotalCount(10L); + plain.setSuccessCount(7L); + plain.setFailedCount(3L); + TaskCenterTaskRow snapshotted = taskRow(2L, "PUBLISH", "RUNNING", now, now); + snapshotted.setTotalCount(99L); + + stubPage(List.of(plain, snapshotted)); + when(queryMapper.selectSnapshots(any())).thenReturn(List.of( + snapshotRow(2L, "PUBLISH", 20L, 15L, 2L, "快照店铺", "处理中"))); + when(queryMapper.selectPublishShops(any())).thenReturn(List.of( + shopRow(1L, "店铺甲"), shopRow(1L, "店铺乙"))); + when(queryMapper.selectResultItemShops(any())).thenReturn(List.of(shopRow(2L, "结果分组店铺"))); + + TaskCenterTaskPageVo page = service.tasks(superScope(), new TaskCenterTaskQuery()); + + TaskCenterTaskRowVo first = item(page, 1L); + assertEquals(10L, first.getProgressTotal(), "无快照时用行内文件计数"); + assertEquals(7L, first.getProgressSuccess()); + assertEquals(3L, first.getProgressFailed()); + assertEquals("店铺甲", first.getShopName(), "上架结果文件优先,且取第一个店铺"); + assertEquals(2L, first.getShopCount(), "同任务多店铺计数"); + assertNull(first.getCurrentScope()); + + TaskCenterTaskRowVo second = item(page, 2L); + assertEquals(20L, second.getProgressTotal(), "有快照优先用快照"); + assertEquals(15L, second.getProgressSuccess()); + assertEquals(2L, second.getProgressFailed()); + assertEquals("处理中", second.getMessage()); + assertEquals("快照店铺", second.getCurrentScope()); + assertEquals("结果分组店铺", second.getShopName(), "无上架文件时降级到任务结果分组"); + } + + @Test + void brandRowKeepsItsOwnIdentityWhenIdsCollide() { + LocalDateTime now = LocalDateTime.now(); + TaskCenterTaskRow biz = taskRow(7L, "PUBLISH", "SUCCESS", now, now); + TaskCenterTaskRow brand = taskRow(7L, "BRAND", "FAILED", now, now); + brand.setTaskNo("brand-7"); + brand.setBrand(true); + + stubPage(List.of(biz, brand)); + when(queryMapper.selectSnapshots(any())).thenReturn(List.of( + snapshotRow(7L, "PUBLISH", 30L, 30L, 0L, "上架快照店铺", null), + snapshotRow(7L, "BRAND", 5L, 1L, 4L, "品牌关键字", null))); + when(queryMapper.selectPublishShops(any())).thenReturn(List.of(shopRow(7L, "店铺甲"))); + + TaskCenterTaskPageVo page = service.tasks(superScope(), new TaskCenterTaskQuery()); + + TaskCenterTaskRowVo bizVo = page.getItems().get(0); + TaskCenterTaskRowVo brandVo = page.getItems().get(1); + + assertEquals("上架", bizVo.getModuleLabel()); + assertEquals(30L, bizVo.getProgressTotal(), "biz 行取 (PUBLISH,id) 快照"); + assertEquals("店铺甲", bizVo.getShopName()); + + assertEquals("品牌检测", brandVo.getModuleLabel()); + assertEquals("brand-7", brandVo.getTaskNo()); + assertEquals("FAILED", brandVo.getStatus(), "品牌状态大写输出"); + assertEquals(5L, brandVo.getProgressTotal(), "品牌行按 (BRAND,id) 取快照"); + assertEquals(1L, brandVo.getProgressSuccess()); + assertEquals(4L, brandVo.getProgressFailed()); + assertNull(brandVo.getShopName(), "撞号时品牌行不得继承 biz 行的店铺"); + assertEquals(0L, brandVo.getShopCount()); + assertFalse(brandVo.isStuck(), "终态品牌任务不判卡住"); + } + + @Test + void requestJsonFallbackParsesShopNamesOnce() { + LocalDateTime now = LocalDateTime.now(); + stubPage(List.of(taskRow(1L, "COLLECT_DATA", "SUCCESS", now, now), + taskRow(2L, "COLLECT_DATA", "SUCCESS", now, now))); + when(queryMapper.selectSnapshots(any())).thenReturn(List.of()); + when(queryMapper.selectPublishShops(any())).thenReturn(List.of()); + when(queryMapper.selectResultItemShops(any())).thenReturn(List.of()); + when(queryMapper.selectFileResultShops(any())).thenReturn(List.of()); + TaskCenterTaskRow raw1 = new TaskCenterTaskRow(); + raw1.setId(1L); + raw1.setRequestJson("{\"items\":[{\"shopName\":\"美国店\"},{\"shopName\":\"日本店\"},{\"shopName\":\"美国店\"}]}"); + TaskCenterTaskRow raw2 = new TaskCenterTaskRow(); + raw2.setId(2L); + raw2.setRequestJson("not-json"); + when(queryMapper.selectRequestJson(any())).thenReturn(List.of(raw1, raw2)); + + TaskCenterTaskPageVo page = service.tasks(superScope(), new TaskCenterTaskQuery()); + + assertEquals("美国店", item(page, 1L).getShopName(), "取第一个店铺"); + assertEquals(2L, item(page, 1L).getShopCount(), "去重后计数"); + assertNull(item(page, 2L).getShopName(), "结构不认识时不炸,店铺留空"); + verify(queryMapper, times(1)).selectRequestJson(any()); + } } diff --git a/docs/specs/16-client-task-console.md b/docs/specs/16-client-task-console.md index b376f686e..c4495db9f 100644 --- a/docs/specs/16-client-task-console.md +++ b/docs/specs/16-client-task-console.md @@ -76,17 +76,20 @@ ### 店铺口径 -任务本身不存店铺,按模块从既有数据聚合;多店铺统一显示「当前店铺 + 共 N 个」: +任务本身不存店铺(品牌检测按关键字执行,不落店铺),按**来源优先级链**取第一个非空的来源; +多店铺统一显示「当前店铺 + 共 N 个」: -| 模块 | 店铺来源 | -|---|---| -| PUBLISH | `biz_publish_file.shop_name`(按 task_id 聚合 distinct) | -| QUERY_ASIN / WITHDRAW / PATROL_DELETE / SHOP_DATA_CRAWL / PRODUCT_RISK_RESOLVE | `biz_task_result_item.scope_key`(task_id + module_type) | -| PRICE_TRACK / SHOP_MATCH | `biz_file_result.source_filename`(文件名含店铺) | -| 其余/兜底 | `biz_task_progress_snapshot.current_scope_key`;再兜底 `request_json.items[].shopName` | +1. `biz_publish_file.shop_name`(上架结果文件,按 task_id 聚合 distinct); +2. `biz_task_result_item.scope_key`(任务结果分组); +3. `biz_file_result.source_filename`(结果文件名里带店铺,如跟价/定时匹配); +4. `biz_task_progress_snapshot.current_scope_key`; +5. `request_json.items[].shopName`(兜底,只对当页前四个来源都为空的任务批量拉一次)。 -店铺筛选:对上述来源做 EXISTS 子查询(三张表都有 task_id 索引:`idx_result_item_task` / -`idx_task_id` / `uk_task_progress_snapshot`),与其余筛选一起下推到主查询。 +各模块的主来源天然落在链上的对应位置,未列出的模块自动降级到下一来源;品牌行店铺恒空。 + +店铺筛选:对来源 1~4 做 EXISTS 子查询(四张表都有 task_id 索引:`biz_publish_file` / +`idx_result_item_task` / `idx_task_id` / `uk_task_progress_snapshot`),与其余筛选一起下推到 +主查询;`request_json` 不参与筛选。 ### 进度口径(列表/详情展示) @@ -130,10 +133,10 @@ SQL 用 `@Select` 注解 mapper + 手写 LIMIT/OFFSET 分页(先例 `ImageVide | 接口 | 说明 | |---|---| | `GET /api/admin/task-center/overview` | 汇总卡:设备总数/在线数、进行中任务数、今日完成任务数、疑似卡住数 | -| `GET /api/admin/task-center/devices` | 设备列表:device_id、device_name、lastActiveAt(最近上报/任务活动)、online、runningTasks、recentTaskAt、webDevice(`web-` 前缀=网页登录) | -| `GET /api/admin/task-center/tasks` | 任务列表(分页 + 筛选:username、module_type、status、device_id、shop、start_time/end_time);字段:id、task_no、module_type、module_label、status、user_id、username、device_id、device_name、shop_name、shop_count、created_at、finished_at、progress{total,success,failed,current_scope,message}、stuck | -| `GET /api/admin/task-center/tasks/detail` | 任务详情(参数 `task_no`,品牌任务为 `brand-`):基础信息 + 进度快照 + 店铺/文件明细 | -| `GET /api/admin/task-center/variant-tasks` | 变体采集列表(代理麦象 console):uid 集合 = 可见用户;page/page_size + status/task_type 筛选;字段:task_id、uid、username、status、res_mes、create_time、update_time | +| `GET /api/admin/task-center/devices` | 设备列表:deviceId、deviceName、lastActiveAt(最近上报/任务活动)、online、runningTasks、recentTaskAt、webDevice(`web-` 前缀=网页登录) | +| `GET /api/admin/task-center/tasks` | 任务列表(分页 + 筛选:page、pageSize、username、moduleType、status、deviceId、shop、startTime/endTime);字段:id、taskNo、moduleType、moduleLabel、status、userId、username、deviceId、deviceName、webDevice、shopName、shopCount、createdAt、finishedAt、progressTotal/progressSuccess/progressFailed、currentScope、message、stuck | +| `GET /api/admin/task-center/tasks/detail` | 任务详情(参数 `taskNo`,品牌任务为 `brand-`):基础信息 + 进度快照 + 店铺/文件明细 | +| `GET /api/admin/task-center/variant-tasks` | 变体采集列表(代理麦象 console):uid 集合 = 可见用户;page/pageSize + status/taskType 筛选 | ## 前端页面