From e1f1aa8b16c333432fe26f97c4268487efc5692c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Sat, 3 Oct 2026 22:41:29 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E7=9C=8B=E6=9D=BF):=20=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E7=AB=AF=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86=E4=BB=8E=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=BB=B4=E5=BA=A6=E6=94=B9=E4=B8=BA=E5=BA=97=E9=93=BA?= =?UTF-8?q?=E7=BB=B4=E5=BA=A6=E5=85=A8=E5=B1=80=E5=9C=A8=E8=B7=91=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 原「在线设备」卡按日志上报窗口统计,把 89 台算成在线,与实际在跑的客户端数差一个 量级,且设备维度并不能回答"哪台机器上有任务卡住"。改为: - 汇总卡:总店铺 / 在跑店铺 / 进行中任务 / 今日完成 / 疑似卡住 - 新增「在跑店铺看板」:当前所有进行中任务按店铺归组(在跑数、卡住数、业务分布、 最近上报),点店铺行下筛该店铺任务;不落店铺的任务归「不挂店铺」桶 - 卡片与面板同源(同一个 aggregateShops),杜绝口径分裂 - 店铺只认两个真来源:上架结果文件 + 逐店落行的结果文件名; biz_task_progress_snapshot.current_scope_key 是实例锁不是店铺,已从口径中剔除 - 设备号退为详情附注,花名册 /devices 与在线判定整条链删除 - 上报口径只留一个 10 分钟窗口(进行中且超 10 分钟无上报 = 疑似卡住) 后端 3487 例全绿;新增反射护栏断言设备维度查询与快照当店铺的来源已彻底移除。 --- admin-frontend-vue/src/api/task-center.ts | 35 +- .../src/layout/operation-guides.ts | 4 +- .../pages/task-center/TaskCenterBoardPage.vue | 219 +++-- .../pages/task-center/task-center-model.ts | 5 +- .../tests/task-center-board.test.ts | 44 +- .../controller/AdminTaskCenterController.java | 31 +- .../mapper/TaskCenterQueryMapper.java | 251 +++-- .../model/dto/TaskCenterDeviceRow.java | 17 +- .../model/dto/TaskCenterTaskQuery.java | 5 +- .../model/dto/TaskCenterTaskRow.java | 2 - .../model/vo/TaskCenterDeviceVo.java | 24 - .../model/vo/TaskCenterOverviewVo.java | 15 +- .../taskcenter/model/vo/TaskCenterShopVo.java | 28 + .../model/vo/TaskCenterTaskRowVo.java | 6 +- .../service/TaskCenterQueryService.java | 321 +++---- .../mapper/TaskCenterQueryMapperSqlTest.java | 201 ++-- .../service/TaskCenterQueryServiceTest.java | 899 ++++++++++-------- docs/specs/16-client-task-console.md | 152 +-- 18 files changed, 1222 insertions(+), 1037 deletions(-) delete mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/vo/TaskCenterDeviceVo.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/vo/TaskCenterShopVo.java diff --git a/admin-frontend-vue/src/api/task-center.ts b/admin-frontend-vue/src/api/task-center.ts index 38817c02e..6631a85fd 100644 --- a/admin-frontend-vue/src/api/task-center.ts +++ b/admin-frontend-vue/src/api/task-center.ts @@ -1,27 +1,27 @@ import { http } from './http' import { unwrap } from './envelope' -/** 客户端任务管理(后台看板):按账号 × 设备 × 业务统一查看客户端任务,全部只读。 */ +/** 客户端任务管理(后台看板):按店铺 × 账号 × 业务统一查看客户端在跑任务,全部只读。 */ /** 查询参数(由页面侧 buildTaskQuery / buildVariantQuery 产出,空白项不下传)。 */ type QueryParams = Record export interface TaskCenterOverview { - deviceTotal: number - deviceOnline: number + shopTotal: number + shopRunning: number runningTasks: number todayFinishedTasks: number stuckTasks: number } -export interface TaskCenterDevice { - deviceId: string - deviceName: string | null - lastActiveAt: string | null - online: boolean +/** 店铺面板行:一个店铺在当前所有进行中任务里的汇总;「不挂店铺」是兜住无店铺模块的合成桶。 */ +export interface TaskCenterShop { + shop: string + noShop: boolean runningTasks: number - recentTaskAt: string | null - webDevice: boolean + stuckTasks: number + moduleSummary: string + lastReportAt: string | null } export interface TaskCenterTaskRow { @@ -39,6 +39,7 @@ export interface TaskCenterTaskRow { shopCount: number createdAt: string | null finishedAt: string | null + lastReportAt: string | null progressTotal: number progressSuccess: number progressFailed: number @@ -91,10 +92,16 @@ export async function fetchTaskCenterOverview(): Promise { return unwrap(data) } -/** 设备花名册(任务设备近 30 天 ∪ 日志设备近 7 天):GET /api/admin/task-center/devices */ -export async function fetchTaskCenterDevices(): Promise { - const { data } = await http.get('/api/admin/task-center/devices') - return unwrap(data) +/** 店铺面板:当前全部进行中任务按店铺归组(与汇总卡的「在跑店铺」同源):GET /api/admin/task-center/shops */ +export async function fetchTaskCenterShops(): Promise { + const { data } = await http.get('/api/admin/task-center/shops') + return unwrap(data) +} + +/** 店铺筛选候选(店铺库内的店铺名,精确匹配):GET /api/admin/task-center/shop-options */ +export async function fetchTaskCenterShopOptions(): Promise { + const { data } = await http.get('/api/admin/task-center/shop-options') + return unwrap(data) } /** 任务分页列表:GET /api/admin/task-center/tasks */ diff --git a/admin-frontend-vue/src/layout/operation-guides.ts b/admin-frontend-vue/src/layout/operation-guides.ts index 4c170ffef..9ad49e3c4 100644 --- a/admin-frontend-vue/src/layout/operation-guides.ts +++ b/admin-frontend-vue/src/layout/operation-guides.ts @@ -91,8 +91,8 @@ export const OPERATION_GUIDES: Record = { steps: ['选择日期范围', '筛选用户或分组', '核对各模块次数'], }, admin_task_center: { - text: '按账号和设备查看客户端任务执行情况;点击设备可筛选该设备任务,点任务查看明细。', - steps: ['选择筛选条件', '查看设备与任务', '打开任务详情'], + text: '在跑店铺看板按店铺汇总当前进行中的客户端任务;点店铺行筛出该店铺任务,点任务查看明细。', + steps: ['看在跑店铺看板', '点店铺行筛任务', '打开任务详情'], }, } diff --git a/admin-frontend-vue/src/pages/task-center/TaskCenterBoardPage.vue b/admin-frontend-vue/src/pages/task-center/TaskCenterBoardPage.vue index 91413cda9..d7d423406 100644 --- a/admin-frontend-vue/src/pages/task-center/TaskCenterBoardPage.vue +++ b/admin-frontend-vue/src/pages/task-center/TaskCenterBoardPage.vue @@ -1,6 +1,6 @@ ") long countRunningTasks(@Param("userIds") List userIds); @@ -137,14 +108,12 @@ public interface TaskCenterQueryMapper { + " WHERE t.module_type IN (" + CLIENT_MODULE_TYPES + ")" + " AND t.status IN (" + ACTIVE_STATUSES + ")" + " AND t.updated_at < #{idleBefore}" - + " AND t.user_id IN" - + " #{uid}" + + USER_SCOPE_T + " UNION ALL" + " SELECT b.id FROM brand_crawl_tasks b" + " WHERE b.status IN (" + BRAND_ACTIVE_STATUSES + ")" + " AND b.updated_at < #{idleBefore}" - + " AND b.user_id IN" - + " #{uid}" + + USER_SCOPE_B + ") u" + "") long countStuckTasks(@Param("userIds") List userIds, @@ -156,56 +125,36 @@ public interface TaskCenterQueryMapper { + " WHERE t.module_type IN (" + CLIENT_MODULE_TYPES + ")" + " AND t.status IN (" + TERMINAL_STATUSES + ")" + " AND COALESCE(t.finished_at, t.updated_at) >= #{since}" - + " AND t.user_id IN" - + " #{uid}" + + USER_SCOPE_T + " UNION ALL" + " SELECT b.id FROM brand_crawl_tasks b" + " WHERE b.status IN (" + BRAND_TERMINAL_STATUSES + ")" + " AND b.updated_at >= #{since}" - + " AND b.user_id IN" - + " #{uid}" + + USER_SCOPE_B + ") u" + "") long countFinishedTasksSince(@Param("userIds") List userIds, @Param("since") LocalDateTime since); + /** 总店铺:店铺库(biz_shop_manage)在可见账号下的数量。 */ @Select("") - long countRosterDevices(@Param("userIds") List userIds, - @Param("taskSince") LocalDateTime taskSince, - @Param("logSince") LocalDateTime logSince); + long countShops(@Param("userIds") List userIds); + /** + * 店铺筛选下拉候选:只取店铺名。 + * + *

biz_shop_manage 里带 account/password/zn_username,这一列之外的都不能出, + * 由 {@code TaskCenterQueryMapperSqlTest.shopOptionsAreDistinctNamesWithoutCredentialColumns} 守住。

+ */ @Select("") - long countOnlineDevices(@Param("userIds") List userIds, - @Param("taskSince") LocalDateTime taskSince, - @Param("logSince") LocalDateTime logSince, - @Param("onlineSince") LocalDateTime onlineSince); - - /** 设备花名册列表:名称取日志侧,活动时间取两侧最大,最近任务时间取任务侧最大创建时间。 */ - @Select("") - List listRosterDevices(@Param("userIds") List userIds, - @Param("taskSince") LocalDateTime taskSince, - @Param("logSince") LocalDateTime logSince); - - /** 按设备统计进行中任务数(设备号为空的任务不归属任何设备)。 */ - @Select("") - List countRunningTasksByDevice(@Param("userIds") List userIds); + List selectShopNames(@Param("userIds") List userIds); /** 状态归一化:CANCELED 并入 CANCELLED(历史脏值),前端只认一套。 */ String STATUS_T = "CASE WHEN UPPER(t.status) = 'CANCELED' THEN 'CANCELLED' ELSE UPPER(t.status) END"; @@ -213,27 +162,37 @@ public interface TaskCenterQueryMapper { /** 品牌表状态本是小写,统一 UPPER 输出。 */ String STATUS_B = "CASE WHEN UPPER(b.status) = 'CANCELED' THEN 'CANCELLED' ELSE UPPER(b.status) END"; + /** biz_file_task 分支列(列表与店铺面板共用同一套列,避免两处漂移)。 */ + String COLS_T = "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"; + + /** brand_crawl_tasks 分支列(与 {@link #COLS_T} 同序)。 */ + String COLS_B = "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"; + /** - * 店铺筛选:四个来源任一命中即可(去重靠 EXISTS,不需要 JOIN 放大行数)。 - * 四张表都有 task_id 索引,子查询由外层行驱动;request_json 兜底不参与筛选。 + * 店铺筛选:两个真来源任一命中即可(去重靠 EXISTS,不需要 JOIN 放大行数)。 + * + *

按 {@code LOWER(TRIM(...))} 规范化后精确匹配:面板行下钻和下拉候选给的都是 + * 整名,模糊 LIKE 会把「林芳」命中「林芳芳」。biz_file_result 一侧必须带模块白名单, + * 否则会把采集数据/货源查询的上传文件名当店铺。

*/ 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}, '%')))" - + ""; + + " WHERE p.task_id = t.id AND LOWER(TRIM(p.shop_name)) = LOWER(TRIM(#{shop})))" + + " OR (t.module_type IN (" + FILE_RESULT_SHOP_MODULES + ") AND EXISTS (SELECT 1 FROM biz_file_result f" + + " WHERE f.task_id = t.id AND LOWER(TRIM(f.source_filename)) = LOWER(TRIM(#{shop}))))" + + ")"; - /** biz_file_task 分支筛选(账号范围 + 业务/状态/设备/时间范围 + 店铺)。 */ - String TASK_FILTER_T = " AND t.user_id IN" - + " #{uid}" + /** biz_file_task 分支筛选(账号范围 + 业务/状态/时间范围 + 店铺)。 */ + String TASK_FILTER_T = USER_SCOPE_T + " 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; @@ -242,11 +201,9 @@ public interface TaskCenterQueryMapper { * 品牌分支筛选:业务名固定 BRAND(选了别的业务则该分支恒空);品牌任务不存店铺, * 带店铺筛选时直接排除——否则品牌 id 与 biz id 撞号会被 EXISTS 误判命中。 */ - String TASK_FILTER_B = " AND b.user_id IN" - + " #{uid}" + String TASK_FILTER_B = USER_SCOPE_B + " 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"; @@ -255,24 +212,30 @@ public interface TaskCenterQueryMapper { * 任务列表行: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" + String TASK_LIST_ROWS = "(SELECT " + COLS_T + " 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" + + " SELECT " + COLS_B + " FROM brand_crawl_tasks b" + " WHERE 1 = 1" + TASK_FILTER_B + ")"; + /** 进行中任务行:与列表同一套列,只按「客户端模块 ∪ 品牌 + 进行中」取,无筛选占位符。 */ + String ACTIVE_TASK_ROWS = "(SELECT " + COLS_T + + " FROM biz_file_task t" + + " WHERE t.module_type IN (" + CLIENT_MODULE_TYPES + ")" + + " AND t.status IN (" + ACTIVE_STATUSES + ")" + + USER_SCOPE_T + + " UNION ALL" + + " SELECT " + COLS_B + + " FROM brand_crawl_tasks b" + + " WHERE b.status IN (" + BRAND_ACTIVE_STATUSES + ")" + + USER_SCOPE_B + + ")"; + @Select("") + List selectActiveTasks(@Param("userIds") List userIds, + @Param("limit") long limit); + /** 账号名筛选 → 用户号(与可见账号集合求交由服务层负责)。 */ @Select("SELECT id FROM users WHERE username LIKE CONCAT('%', #{keyword}, '%') LIMIT 500") List selectUserIdsByUsername(@Param("keyword") String keyword); @@ -309,7 +279,7 @@ public interface TaskCenterQueryMapper { + "") List selectUsernames(@Param("userIds") List userIds); - /** 设备展示名(不限窗口:设备名与任务时间无关)。 */ + /** 设备展示名(详情里保留「跑在哪台机」;列表与面板不再按设备装配)。 */ @Select("") List selectPublishShops(@Param("taskIds") List taskIds); - /** 店铺来源二:任务结果分组(scope_key)。 */ - @Select("") - List selectResultItemShops(@Param("taskIds") List taskIds); - /** 店铺来源三:结果文件名(跟价/定时匹配的文件名里带店铺)。 */ + /** + * 店铺来源二:结果行的 source_filename,只认 {@link #FILE_RESULT_SHOP_MODULES} 里的模块 + * (其余模块这里存的是上传文件名)。 + * + *

JOIN 回 biz_file_task 而不是靠调用方保证:店铺面板传进来的是两表混合 id, + * 品牌任务 id 与 biz id 会撞号,白名单必须先由 biz 行筛掉。

+ */ @Select("") List selectFileResultShops(@Param("taskIds") List taskIds); - /** 进度快照(同时充当店铺来源四:current_scope_key)。按 (taskId, moduleType) 由服务层匹配。 */ + /** 进度快照(只用于「当前处理」与进度列,不作为店铺来源)。按 (taskId, moduleType) 由服务层匹配。 */ @Select("") List selectSnapshots(@Param("taskIds") List taskIds); - /** 店铺兜底:请求体 items[].shopName(只在前面四个来源都为空时按需拉取,避免列表查询带大 JSON 列)。 */ - @Select("") - List selectRequestJson(@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," @@ -385,7 +348,7 @@ public interface TaskCenterQueryMapper { + " FROM brand_crawl_tasks b WHERE b.id = #{id}") TaskCenterTaskRow selectBrandTaskById(@Param("id") Long id); - /** 详情店铺明细(上架):按店铺聚合文件数 + 成功/失败文件数,最多的排前面。 */ + /** 详情分组明细(上架):按店铺聚合文件数 + 成功/失败文件数,最多的排前面。 */ @Select("SELECT p.shop_name AS scopeKey, COUNT(*) AS total," + " SUM(UPPER(p.status) = 'SUCCESS') AS success, SUM(UPPER(p.status) = 'FAILED') AS failed" + " FROM biz_publish_file p" diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/dto/TaskCenterDeviceRow.java b/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/dto/TaskCenterDeviceRow.java index cc12f9571..0457fd08d 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/dto/TaskCenterDeviceRow.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/dto/TaskCenterDeviceRow.java @@ -2,26 +2,11 @@ package com.nanri.aiimage.modules.taskcenter.model.dto; import lombok.Data; -import java.time.LocalDateTime; - -/** - * 设备聚合行:三条查询各填一部分字段(MyBatis 自动映射,未选出的列留空)。 - * - *
    - *
  • 花名册查询(任务设备 ∪ 日志设备):deviceId / deviceName / lastActiveAt / recentTaskAt
  • - *
  • 进行中统计(按设备):deviceId / runningTasks
  • - *
- */ +/** 设备展示名行(详情里「跑在哪台机」用;看板维度是店铺,不再装配设备列表)。 */ @Data public class TaskCenterDeviceRow { private String deviceId; /** 日志侧展示名(机器名/登录名);任务侧无此数据。 */ private String deviceName; - /** 最近活动:任务 updated_at ∪ 日志上报时间。 */ - private LocalDateTime lastActiveAt; - /** 最近一次任务的创建时间(30 天窗口内)。 */ - private LocalDateTime recentTaskAt; - /** 该设备进行中任务数。 */ - private Long runningTasks; } 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 index aaf9accdf..ac2285ef8 100644 --- 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 @@ -5,7 +5,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -/** 任务列表查询条件(账号/业务/状态/设备/店铺/时间范围 + 分页)。 */ +/** 任务列表查询条件(账号/业务/状态/店铺/时间范围 + 分页)。 */ @Data public class TaskCenterTaskQuery { @@ -14,8 +14,7 @@ public class TaskCenterTaskQuery { private String moduleType; /** 大写状态:PENDING/RUNNING/SCHEDULED/SUCCESS/FAILED/CANCELLED。 */ private String status; - private String deviceId; - /** 店铺模糊匹配(跨 4 个来源的 EXISTS)。 */ + /** 店铺名精确匹配(规范化为小写 + trim 后比较;候选来自店铺库与面板下钻)。 */ private String shop; /** 任务创建时间(含),ISO-8601。 */ @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) 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 index e53c24ccb..c98c24623 100644 --- 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 @@ -28,8 +28,6 @@ public class TaskCenterTaskRow { private Long successCount; private Long failedCount; private boolean brand; - /** 仅店铺兜底查询填充(列表主查询不拉大 JSON 列)。 */ - private String requestJson; /** 仅详情查询填充(列表不带这一列)。 */ private String errorMessage; } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/vo/TaskCenterDeviceVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/vo/TaskCenterDeviceVo.java deleted file mode 100644 index 8b8a80306..000000000 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/vo/TaskCenterDeviceVo.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.nanri.aiimage.modules.taskcenter.model.vo; - -import lombok.Data; - -import java.time.LocalDateTime; - -/** 设备状态行:花名册内的设备 + 在线/跑任务状态。 */ -@Data -public class TaskCenterDeviceVo { - - private String deviceId; - /** 展示名(device_log_file 的主机名/登录名);任务侧设备无此字段,前端按 deviceId 截断显示。 */ - private String deviceName; - /** 最近活动时间;为空表示只有进行中任务、窗口内无活动记录。 */ - private LocalDateTime lastActiveAt; - /** 在线 = 最近活动 ≤ 5 分钟。 */ - private boolean online; - /** 该设备进行中任务数。 */ - private long runningTasks; - /** 最近一次任务创建时间(30 天窗口内)。 */ - private LocalDateTime recentTaskAt; - /** 网页登录设备(device_id 前缀 web-)。 */ - private boolean webDevice; -} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/vo/TaskCenterOverviewVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/vo/TaskCenterOverviewVo.java index 86385d4ac..d4d717a6d 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/vo/TaskCenterOverviewVo.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/vo/TaskCenterOverviewVo.java @@ -3,19 +3,22 @@ package com.nanri.aiimage.modules.taskcenter.model.vo; import lombok.Data; /** - * 客户端任务管理汇总卡。设备口径见设备花名册(任务设备近 30 天 ∪ 日志设备近 7 天)。 + * 客户端任务管理汇总卡(店铺口径)。 + * + *

总店铺来自店铺库 {@code biz_shop_manage},在跑店铺来自进行中任务的店铺归属聚合, + * 两者口径不同:后者是前者的子集,加上「不挂店铺」的任务不进任何店铺。

*/ @Data public class TaskCenterOverviewVo { - /** 花名册设备总数。 */ - private long deviceTotal; - /** 在线设备数(最近上报 ≤ 5 分钟)。 */ - private long deviceOnline; + /** 店铺库里的店铺数(可见范围内)。 */ + private long shopTotal; + /** 有进行中任务的店铺数(不含「不挂店铺」桶)。 */ + private long shopRunning; /** 进行中任务数(含品牌检测)。 */ private long runningTasks; /** 今日完成任务数(终态且完成时间在今日)。 */ private long todayFinishedTasks; - /** 疑似卡住:进行中且超过 10 分钟无更新。 */ + /** 疑似卡住:进行中且超过 10 分钟无上报。 */ private long stuckTasks; } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/vo/TaskCenterShopVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/vo/TaskCenterShopVo.java new file mode 100644 index 000000000..994d20b4c --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/vo/TaskCenterShopVo.java @@ -0,0 +1,28 @@ +package com.nanri.aiimage.modules.taskcenter.model.vo; + +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * 店铺面板行:一个店铺在当前所有进行中任务里的汇总(点行下钻到该店铺的任务列表)。 + * + *

「不挂店铺」是一行合成桶({@code noShop=true}):采集数据、货源查询、品牌检测这些模块 + * 的任务不落店铺,但它们同样在跑,不能让它们在看板里消失。

+ */ +@Data +public class TaskCenterShopVo { + + /** 店铺名(沿用首次出现的写法);合成桶时为「不挂店铺」。 */ + private String shop; + /** 是否为「不挂店铺」合成桶(不可下钻,按业务筛选看这些任务)。 */ + private boolean noShop; + /** 该店铺进行中任务数(一个任务挂多个店铺时,在每个店铺下各计一次)。 */ + private long runningTasks; + /** 其中疑似卡住数(进行中且超过 10 分钟无上报)。 */ + private long stuckTasks; + /** 业务分布,如「跟价×2 / 定时匹配×1」。 */ + private String moduleSummary; + /** 该店铺所有在跑任务里最近一次上报时间(心跳与结果回传都会顶新)。 */ + private LocalDateTime lastReportAt; +} 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 index 258e9c918..a2ed1fedc 100644 --- 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 @@ -18,14 +18,16 @@ public class TaskCenterTaskRowVo { private Long userId; private String username; private String deviceId; - /** device_log_file 的设备名;查不到时前端按 deviceId 截断显示。 */ + /** device_log_file 的设备名;只在详情装配(列表与店铺面板不再按设备看)。 */ private String deviceName; private boolean webDevice; - /** 店铺:主来源的第一个店铺名(多店铺时前端显示「共 N 个」)。 */ + /** 店铺:主来源的第一个店铺名(多店铺时前端显示「共 N 个」);来源只有上架结果文件与逐店落行的结果文件名。 */ private String shopName; private long shopCount; private LocalDateTime createdAt; private LocalDateTime finishedAt; + /** 最近一次上报(updated_at;心跳与结果回传都会顶新)。进行中且它超过 10 分钟即疑似卡住。 */ + private LocalDateTime lastReportAt; private long progressTotal; private long progressSuccess; private long progressFailed; 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 32c6c2528..5acafecea 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,8 +1,5 @@ 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; @@ -12,13 +9,14 @@ 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.TaskCenterShopStatVo; +import com.nanri.aiimage.modules.taskcenter.model.vo.TaskCenterShopVo; import com.nanri.aiimage.modules.taskcenter.model.vo.TaskCenterTaskDetailVo; import com.nanri.aiimage.modules.taskcenter.model.vo.TaskCenterTaskPageVo; import com.nanri.aiimage.modules.taskcenter.model.vo.TaskCenterTaskRowVo; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import java.time.LocalDate; @@ -26,103 +24,163 @@ import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Comparator; import java.util.HashMap; +import java.util.HashSet; 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; +import java.util.stream.Collectors; /** - * 客户端任务管理的只读查询。时间口径:卡住 10 分钟、在线 5 分钟、 - * 任务设备回看 30 天、日志设备回看 7 天。 + * 客户端任务管理的只读查询,看板维度是店铺。 + * + *

时间口径只有一个:进行中且 {@code updated_at} 超过 10 分钟没动 = 疑似卡住。 + * {@code updated_at} 由客户端心跳(60s)与结果回传共同顶新,所以「在跑的任务必然在上报」 + * 是这条判定的前提;设备维度不再参与统计(设备号只在详情里作为附注展示)。

+ * + *

店铺面板与汇总卡共用 {@link #aggregateShops} 一份聚合,卡片说几家在跑、面板就列几行, + * 不允许两个数字各算各的。

*/ @Service @RequiredArgsConstructor +@Slf4j public class TaskCenterQueryService { private static final long STUCK_IDLE_MINUTES = 10; - 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; + /** 面板原料的行数上界:进行中任务正常在几十量级,触顶时打 warn(汇总卡仍按 SQL 精确计数)。 */ + private static final long SHOP_PANEL_TASK_CAP = 500; private static final long DEFAULT_PAGE_SIZE = 20; private static final long MAX_PAGE_SIZE = 100; + /** 不落店铺的模块(采集数据、货源查询、品牌检测…)在面板里的合成桶,保证在跑任务不消失。 */ + static final String NO_SHOP_LABEL = "不挂店铺"; + /** 进行中状态与 mapper SQL 同源,避免「计数说在跑、卡住判定说不在跑」。 */ private static final Set ACTIVE_STATUSES = TaskCenterQueryMapper.ACTIVE_STATUS_SET; - private static final ObjectMapper JSON = new ObjectMapper(); + /** 面板排序:该去看谁的店排前面——有卡住的先,其次最久没上报的,「不挂店铺」桶永远垫底。 */ + private static final Comparator SHOP_ROW_ORDER = Comparator + .comparing(TaskCenterShopVo::isNoShop) + .thenComparingLong(vo -> -vo.getStuckTasks()) + .thenComparing(TaskCenterShopVo::getLastReportAt, Comparator.nullsLast(Comparator.naturalOrder())) + .thenComparing(TaskCenterShopVo::getShop); private final TaskCenterQueryMapper queryMapper; public TaskCenterOverviewVo overview(TaskCenterScopeService.ScopeContext scope) { LocalDateTime now = LocalDateTime.now(); - LocalDateTime taskSince = now.minusDays(TASK_DEVICE_WINDOW_DAYS); - LocalDateTime logSince = now.minusDays(LOG_DEVICE_WINDOW_DAYS); List userIds = scope.sqlUserIds(); + ShopBoard board = aggregateShops(userIds, now); TaskCenterOverviewVo vo = new TaskCenterOverviewVo(); + vo.setShopTotal(queryMapper.countShops(userIds)); + vo.setShopRunning(board.runningShops()); vo.setRunningTasks(queryMapper.countRunningTasks(userIds)); vo.setStuckTasks(queryMapper.countStuckTasks(userIds, now.minusMinutes(STUCK_IDLE_MINUTES))); vo.setTodayFinishedTasks(queryMapper.countFinishedTasksSince(userIds, LocalDate.now().atStartOfDay())); - vo.setDeviceTotal(queryMapper.countRosterDevices(userIds, taskSince, logSince)); - vo.setDeviceOnline(queryMapper.countOnlineDevices(userIds, taskSince, logSince, - now.minusMinutes(ONLINE_WINDOW_MINUTES))); return vo; } - /** 设备花名册:任务设备 ∪ 日志设备,在线优先、活动时间倒序。 */ - public List devices(TaskCenterScopeService.ScopeContext scope) { - LocalDateTime now = LocalDateTime.now(); - List userIds = scope.sqlUserIds(); - - Map byDevice = new LinkedHashMap<>(); - for (TaskCenterDeviceRow row : queryMapper.listRosterDevices(userIds, - now.minusDays(TASK_DEVICE_WINDOW_DAYS), now.minusDays(LOG_DEVICE_WINDOW_DAYS))) { - TaskCenterDeviceVo vo = deviceOf(byDevice, row.getDeviceId()); - if (vo != null) { - vo.setDeviceName(row.getDeviceName()); - vo.setLastActiveAt(row.getLastActiveAt()); - vo.setRecentTaskAt(row.getRecentTaskAt()); - } - } - for (TaskCenterDeviceRow row : queryMapper.countRunningTasksByDevice(userIds)) { - TaskCenterDeviceVo vo = deviceOf(byDevice, row.getDeviceId()); - if (vo != null && row.getRunningTasks() != null) { - vo.setRunningTasks(row.getRunningTasks()); - } - } - - LocalDateTime onlineSince = now.minusMinutes(ONLINE_WINDOW_MINUTES); - List devices = new ArrayList<>(byDevice.values()); - for (TaskCenterDeviceVo vo : devices) { - vo.setOnline(vo.getLastActiveAt() != null && !vo.getLastActiveAt().isBefore(onlineSince)); - } - devices.sort(Comparator - .comparing(TaskCenterDeviceVo::isOnline, Comparator.reverseOrder()) - .thenComparing(TaskCenterDeviceVo::getLastActiveAt, Comparator.nullsLast(Comparator.reverseOrder())) - .thenComparing(vo -> vo.getDeviceName() == null ? "" : vo.getDeviceName()) - .thenComparing(TaskCenterDeviceVo::getDeviceId)); - return devices; + /** 店铺面板:当前所有进行中任务按店铺归组(含「不挂店铺」桶)。 */ + public List shops(TaskCenterScopeService.ScopeContext scope) { + return aggregateShops(scope.sqlUserIds(), LocalDateTime.now()).rows(); } - /** 空设备号入册无意义(SQL 已滤,这里挡住直调服务或脏数据)。 */ - private static TaskCenterDeviceVo deviceOf(Map byDevice, String deviceId) { - if (deviceId == null || deviceId.isBlank()) { - return null; + /** 店铺筛选下拉候选(店铺库内的店铺名,精确匹配用)。 */ + public List shopOptions(TaskCenterScopeService.ScopeContext scope) { + return safe(queryMapper.selectShopNames(scope.sqlUserIds())); + } + + /** 店铺面板的聚合结果:行 + 其中真店铺数(不含合成桶)。 */ + private record ShopBoard(List rows, long runningShops) { + + private static final ShopBoard EMPTY = new ShopBoard(List.of(), 0); + } + + private ShopBoard aggregateShops(List userIds, LocalDateTime now) { + List rows = safe(queryMapper.selectActiveTasks(userIds, SHOP_PANEL_TASK_CAP)); + if (rows.size() >= SHOP_PANEL_TASK_CAP) { + log.warn("task-center 店铺面板进行中任务数触顶, cap={}, 面板行数会少于汇总卡", SHOP_PANEL_TASK_CAP); } - String key = deviceId.trim(); - return byDevice.computeIfAbsent(key, id -> { - TaskCenterDeviceVo vo = new TaskCenterDeviceVo(); - vo.setDeviceId(id); - vo.setWebDevice(id.startsWith("web-")); + if (rows.isEmpty()) { + return ShopBoard.EMPTY; + } + + List bizIds = rows.stream().filter(row -> !row.isBrand()) + .map(TaskCenterTaskRow::getId).filter(Objects::nonNull).distinct().toList(); + Map> shopsByTask = collectShops(bizIds); + + Map byShopKey = new LinkedHashMap<>(); + for (TaskCenterTaskRow row : rows) { + List rowShops = row.isBrand() ? List.of() : shopsByTask.get(row.getId()); + if (rowShops == null || rowShops.isEmpty()) { + bucket(byShopKey, NO_SHOP_LABEL).accept(row, now); + continue; + } + for (String shop : rowShops) { + bucket(byShopKey, shop).accept(row, now); + } + } + + List vos = new ArrayList<>(byShopKey.size()); + for (ShopAggregate aggregate : byShopKey.values()) { + vos.add(aggregate.toVo()); + } + vos.sort(SHOP_ROW_ORDER); + long runningShops = vos.stream().filter(vo -> !vo.isNoShop()).count(); + return new ShopBoard(vos, runningShops); + } + + /** 归组键走规范化(小写 + trim),展示名沿用首次出现的写法:同一店两种写法不拆成两行。 */ + private static ShopAggregate bucket(Map byShopKey, String shopName) { + return byShopKey.computeIfAbsent(shopKey(shopName), key -> new ShopAggregate(shopName.trim())); + } + + /** 单个店铺的累计量(进行中任务可能挂多店,一个任务在它挂的每家店下各计一次)。 */ + private static final class ShopAggregate { + + private final String shop; + private long runningTasks; + private long stuckTasks; + private LocalDateTime lastReportAt; + private final Map modules = new HashMap<>(); + + private ShopAggregate(String shop) { + this.shop = shop; + this.lastReportAt = null; + } + + private void accept(TaskCenterTaskRow row, LocalDateTime now) { + runningTasks++; + if (isStuck(row, now)) { + stuckTasks++; + } + LocalDateTime reportedAt = row.getUpdatedAt() == null ? row.getCreatedAt() : row.getUpdatedAt(); + if (reportedAt != null && (lastReportAt == null || reportedAt.isAfter(lastReportAt))) { + lastReportAt = reportedAt; + } + modules.merge(TaskModuleRegistry.labelOf(row.getModuleType()), 1L, Long::sum); + } + + private TaskCenterShopVo toVo() { + TaskCenterShopVo vo = new TaskCenterShopVo(); + vo.setShop(shop); + vo.setNoShop(NO_SHOP_LABEL.equals(shop)); + vo.setRunningTasks(runningTasks); + vo.setStuckTasks(stuckTasks); + vo.setLastReportAt(lastReportAt); + vo.setModuleSummary(modules.entrySet().stream() + .sorted(Map.Entry.comparingByValue(Comparator.reverseOrder()) + .thenComparing(Map.Entry.comparingByKey())) + .map(entry -> entry.getKey() + "×" + entry.getValue()) + .collect(Collectors.joining(" / "))); return vo; - }); + } } - /** 任务列表:两表 UNION 分页 + 当页行的账号/设备名/店铺/进度装配。 */ + /** 任务列表:两表 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 @@ -134,20 +192,20 @@ public class TaskCenterQueryService { } long total = queryMapper.countTaskPage(userIds, query.getModuleType(), query.getStatus(), - query.getDeviceId(), query.getShop(), query.getStartTime(), query.getEndTime()); + 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); + query.getStatus(), 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.setItems(assembleRows(rows)); vo.setTotal(total); vo.setPage(page); vo.setPageSize(pageSize); @@ -190,7 +248,7 @@ public class TaskCenterQueryService { return null; } - List rows = List.of(row); + List bizIds = row.isBrand() || row.getId() == null ? List.of() : List.of(row.getId()); List deviceIds = row.getDeviceId() == null || row.getDeviceId().isBlank() ? List.of() : List.of(row.getDeviceId()); List userIds = row.getUserId() == null || row.getUserId() <= 0 @@ -199,11 +257,11 @@ public class TaskCenterQueryService { : toDeviceNames(safe(queryMapper.selectDeviceNames(deviceIds))); Map usernames = userIds.isEmpty() ? Map.of() : toUserNames(safe(queryMapper.selectUsernames(userIds))); - Map snapshots = toSnapshots(safe(queryMapper.selectSnapshots(List.of(row.getId())))); - Map> shops = collectShops(rows); + Map snapshots = row.getId() == null ? Map.of() + : toSnapshots(safe(queryMapper.selectSnapshots(List.of(row.getId())))); TaskCenterTaskDetailVo vo = fillRow(new TaskCenterTaskDetailVo(), row, usernames, deviceNames, - snapshots, shops, collectRequestShops(rows, shops, snapshots), LocalDateTime.now()); + snapshots, collectShops(bizIds), LocalDateTime.now()); vo.setShops(shopStats(row)); vo.setErrorMessage(row.getErrorMessage()); return vo; @@ -221,7 +279,7 @@ public class TaskCenterQueryService { } } - /** 详情分组明细:上架按店铺(publish_file),其余按任务结果分组(result_item);品牌无店铺维度。 */ + /** 详情分组明细:上架按店铺(publish_file),其余按任务结果分组(result_item);品牌无分组维度。 */ private List shopStats(TaskCenterTaskRow row) { if (row.isBrand() || row.getId() == null) { return List.of(); @@ -241,27 +299,24 @@ public class TaskCenterQueryService { return stats; } - private List assembleRows(List rows, Map> shops) { - List deviceIds = rows.stream().map(TaskCenterTaskRow::getDeviceId) - .filter(id -> id != null && !id.isBlank()).distinct().toList(); + private List assembleRows(List rows) { 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(); + List bizIds = rows.stream().filter(row -> !row.isBrand()) + .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); + 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, deviceNames, snapshots, - shops, requestShops, now)); + items.add(fillRow(new TaskCenterTaskRowVo(), row, usernames, Map.of(), snapshots, shops, now)); } return items; } @@ -305,97 +360,35 @@ public class TaskCenterQueryService { } /** - * 店铺候选:按来源优先级依次取第一个非空的来源 - * (上架结果文件 → 任务结果分组 → 结果文件名 → 进度快照 → 请求体 items[].shopName)。 - * 与各模块的主来源一致,未列出的模块自动降级到下一来源。品牌行不取店铺。 + * 店铺归属:只有两个真来源——上架的 {@code biz_publish_file.shop_name} 与 + * 逐店落行模块的 {@code biz_file_result.source_filename}(SQL 里已按模块白名单筛)。 + * + *

任务结果分组与进度快照的 scope 都不是店铺(快照那是 {@code task::owner:} + * 实例锁),请求体兜底也不再用:宁可显示「不挂店铺」,不把文件名当店铺。

+ * + *

入参只接 biz 表 id:品牌任务 id 会与 biz 撞号。

*/ - private Map> collectShops(List rows) { - List bizIds = rows.stream().filter(row -> !row.isBrand()) - .map(TaskCenterTaskRow::getId).filter(Objects::nonNull).distinct().toList(); + private Map> collectShops(List bizIds) { 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)))); + Set taken = new HashSet<>(); + appendShops(safe(queryMapper.selectPublishShops(bizIds)), shops, taken); + appendShops(safe(queryMapper.selectFileResultShops(bizIds)), shops, taken); 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<>(); + private static void appendShops(List rows, Map> shops, Set taken) { 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) { + String shop = row.getShop() == null ? "" : row.getShop().trim(); + if (row.getTaskId() == null || shop.isEmpty()) { continue; } - List names = extractShopNames(row.getRequestJson()); - if (!names.isEmpty()) { - result.put(row.getId(), names); + if (!taken.add(row.getTaskId() + "#" + shopKey(shop))) { + continue; } - } - 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(); + shops.computeIfAbsent(row.getTaskId(), key -> new ArrayList<>()).add(shop); } } @@ -406,7 +399,6 @@ public class TaskCenterQueryService { Map deviceNames, Map snapshots, Map> shops, - Map> requestShops, LocalDateTime now) { vo.setId(row.getId()); vo.setTaskNo(row.getTaskNo()); @@ -420,6 +412,7 @@ public class TaskCenterQueryService { vo.setWebDevice(row.getDeviceId() != null && row.getDeviceId().startsWith("web-")); vo.setCreatedAt(row.getCreatedAt()); vo.setFinishedAt(row.getFinishedAt()); + vo.setLastReportAt(row.getUpdatedAt() == null ? row.getCreatedAt() : row.getUpdatedAt()); vo.setStuck(isStuck(row, now)); TaskCenterSnapshotRow snapshot = snapshots.get(snapshotKey(row.getId(), row.getModuleType())); @@ -438,13 +431,6 @@ public class TaskCenterQueryService { // 品牌检测按关键字执行、不落店铺;品牌行的 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()); @@ -461,6 +447,11 @@ public class TaskCenterQueryService { return lastSeen != null && lastSeen.isBefore(now.minusMinutes(STUCK_IDLE_MINUTES)); } + /** 店铺名的归一化键:与 SQL 的 LOWER(TRIM(...)) 同口径,面板下钻与筛选才对得上。 */ + private static String shopKey(String shopName) { + return shopName.trim().toLowerCase(Locale.ROOT); + } + private static long nullToZero(Long value) { return value == null ? 0L : value; } 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 6c4ac0ddb..56806c4b1 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 @@ -54,6 +54,12 @@ class TaskCenterQueryMapperSqlTest { .replaceAll("\\s*,\\s*", ","); } + /** 任务列表分页的查询参数(店铺口径下已不再有设备号)。 */ + private static Map taskPageParams(Object shop, long limit, long offset) { + return params("userIds", null, "moduleType", null, "status", null, "shop", shop, + "startTime", null, "endTime", null, "limit", limit, "offset", offset); + } + @Test void runningCountWithoutScopeFiltersNothing() { BoundSql boundSql = render("countRunningTasks", params("userIds", null)); @@ -104,75 +110,67 @@ class TaskCenterQueryMapperSqlTest { assertEquals(4, boundSql.getParameterMappings().size()); } + // ── 店铺面板(Task 4)────────────────────────────────────────────── + @Test - void rosterExcludesBlankDeviceAndUngroupedLogDevices() { - LocalDateTime since = LocalDateTime.of(2026, 9, 1, 0, 0); - BoundSql boundSql = render("countRosterDevices", - params("userIds", List.of(5L), "taskSince", since, "logSince", since)); + void shopTotalCountsOnlyTheShopRegistry() { + BoundSql boundSql = render("countShops", params("userIds", List.of(5L))); String sql = sqlOf(boundSql); - assertTrue(sql.contains("SELECT COUNT(DISTINCT u.deviceId)")); - assertTrue(sql.contains("d.device_id != ''"), "空设备号不参与"); - assertTrue(sql.contains("d.uid IS NOT NULL"), "无归属账号的日志设备不显示"); - assertTrue(sql.contains("d.source = 'client'"), "只看客户端日志设备"); - assertTrue(sql.contains("AND d.last_upload_at >= ?"), "日志设备回看窗口"); - assertEquals(6, boundSql.getParameterMappings().size(), "任务窗口×2 + 日志窗口 + 账号集合×3"); - } - - /** - * 日志表 device_id 是 utf8mb4_0900_ai_ci,任务表是 utf8mb4_general_ci;不显式 COLLATE - * 三个 UNION 分支混排会报 ERROR 1271(本地不连库测不出,生产库空跑才能发现)。 - */ - @Test - void rosterDeviceIdUnifiesCollationBeforeUnion() { - LocalDateTime since = LocalDateTime.of(2026, 9, 1, 0, 0); - String sql = sqlOf(render("countRosterDevices", - params("userIds", null, "taskSince", since, "logSince", since))); - - assertTrue(sql.contains("d.device_id COLLATE utf8mb4_general_ci AS deviceId"), - "日志侧 device_id 显式统一排序规则"); + assertTrue(sql.contains("SELECT COUNT(*) FROM biz_shop_manage s")); + assertTrue(sql.contains("AND s.created_by_id IN(?)"), "非超管按可见账号裁剪店铺库"); + assertFalse(sql.contains("device_log_file"), "总店铺不看设备花名册"); + assertEquals(1, boundSql.getParameterMappings().size()); } @Test - void rosterListAggregatesNameAndRecencyPerDevice() { - LocalDateTime since = LocalDateTime.of(2026, 9, 1, 0, 0); - BoundSql boundSql = render("listRosterDevices", - params("userIds", null, "taskSince", since, "logSince", since)); + void shopTotalForSuperAdminSkipsScope() { + BoundSql boundSql = render("countShops", params("userIds", null)); + + assertFalse(sqlOf(boundSql).contains("created_by_id"), "超管不裁剪店铺库"); + assertEquals(0, boundSql.getParameterMappings().size()); + } + + /** 店铺库里有 account/password/zn_username,候选下拉只能取店铺名。 */ + @Test + void shopOptionsAreDistinctNamesWithoutCredentialColumns() { + BoundSql boundSql = render("selectShopNames", params("userIds", List.of(5L))); String sql = sqlOf(boundSql); - assertTrue(sql.contains("MAX(u.deviceName) AS deviceName"), "设备名取日志侧"); - assertTrue(sql.contains("MAX(u.activityAt) AS lastActiveAt"), "活动时间取两侧最大"); - assertTrue(sql.contains("MAX(u.createdAt) AS recentTaskAt"), "最近任务时间取任务侧最大创建时间"); - assertTrue(sql.contains("GROUP BY u.deviceId")); - assertTrue(sql.contains("NULL AS deviceName"), "任务侧没有设备名"); - assertTrue(sql.contains("NULL AS createdAt"), "日志侧不贡献最近任务时间"); + assertTrue(sql.contains("SELECT DISTINCT s.shop_name FROM biz_shop_manage s")); + assertTrue(sql.contains("ORDER BY s.shop_name"), "店铺名去重、下拉稳定排序"); + assertTrue(sql.contains("LIMIT 2000"), "候选数量有上界"); + for (String secretColumn : List.of("password", "account", "zn_username", "mall_name")) { + assertFalse(sql.contains(secretColumn), "候选下拉不得带出凭据列: " + secretColumn); + } + assertEquals(1, boundSql.getParameterMappings().size()); } @Test - void runningCountByDeviceCountsOnlyDevicelessRows() { - BoundSql boundSql = render("countRunningTasksByDevice", params("userIds", List.of(5L))); + void activeTaskRowsUseBothSourcesWithTheSameStatusSets() { + BoundSql boundSql = render("selectActiveTasks", params("userIds", List.of(5L), "limit", 500L)); String sql = sqlOf(boundSql); - assertTrue(sql.contains("COUNT(*) AS runningTasks")); - assertTrue(sql.contains("GROUP BY u.deviceId")); - assertTrue(sql.contains("t.device_id IS NOT NULL AND t.device_id != ''"), "空设备号任务不归属设备"); - assertTrue(sql.contains("b.device_id IS NOT NULL AND b.device_id != ''")); - assertEquals(2, boundSql.getParameterMappings().size(), "两张表各绑一次可见账号集合"); + assertTrue(sql.contains("WHERE t.module_type IN('PUBLISH','DELETE_BRAND'"), + "只取客户端模块,服务端模块不入面板"); + assertFalse(sql.contains("'DEDUPE'"), "去重为服务端执行,不进面板"); + assertTrue(sql.contains("AND t.status IN('PENDING','RUNNING','SCHEDULED')")); + assertTrue(sql.contains("WHERE b.status IN('pending','running')"), "品牌表状态小写"); + assertTrue(sql.contains("CONCAT('brand-',b.id)"), "面板含品牌检测任务"); + assertTrue(sql.contains("t.updated_at AS updatedAt"), "最近上报时间来自 updated_at"); + assertTrue(sql.contains("LIMIT ?")); + assertEquals(3, boundSql.getParameterMappings().size(), + "可见账号在 biz/品牌两分支各绑定一次 + 行数上限"); } @Test - void onlineCountGroupsByDeviceAndKeepsOnlyFreshOnes() { - LocalDateTime since = LocalDateTime.of(2026, 9, 1, 0, 0); - BoundSql boundSql = render("countOnlineDevices", - params("userIds", null, "taskSince", since, "logSince", since, - "onlineSince", LocalDateTime.of(2026, 9, 28, 10, 0))); - String sql = sqlOf(boundSql); + void activeTaskRowsCarryNoFilterPlaceholders() { + String sql = sqlOf(render("selectActiveTasks", params("userIds", null, "limit", 500L))); - assertTrue(sql.contains("GROUP BY u.deviceId")); - assertTrue(sql.contains("HAVING MAX(u.activityAt) >= ?")); + assertFalse(sql.contains("t.device_id ="), "面板不按设备筛"); + assertFalse(sql.contains("EXISTS"), "面板不带店铺 EXISTS"); + assertFalse(sql.contains("request_json"), "面板不拉大 JSON 列"); assertFalse(sql.contains("__frch"), "超管不渲染账号占位符"); - assertEquals(4, boundSql.getParameterMappings().size(), - "任务窗口×2 + 日志窗口 + 在线阈值"); } @Test @@ -188,9 +186,7 @@ class TaskCenterQueryMapperSqlTest { @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)); + BoundSql boundSql = render("selectTaskPage", taskPageParams(null, 20L, 0L)); String sql = sqlOf(boundSql); assertTrue(sql.contains("SELECT m.* FROM(SELECT t.id AS id")); @@ -212,7 +208,7 @@ class TaskCenterQueryMapperSqlTest { void taskListFiltersReachBothBranchesAndBrandDropsShopFilter() { BoundSql boundSql = render("selectTaskPage", params("userIds", List.of(5L, 11L), "moduleType", "PUBLISH", "status", "RUNNING", - "deviceId", "pc-0001", "shop", "旗舰店", + "shop", "旗舰店", "startTime", LocalDateTime.of(2026, 9, 1, 0, 0), "endTime", LocalDateTime.of(2026, 9, 28, 0, 0), "limit", 20L, "offset", 20L)); @@ -221,27 +217,37 @@ class TaskCenterQueryMapperSqlTest { 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('%',?,'%'))")); + assertTrue(sql.contains("EXISTS(SELECT 1 FROM biz_publish_file p WHERE p.task_id = t.id" + + " AND LOWER(TRIM(p.shop_name)) = LOWER(TRIM(?)))")); + assertTrue(sql.contains("EXISTS(SELECT 1 FROM biz_file_result f WHERE f.task_id = t.id" + + " AND LOWER(TRIM(f.source_filename)) = LOWER(TRIM(?)))")); + assertTrue(sql.contains("OR(t.module_type IN(" + TaskCenterQueryMapper.FILE_RESULT_SHOP_MODULES + + ") AND EXISTS(SELECT 1 FROM biz_file_result f"), + "店铺筛选必须与店铺列同一条模块白名单,否则面板下钻会带出不该出现的任务"); + assertFalse(sql.contains("LIKE CONCAT('%',?,'%')"), "店铺筛选按规范化精确匹配,模糊会命中同名前缀"); assertEquals(5L, boundSql.getAdditionalParameter("__frch_uid_0")); - assertEquals(20, boundSql.getParameterMappings().size(), - "biz 11(账号×2/业务/状态/设备/起止/店铺×4)+ 品牌 7(账号×2/业务/状态/设备/起止)+ 分页 2"); + assertEquals(16, boundSql.getParameterMappings().size(), + "biz 8(账号×2/业务/状态/起止/店铺×2)+ 品牌 6(账号×2/业务/状态/起止)+ 分页 2"); + } + + @Test + void shopFilterDoesNotReadSnapshotScopeOrResultItemGroup() { + String filtered = sqlOf(render("selectTaskPage", taskPageParams("林芳", 20L, 0L))); + + assertFalse(filtered.contains("biz_task_result_item"), "任务结果分组不是店铺来源"); + assertFalse(filtered.contains("biz_task_progress_snapshot"), "进度快照不是店铺来源"); + assertFalse(filtered.contains("current_scope_key"), "快照 scope 是实例锁,不能当店铺筛"); } @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)); + BoundSql boundSql = render("selectTaskPage", taskPageParams(null, 100L, 0L)); String sql = sqlOf(boundSql); assertFalse(sql.contains("AND UPPER(t.module_type)"), "未选业务不加条件"); @@ -254,7 +260,7 @@ class TaskCenterQueryMapperSqlTest { @Test void taskCountSharesTheUnionBody() { BoundSql boundSql = render("countTaskPage", - params("userIds", null, "moduleType", "BRAND", "status", "RUNNING", "deviceId", null, + params("userIds", null, "moduleType", "BRAND", "status", "RUNNING", "shop", null, "startTime", null, "endTime", null)); String sql = sqlOf(boundSql); @@ -280,28 +286,45 @@ class TaskCenterQueryMapperSqlTest { String sql = sqlOf(boundSql); assertTrue(sql.contains("s.module_type AS moduleType"), "品牌 id 与 biz id 可能撞号,必须带业务名"); - assertTrue(sql.contains("s.current_scope_key AS currentScopeKey")); + assertTrue(sql.contains("s.current_scope_key AS currentScopeKey"), "快照 scope 只用于「当前处理」列"); assertEquals(2, boundSql.getParameterMappings().size()); } + /** 店铺只有两个真来源:上架结果文件的 shop_name、逐店落行的模块的 source_filename。 */ @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")); + BoundSql publishSql = render("selectPublishShops", params("taskIds", List.of(1L, 2L))); + BoundSql fileResultSql = render("selectFileResultShops", params("taskIds", List.of(1L, 2L))); + String publish = sqlOf(publishSql); + String fileResult = sqlOf(fileResultSql); + + assertTrue(publish.contains("GROUP BY p.task_id,p.shop_name")); + assertTrue(publish.contains("p.shop_name IS NOT NULL AND p.shop_name != ''")); + assertTrue(fileResult.contains("GROUP BY f.task_id,f.source_filename")); + assertTrue(fileResult.contains("f.source_filename IS NOT NULL AND f.source_filename != ''")); + assertEquals(2, publishSql.getParameterMappings().size(), "一次批量取,避免逐行 N+1"); + assertEquals(2, fileResultSql.getParameterMappings().size()); + } + + /** + * biz_file_result.source_filename 对所有模块都写「上传文件名」,只有 6 个模块写的是店铺名; + * 不加模块白名单就会把「采集中.xlsx」当店铺显示。 + */ + @Test + void fileResultShopSourceIsLimitedToPerShopModules() { + String sql = sqlOf(render("selectFileResultShops", params("taskIds", List.of(1L)))); + + assertTrue(sql.contains("JOIN biz_file_task ft ON ft.id = f.task_id")); + assertTrue(sql.contains("AND ft.module_type IN(" + TaskCenterQueryMapper.FILE_RESULT_SHOP_MODULES + ")"), + "逐行落店铺名的模块白名单必须是这条查询的条件"); + assertFalse(sql.contains("biz_task_result_item"), "任务结果分组不是店铺来源"); + assertFalse(sql.contains("biz_task_progress_snapshot"), "进度快照不是店铺来源"); } @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()); + void requestJsonFallbackIsGoneFromShopSources() { + assertFalse(sqlOf(render("selectPublishShops", params("taskIds", List.of(1L)))).contains("request_json")); + assertFalse(sqlOf(render("selectFileResultShops", params("taskIds", List.of(1L)))).contains("request_json")); } @Test @@ -314,7 +337,7 @@ class TaskCenterQueryMapperSqlTest { assertFalse(sql.contains("last_upload_at"), "设备名与任务时间无关,不限窗口"); } - /** 注解值必须是编译期常量,SQL 里只能写字面量;这条测试守住它与 Java 集合不漂移。 */ + /** 注解值必须是编译期常量,SQL 里只能写字面量;这两条测试守住它们与 Java 集合不漂移。 */ @Test void statusLiteralsStayInSyncWithSets() { assertEquals(TaskCenterQueryMapper.sqlList(TaskCenterQueryMapper.ACTIVE_STATUS_SET), @@ -327,6 +350,20 @@ class TaskCenterQueryMapperSqlTest { TaskCenterQueryMapper.BRAND_TERMINAL_STATUSES); } + /** + * 店铺来源白名单同样必须同源:这 6 个模块在结果行里写规范化店铺名 + * (上架走 biz_publish_file.shop_name,不在此列)。加一个模块 = 先确认它真逐行落店铺。 + */ + @Test + void shopModuleLiteralsStayInSyncWithSets() { + assertEquals(TaskCenterQueryMapper.sqlList(TaskCenterQueryMapper.FILE_RESULT_SHOP_MODULE_SET), + TaskCenterQueryMapper.FILE_RESULT_SHOP_MODULES); + assertEquals(List.of("PATROL_DELETE", "PRICE_TRACK", "PRODUCT_RISK_RESOLVE", "QUERY_ASIN", + "SHOP_DATA_CRAWL", "SHOP_MATCH"), + TaskCenterQueryMapper.FILE_RESULT_SHOP_MODULE_SET.stream().sorted().toList(), + "白名单成员变动必须是有意的(每加一个都要核实它的逐店行写法)"); + } + // ── 任务详情(Task 6)────────────────────────────────────────────── @Test @@ -353,7 +390,7 @@ class TaskCenterQueryMapperSqlTest { assertTrue(publish.contains("LIMIT 200"), "分组过多时封顶,防详情页拉爆"); String items = sqlOf(render("selectResultItemShopStats", params("taskId", 1L))); - assertTrue(items.contains("i.scope_key AS scopeKey")); + assertTrue(items.contains("i.scope_key AS scopeKey"), "详情分组仍按 result_item 的分组键"); assertTrue(items.contains("SUM(UPPER(i.status) = 'SUCCESS') AS success")); assertTrue(items.contains("GROUP BY i.scope_key")); assertTrue(items.contains("LIMIT 200")); 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 ab2d00ff0..3c5456474 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 @@ -8,8 +8,8 @@ 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.TaskCenterShopVo; import com.nanri.aiimage.modules.taskcenter.model.vo.TaskCenterTaskDetailVo; import com.nanri.aiimage.modules.taskcenter.model.vo.TaskCenterTaskPageVo; import com.nanri.aiimage.modules.taskcenter.model.vo.TaskCenterTaskRowVo; @@ -20,10 +20,13 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import java.time.Duration; import java.time.LocalDate; import java.time.LocalDateTime; +import java.util.Arrays; import java.util.List; import java.util.Set; +import java.util.stream.Collectors; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -40,8 +43,11 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; /** - * 只读查询的 Java 侧口径:时间窗口(卡住 10 分钟 / 在线 5 分钟 / 任务 30 天 / 日志 7 天)、 - * 设备花名册合并与在线判定、账号范围透传、任务列表装配(店铺来源优先级 / 快照匹配 / 分页)。 + * 只读查询的 Java 侧口径:看板维度是店铺。守四件事—— + * ① 卡住只有一个窗口(进行中且 10 分钟无上报); + * ② 汇总卡的「在跑店铺」与店铺面板行数同源,且都不把「不挂店铺」桶算成店铺; + * ③ 每个进行中任务必须在面板里出现(无店铺归属的落合成桶,不许静默消失); + * ④ 店铺只认真来源(上架文件 / 逐店落行文件),快照的 {@code current_scope_key} 是实例锁,不是店铺。 * SQL 本身由 TaskCenterQueryMapperSqlTest 守。 */ @ExtendWith(MockitoExtension.class) @@ -58,179 +64,16 @@ class TaskCenterQueryServiceTest { return new TaskCenterScopeService.ScopeContext(false, Set.of(userIds)); } - private static TaskCenterDeviceRow rosterRow(String deviceId, String deviceName, - LocalDateTime lastActiveAt, LocalDateTime recentTaskAt) { - TaskCenterDeviceRow row = new TaskCenterDeviceRow(); - row.setDeviceId(deviceId); - row.setDeviceName(deviceName); - row.setLastActiveAt(lastActiveAt); - row.setRecentTaskAt(recentTaskAt); - return row; - } - - private static TaskCenterDeviceRow runningRow(String deviceId, long running) { - TaskCenterDeviceRow row = new TaskCenterDeviceRow(); - row.setDeviceId(deviceId); - row.setRunningTasks(running); - return row; + private static boolean visiblePair(List userIds) { + return userIds != null && userIds.size() == 2 && userIds.containsAll(List.of(5L, 11L)); } private static boolean within(LocalDateTime value, LocalDateTime expected, long toleranceSeconds) { return value != null - && Math.abs(java.time.Duration.between(expected, value).getSeconds()) <= toleranceSeconds; + && Math.abs(Duration.between(expected, value).getSeconds()) <= toleranceSeconds; } - @Test - void overviewUsesDocumentedWindows() { - LocalDateTime before = LocalDateTime.now(); - when(queryMapper.countRunningTasks(isNull())).thenReturn(3L); - when(queryMapper.countStuckTasks(isNull(), any())).thenReturn(1L); - when(queryMapper.countFinishedTasksSince(isNull(), any())).thenReturn(7L); - when(queryMapper.countRosterDevices(isNull(), any(), any())).thenReturn(9L); - when(queryMapper.countOnlineDevices(isNull(), any(), any(), any())).thenReturn(4L); - - TaskCenterOverviewVo vo = service.overview(superScope()); - - assertEquals(3L, vo.getRunningTasks()); - assertEquals(1L, vo.getStuckTasks()); - assertEquals(7L, vo.getTodayFinishedTasks()); - assertEquals(9L, vo.getDeviceTotal()); - assertEquals(4L, vo.getDeviceOnline()); - - ArgumentCaptor stuckAt = ArgumentCaptor.forClass(LocalDateTime.class); - verify(queryMapper).countStuckTasks(isNull(), stuckAt.capture()); - assertTrue(within(stuckAt.getValue(), before.minusMinutes(10), 5), "卡住阈值 10 分钟"); - - ArgumentCaptor finishedSince = ArgumentCaptor.forClass(LocalDateTime.class); - verify(queryMapper).countFinishedTasksSince(isNull(), finishedSince.capture()); - assertEquals(LocalDate.now().atStartOfDay(), finishedSince.getValue(), "今日完成 = 今天 0 点起算"); - - ArgumentCaptor taskSince = ArgumentCaptor.forClass(LocalDateTime.class); - ArgumentCaptor logSince = ArgumentCaptor.forClass(LocalDateTime.class); - ArgumentCaptor onlineSince = ArgumentCaptor.forClass(LocalDateTime.class); - verify(queryMapper) - .countOnlineDevices(isNull(), taskSince.capture(), logSince.capture(), onlineSince.capture()); - assertTrue(within(taskSince.getValue(), before.minusDays(30), 5), "任务设备回看 30 天"); - assertTrue(within(logSince.getValue(), before.minusDays(7), 5), "日志设备回看 7 天"); - assertTrue(within(onlineSince.getValue(), before.minusMinutes(5), 5), "在线窗口 5 分钟"); - } - - @Test - void scopedOperatorPassesVisibleUsers() { - when(queryMapper.countRunningTasks(any())).thenReturn(0L); - when(queryMapper.countStuckTasks(any(), any())).thenReturn(0L); - when(queryMapper.countFinishedTasksSince(any(), any())).thenReturn(0L); - when(queryMapper.countRosterDevices(any(), any(), any())).thenReturn(0L); - when(queryMapper.countOnlineDevices(any(), any(), any(), any())).thenReturn(0L); - - service.overview(scoped(5L, 11L)); - - verify(queryMapper).countRunningTasks( - argThat(ids -> ids != null && ids.size() == 2 - && ids.containsAll(List.of(5L, 11L)))); - } - - @Test - void mergeDeviceRosterAggregatesTaskAndLogDevices() { - LocalDateTime now = LocalDateTime.now(); - when(queryMapper.listRosterDevices(any(), any(), any())).thenReturn(List.of( - rosterRow("dev-a", null, now.minusSeconds(30), now.minusMinutes(20)), - rosterRow("dev-b", "PC-B", now.minusMinutes(2), now.minusMinutes(40)))); - when(queryMapper.countRunningTasksByDevice(any())).thenReturn(List.of( - runningRow("dev-a", 2L), runningRow("dev-c", 1L))); - - List devices = service.devices(superScope()); - - assertEquals(3, devices.size(), "任务设备 ∪ 日志设备 ∪ 仅在跑任务的设备"); - TaskCenterDeviceVo devA = devices.stream().filter(d -> "dev-a".equals(d.getDeviceId())) - .findFirst().orElseThrow(); - assertEquals(2L, devA.getRunningTasks()); - assertNull(devA.getDeviceName(), "任务侧没有设备名,留给前端按 device_id 截断展示"); - TaskCenterDeviceVo devC = devices.stream().filter(d -> "dev-c".equals(d.getDeviceId())) - .findFirst().orElseThrow(); - assertEquals(1L, devC.getRunningTasks()); - assertNull(devC.getLastActiveAt(), "只有跑中任务、不在花名册窗口内的设备照常列出"); - assertFalse(devC.isOnline()); - } - - @Test - void onlineThresholdIsFiveMinutes() { - LocalDateTime now = LocalDateTime.now(); - when(queryMapper.listRosterDevices(any(), any(), any())).thenReturn(List.of( - rosterRow("fresh", "fresh", now.minusMinutes(4).minusSeconds(59), now), - rosterRow("stale", "stale", now.minusMinutes(5).minusSeconds(1), now))); - when(queryMapper.countRunningTasksByDevice(any())).thenReturn(List.of()); - - List devices = service.devices(superScope()); - - assertTrue(device(devices, "fresh").isOnline(), "4:59 → 在线"); - assertFalse(device(devices, "stale").isOnline(), "5:01 → 离线"); - } - - @Test - void blankDeviceIdsAreSkipped() { - LocalDateTime now = LocalDateTime.now(); - when(queryMapper.listRosterDevices(any(), any(), any())).thenReturn(java.util.Arrays.asList( - rosterRow(null, null, now, now), rosterRow("", null, now, now), - rosterRow("dev-a", "PC-A", now, now))); - when(queryMapper.countRunningTasksByDevice(any())).thenReturn(java.util.Arrays.asList( - runningRow(null, 1L), runningRow("dev-a", 1L))); - - List devices = service.devices(superScope()); - - assertEquals(1, devices.size(), "空设备号不入册(SQL 已滤,服务侧再兜一层)"); - assertEquals("dev-a", devices.get(0).getDeviceId()); - assertEquals(1L, devices.get(0).getRunningTasks(), "空设备号的跑中任务不计入任何设备"); - } - - @Test - void devicesSortedOnlineFirstThenRecency() { - LocalDateTime now = LocalDateTime.now(); - when(queryMapper.listRosterDevices(any(), any(), any())).thenReturn(List.of( - rosterRow("offline-new", "B", now.minusMinutes(30), now), - rosterRow("online-old", "C", now.minusMinutes(3), now.minusMinutes(20)), - rosterRow("online-new", "A", now.minusMinutes(2), now.minusMinutes(10)))); - when(queryMapper.countRunningTasksByDevice(any())).thenReturn(List.of()); - - List devices = service.devices(superScope()); - - assertEquals(List.of("online-new", "online-old", "offline-new"), - devices.stream().map(TaskCenterDeviceVo::getDeviceId).toList(), - "在线优先,其次最近活动倒序"); - } - - @Test - void webLoginDeviceIsFlagged() { - LocalDateTime now = LocalDateTime.now(); - when(queryMapper.listRosterDevices(any(), any(), any())).thenReturn(List.of( - rosterRow("web-1759000000-ab12", null, now, now), - rosterRow("pc-0001", null, now, now))); - when(queryMapper.countRunningTasksByDevice(any())).thenReturn(List.of()); - - List devices = service.devices(superScope()); - - assertTrue(device(devices, "web-1759000000-ab12").isWebDevice(), "网页登录标记"); - assertFalse(device(devices, "pc-0001").isWebDevice()); - assertEquals(2, devices.size(), "网页设备照常入册(是否隐藏由前端决定)"); - } - - private static TaskCenterDeviceVo device(List devices, String deviceId) { - return devices.stream().filter(d -> deviceId.equals(d.getDeviceId())) - .findFirst().orElseThrow(() -> new AssertionError("设备缺失: " + deviceId)); - } - - @Test - void scopedOperatorDevicesQueryUsesVisibleUsers() { - when(queryMapper.listRosterDevices(eq(List.of(5L)), any(), any())).thenReturn(List.of()); - when(queryMapper.countRunningTasksByDevice(eq(List.of(5L)))).thenReturn(List.of()); - - service.devices(scoped(5L)); - - verify(queryMapper).listRosterDevices(eq(List.of(5L)), any(), any()); - verify(queryMapper).countRunningTasksByDevice(eq(List.of(5L))); - } - - // ── 任务列表(Task 5)────────────────────────────────────────────── + // ── 造数helper ────────────────────────────────────────────────────── private static TaskCenterTaskRow taskRow(long id, String moduleType, String status, LocalDateTime createdAt, LocalDateTime updatedAt) { @@ -241,6 +84,15 @@ class TaskCenterQueryServiceTest { row.setStatus(status); row.setCreatedAt(createdAt); row.setUpdatedAt(updatedAt); + row.setUserId(5L); + return row; + } + + private static TaskCenterTaskRow brandTaskRow(long id, String status, + LocalDateTime createdAt, LocalDateTime updatedAt) { + TaskCenterTaskRow row = taskRow(id, "BRAND", status.toUpperCase(), createdAt, updatedAt); + row.setTaskNo("brand-" + id); + row.setBrand(true); return row; } @@ -264,206 +116,6 @@ class TaskCenterQueryServiceTest { 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()); - } - - // ── 任务详情(Task 6)────────────────────────────────────────────── - private static TaskCenterShopStatRow shopStat(String scopeKey, long total, long success, long failed) { TaskCenterShopStatRow row = new TaskCenterShopStatRow(); row.setScopeKey(scopeKey); @@ -480,13 +132,440 @@ class TaskCenterQueryServiceTest { return row; } + private static TaskCenterDeviceRow deviceNameRow(String deviceId, String deviceName) { + TaskCenterDeviceRow row = new TaskCenterDeviceRow(); + row.setDeviceId(deviceId); + row.setDeviceName(deviceName); + 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 static TaskCenterShopVo shop(List rows, String name) { + return rows.stream().filter(row -> name.equals(row.getShop())) + .findFirst().orElseThrow(() -> new AssertionError("店铺行缺失: " + name)); + } + + private void stubPage(List rows) { + when(queryMapper.countTaskPage(any(), any(), any(), any(), any(), any())) + .thenReturn((long) rows.size()); + when(queryMapper.selectTaskPage(any(), any(), any(), any(), any(), any(), anyLong(), anyLong())) + .thenReturn(rows); + } + + private void stubActiveTasks(List rows) { + when(queryMapper.selectActiveTasks(any(), anyLong())).thenReturn(rows); + } + + /** 上架文件店铺来源。 */ + private void stubPublishShops(List rows) { + when(queryMapper.selectPublishShops(any())).thenReturn(rows); + } + + /** 逐店落行模块的店铺来源。 */ + private void stubFileResultShops(List rows) { + when(queryMapper.selectFileResultShops(any())).thenReturn(rows); + } + + // ── 汇总卡 ────────────────────────────────────────────────────────── + + @Test + void overviewCountsShopsAndUsesTheOnlyDocumentedWindow() { + LocalDateTime before = LocalDateTime.now(); + LocalDateTime now = LocalDateTime.now(); + when(queryMapper.countShops(isNull())).thenReturn(86L); + when(queryMapper.countRunningTasks(isNull())).thenReturn(42L); + when(queryMapper.countStuckTasks(isNull(), any())).thenReturn(1L); + when(queryMapper.countFinishedTasksSince(isNull(), any())).thenReturn(7L); + stubActiveTasks(List.of(taskRow(1L, "COLLECT_DATA", "RUNNING", now, now))); + + TaskCenterOverviewVo vo = service.overview(superScope()); + + assertEquals(86L, vo.getShopTotal(), "总店铺 = 店铺库行数"); + assertEquals(42L, vo.getRunningTasks()); + assertEquals(1L, vo.getStuckTasks()); + assertEquals(7L, vo.getTodayFinishedTasks()); + + ArgumentCaptor stuckAt = ArgumentCaptor.forClass(LocalDateTime.class); + verify(queryMapper).countStuckTasks(isNull(), stuckAt.capture()); + assertTrue(within(stuckAt.getValue(), before.minusMinutes(10), 5), "卡住阈值 10 分钟"); + + ArgumentCaptor finishedSince = ArgumentCaptor.forClass(LocalDateTime.class); + verify(queryMapper).countFinishedTasksSince(isNull(), finishedSince.capture()); + assertEquals(LocalDate.now().atStartOfDay(), finishedSince.getValue(), "今日完成 = 今天 0 点起算"); + } + + @Test + void overviewRunningShopsEqualsPanelRowsExcludingTheBucket() { + LocalDateTime now = LocalDateTime.now(); + when(queryMapper.countShops(isNull())).thenReturn(86L); + stubActiveTasks(List.of( + taskRow(1L, "PRICE_TRACK", "RUNNING", now, now), + taskRow(2L, "COLLECT_DATA", "RUNNING", now, now))); + stubPublishShops(List.of(shopRow(1L, "林芳旗舰店"))); + stubFileResultShops(List.of()); + + TaskCenterOverviewVo vo = service.overview(superScope()); + List panel = service.shops(superScope()); + + assertEquals(1L, vo.getShopRunning(), "2 个在跑任务里只有 1 家真店铺,另一行是不挂店铺桶"); + assertEquals(2, panel.size(), "卡片与面板共用同一份聚合:面板 1 家店铺 + 1 行桶"); + assertEquals(1L, panel.stream().filter(row -> !row.isNoShop()).count()); + } + + @Test + void scopedOperatorPassesVisibleUsersToEveryQuery() { + service.overview(scoped(5L, 11L)); + service.shops(scoped(5L, 11L)); + service.shopOptions(scoped(5L, 11L)); + + // 可见集合由 Set 转来、顺序不定,断言必须与顺序无关。 + verify(queryMapper).countShops(argThat(TaskCenterQueryServiceTest::visiblePair)); + verify(queryMapper).countRunningTasks(argThat(TaskCenterQueryServiceTest::visiblePair)); + verify(queryMapper, times(2)) + .selectActiveTasks(argThat(TaskCenterQueryServiceTest::visiblePair), anyLong()); + verify(queryMapper).selectShopNames(argThat(TaskCenterQueryServiceTest::visiblePair)); + } + + @Test + void shopOptionsAreTheRegistryNamesAsReturned() { + when(queryMapper.selectShopNames(isNull())).thenReturn(List.of("林芳旗舰店", "美国店")); + + assertEquals(List.of("林芳旗舰店", "美国店"), service.shopOptions(superScope())); + } + + // ── 店铺面板 ──────────────────────────────────────────────────────── + + @Test + void everyActiveTaskLandsInExactlyOnePanelBucket() { + LocalDateTime now = LocalDateTime.now(); + stubActiveTasks(List.of( + taskRow(1L, "PRICE_TRACK", "RUNNING", now, now), + taskRow(2L, "COLLECT_DATA", "RUNNING", now, now), + brandTaskRow(3L, "running", now, now))); + stubPublishShops(List.of(shopRow(1L, "林芳旗舰店"))); + stubFileResultShops(List.of()); + + List panel = service.shops(superScope()); + + assertEquals(2, panel.size(), "1 家店铺 + 1 行不挂店铺桶"); + assertEquals(3L, panel.stream().mapToLong(TaskCenterShopVo::getRunningTasks).sum(), + "每个进行中任务恰好落进一个桶,采集数据与品牌任务不许在看板里消失"); + assertEquals(2L, shop(panel, TaskCenterQueryService.NO_SHOP_LABEL).getRunningTasks()); + } + + @Test + void multiShopTaskIsCountedUnderEachOfItsShops() { + LocalDateTime now = LocalDateTime.now(); + stubActiveTasks(List.of(taskRow(1L, "PRICE_TRACK", "RUNNING", now, now))); + stubPublishShops(List.of(shopRow(1L, "甲店"), shopRow(1L, "乙店"))); + stubFileResultShops(List.of()); + + List panel = service.shops(superScope()); + + assertEquals(2, panel.size()); + assertEquals(1L, shop(panel, "甲店").getRunningTasks()); + assertEquals(1L, shop(panel, "乙店").getRunningTasks(), "一个任务挂两家店 → 两家店各算 1 个在跑任务"); + } + + @Test + void sameShopWrittenTwoWaysStaysOneRow() { + LocalDateTime now = LocalDateTime.now(); + stubActiveTasks(List.of( + taskRow(1L, "PRICE_TRACK", "RUNNING", now, now), + taskRow(2L, "SHOP_MATCH", "RUNNING", now, now))); + stubPublishShops(List.of(shopRow(1L, "Amazon 美国店"), shopRow(2L, "amazon 美国店 "))); + stubFileResultShops(List.of()); + + List panel = service.shops(superScope()); + + assertEquals(1, panel.size(), "大小写与首尾空格差异不拆成两行(与 SQL 的 LOWER(TRIM) 同口径)"); + assertEquals("Amazon 美国店", panel.get(0).getShop(), "展示名沿用首次出现的写法"); + assertEquals(2L, panel.get(0).getRunningTasks()); + } + + @Test + void panelRowFlagsStuckTasksAndCarriesFreshestReport() { + LocalDateTime now = LocalDateTime.now(); + stubActiveTasks(List.of( + taskRow(1L, "PRICE_TRACK", "RUNNING", now.minusHours(2), now.minusMinutes(30)), + taskRow(2L, "SHOP_MATCH", "RUNNING", now.minusHours(1), now.minusSeconds(40)))); + stubPublishShops(List.of(shopRow(1L, "林芳旗舰店"), shopRow(2L, "林芳旗舰店"))); + stubFileResultShops(List.of()); + + TaskCenterShopVo row = shop(service.shops(superScope()), "林芳旗舰店"); + + assertEquals(2L, row.getRunningTasks()); + assertEquals(1L, row.getStuckTasks(), "只有 30 分钟没上报的那个算卡住"); + assertTrue(within(row.getLastReportAt(), now.minusSeconds(40), 5), "最近上报取该店所有在跑任务里最新的一次"); + assertEquals("定时匹配×1 / 跟价×1", row.getModuleSummary(), "按任务数倒序、同数按业务名稳定排列"); + } + + @Test + void moduleSummaryAggregatesCountsPerBusiness() { + LocalDateTime now = LocalDateTime.now(); + stubActiveTasks(List.of( + taskRow(1L, "PRICE_TRACK", "RUNNING", now, now), + taskRow(2L, "PRICE_TRACK", "RUNNING", now, now), + taskRow(3L, "SHOP_MATCH", "RUNNING", now, now))); + stubPublishShops(List.of(shopRow(1L, "甲店"), shopRow(2L, "甲店"), shopRow(3L, "甲店"))); + stubFileResultShops(List.of()); + + assertEquals("跟价×2 / 定时匹配×1", shop(service.shops(superScope()), "甲店").getModuleSummary()); + } + + @Test + void panelSortsStuckFirstThenStalestReportWithBucketLast() { + LocalDateTime now = LocalDateTime.now(); + stubActiveTasks(List.of( + taskRow(1L, "PRICE_TRACK", "RUNNING", now, now.minusMinutes(1)), + taskRow(2L, "PRICE_TRACK", "RUNNING", now, now.minusMinutes(30)), + taskRow(3L, "SHOP_MATCH", "RUNNING", now, now.minusMinutes(5)), + taskRow(4L, "COLLECT_DATA", "RUNNING", now, now.minusHours(3)))); + stubPublishShops(List.of(shopRow(1L, "A店"), shopRow(2L, "B店"), shopRow(3L, "C店"))); + stubFileResultShops(List.of()); + + List panel = service.shops(superScope()); + + assertEquals(List.of("B店", "C店", "A店", TaskCenterQueryService.NO_SHOP_LABEL), + panel.stream().map(TaskCenterShopVo::getShop).toList(), + "有卡住的排最前,其次最久没上报的,桶永远垫底(哪怕它最久没动)"); + } + + @Test + void brandTasksNeverQueryShopSourcesAndLandInTheBucket() { + LocalDateTime now = LocalDateTime.now(); + stubActiveTasks(List.of(brandTaskRow(7L, "running", now, now))); + + List panel = service.shops(superScope()); + + assertEquals(1, panel.size()); + assertTrue(panel.get(0).isNoShop(), "品牌任务按关键字执行,不落店铺,只能进桶"); + assertEquals(1L, panel.get(0).getRunningTasks()); + verify(queryMapper, never()).selectPublishShops(any()); + verify(queryMapper, never()).selectFileResultShops(any()); + } + + @Test + void emptyPanelDoesNotQueryShopSources() { + stubActiveTasks(List.of()); + + assertEquals(List.of(), service.shops(superScope())); + + verify(queryMapper, never()).selectPublishShops(any()); + verify(queryMapper, never()).selectFileResultShops(any()); + } + + // ── 任务列表 ──────────────────────────────────────────────────────── + + @Test + void usernameFilterIntersectsVisibleUsers() { + when(queryMapper.selectUserIdsByUsername("ali")).thenReturn(List.of(11L, 99L)); + when(queryMapper.countTaskPage(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()); + } + + @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()); + } + + @Test + void superAdminUsernameFilterKeepsAllMatches() { + when(queryMapper.selectUserIdsByUsername("ali")).thenReturn(List.of(11L, 99L)); + when(queryMapper.countTaskPage(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()); + } + + @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())).thenReturn(1L); + when(queryMapper.selectTaskPage(any(), any(), any(), any(), any(), any(), anyLong(), anyLong())) + .thenReturn(List.of()); + + TaskCenterTaskQuery query = new TaskCenterTaskQuery(); + query.setModuleType("PUBLISH"); + query.setStatus("RUNNING"); + 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("旗舰店"), eq(start), eq(end)); + verify(queryMapper).selectTaskPage(isNull(), eq("PUBLISH"), eq("RUNNING"), + eq("旗舰店"), eq(start), eq(end), eq(100L), eq(200L)); + } + + @Test + void stuckFlagBoundary() { + LocalDateTime now = LocalDateTime.now(); + stubPage(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))); + when(queryMapper.selectSnapshots(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 progressPrefersSnapshotAndSnapshotScopeIsNeverAShop() { + 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, "PRICE_TRACK", "RUNNING", now, now); + snapshotted.setTotalCount(99L); + + stubPage(List.of(plain, snapshotted)); + when(queryMapper.selectSnapshots(any())).thenReturn(List.of( + snapshotRow(2L, "PRICE_TRACK", 20L, 15L, 2L, "task:2:owner:pc-1", "处理中"))); + stubPublishShops(List.of(shopRow(1L, "店铺甲"), shopRow(1L, "店铺乙"))); + stubFileResultShops(List.of()); + + 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("处理中", second.getMessage()); + assertEquals("task:2:owner:pc-1", second.getCurrentScope(), "实例锁照原样透出,供排查"); + assertNull(second.getShopName(), "快照 scope 不是店铺:曾经的「在线设备 89」同源口径错误,不得回流"); + assertEquals(0L, second.getShopCount()); + } + + @Test + void shopSourcesDedupeAcrossBothTables() { + LocalDateTime now = LocalDateTime.now(); + stubPage(List.of(taskRow(1L, "PRICE_TRACK", "RUNNING", now, now))); + when(queryMapper.selectSnapshots(any())).thenReturn(List.of()); + stubPublishShops(List.of(shopRow(1L, "甲店"))); + stubFileResultShops(List.of(shopRow(1L, "甲店"), shopRow(1L, "乙店"))); + + TaskCenterTaskRowVo row = item(service.tasks(superScope(), new TaskCenterTaskQuery()), 1L); + + assertEquals(2L, row.getShopCount(), "两个来源重叠的店铺只记一次"); + assertEquals("甲店", row.getShopName()); + } + + @Test + void brandRowKeepsItsOwnIdentityWhenIdsCollide() { + LocalDateTime now = LocalDateTime.now(); + TaskCenterTaskRow biz = taskRow(7L, "PUBLISH", "SUCCESS", now, now); + TaskCenterTaskRow brand = brandTaskRow(7L, "failed", now, now); + + stubPage(List.of(biz, brand)); + when(queryMapper.selectSnapshots(any())).thenReturn(List.of( + snapshotRow(7L, "PUBLISH", 30L, 30L, 0L, "task:7:owner:pc-1", null), + snapshotRow(7L, "BRAND", 5L, 1L, 4L, "关键字A", null))); + stubPublishShops(List.of(shopRow(7L, "店铺甲"))); + stubFileResultShops(List.of()); + + 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("关键字A", brandVo.getCurrentScope()); + assertNull(brandVo.getShopName(), "撞号时品牌行不得继承 biz 行的店铺"); + assertEquals(0L, brandVo.getShopCount()); + assertFalse(brandVo.isStuck(), "终态品牌任务不判卡住"); + } + + @Test + void listRowsDoNotAssembleDeviceNames() { + LocalDateTime now = LocalDateTime.now(); + TaskCenterTaskRow row = taskRow(1L, "PRICE_TRACK", "RUNNING", now, now); + row.setDeviceId("pc-0001"); + + stubPage(List.of(row)); + when(queryMapper.selectSnapshots(any())).thenReturn(List.of()); + stubPublishShops(List.of()); + stubFileResultShops(List.of()); + + TaskCenterTaskPageVo page = service.tasks(superScope(), new TaskCenterTaskQuery()); + + assertEquals("pc-0001", item(page, 1L).getDeviceId(), "设备号仍透出(详情里当附注)"); + assertNull(item(page, 1L).getDeviceName(), "列表不查设备名:看板维度是店铺"); + verify(queryMapper, never()).selectDeviceNames(any()); + } + + @Test + void lastReportComesFromUpdatedAtWithCreatedAtFallback() { + LocalDateTime now = LocalDateTime.now(); + TaskCenterTaskRow updated = taskRow(1L, "PRICE_TRACK", "RUNNING", now.minusHours(5), now.minusMinutes(2)); + TaskCenterTaskRow createdOnly = taskRow(2L, "PRICE_TRACK", "PENDING", now.minusMinutes(7), null); + + stubPage(List.of(updated, createdOnly)); + when(queryMapper.selectSnapshots(any())).thenReturn(List.of()); + stubPublishShops(List.of()); + stubFileResultShops(List.of()); + + TaskCenterTaskPageVo page = service.tasks(superScope(), new TaskCenterTaskQuery()); + + assertTrue(within(item(page, 1L).getLastReportAt(), now.minusMinutes(2), 5), "有心跳取 updated_at"); + assertTrue(within(item(page, 2L).getLastReportAt(), now.minusMinutes(7), 5), "没更新过则回落到 created_at"); + } + + // ── 任务详情 ──────────────────────────────────────────────────────── + @Test void detailRoutesBrandPrefixToBrandTable() { LocalDateTime now = LocalDateTime.now(); - TaskCenterTaskRow brand = taskRow(12L, "BRAND", "RUNNING", now, now); - brand.setTaskNo("brand-12"); - brand.setBrand(true); - brand.setUserId(5L); + TaskCenterTaskRow brand = brandTaskRow(12L, "running", now, now); brand.setTotalCount(5L); brand.setSuccessCount(2L); brand.setErrorMessage("代理超时"); @@ -499,13 +578,13 @@ class TaskCenterQueryServiceTest { assertEquals("brand-12", detail.getTaskNo()); assertEquals("BRAND", detail.getModuleType()); assertEquals("品牌检测", detail.getModuleLabel()); - assertEquals("RUNNING", detail.getStatus()); assertEquals("ali", detail.getUsername()); assertEquals(5L, detail.getProgressTotal()); - assertEquals(2L, detail.getProgressSuccess()); assertEquals("代理超时", detail.getErrorMessage()); assertEquals(List.of(), detail.getShops(), "品牌任务无店铺维度"); + assertNull(detail.getShopName()); verify(queryMapper, never()).selectTaskByTaskNo(any()); + verify(queryMapper, never()).selectPublishShops(any()); verify(queryMapper, never()).selectResultItemShopStats(any()); } @@ -539,10 +618,9 @@ class TaskCenterQueryServiceTest { } @Test - void detailPublishShopsUsePublishFileStats() { + void detailPublishTaskGroupsByPublishFile() { LocalDateTime now = LocalDateTime.now(); TaskCenterTaskRow row = taskRow(1L, "PUBLISH", "SUCCESS", now, now); - row.setUserId(5L); row.setTotalCount(12L); row.setSuccessCount(10L); row.setFailedCount(2L); @@ -550,8 +628,8 @@ class TaskCenterQueryServiceTest { when(queryMapper.selectTaskByTaskNo("PUBLISH-1")).thenReturn(row); when(queryMapper.selectSnapshots(any())).thenReturn(List.of()); when(queryMapper.selectUsernames(any())).thenReturn(List.of(userRow(5L, "ali"))); - when(queryMapper.selectPublishShops(any())) - .thenReturn(List.of(shopRow(1L, "店铺甲"), shopRow(1L, "店铺乙"))); + stubPublishShops(List.of(shopRow(1L, "店铺甲"), shopRow(1L, "店铺乙"))); + stubFileResultShops(List.of()); when(queryMapper.selectPublishShopStats(1L)).thenReturn(List.of( shopStat("店铺甲", 12L, 10L, 2L), shopStat("店铺乙", 3L, 0L, 3L))); @@ -562,23 +640,22 @@ class TaskCenterQueryServiceTest { assertEquals(12L, detail.getShops().get(0).getTotal()); assertEquals(10L, detail.getShops().get(0).getSuccess()); assertEquals(2L, detail.getShops().get(0).getFailed()); - assertEquals("店铺甲", detail.getShopName(), "行级店铺仍走列表同款优先级链"); + assertEquals("店铺甲", detail.getShopName(), "行级店铺与列表同一套来源"); assertEquals(2L, detail.getShopCount()); assertEquals(12L, detail.getProgressTotal(), "无快照用行内文件计数"); verify(queryMapper, never()).selectResultItemShopStats(any()); } @Test - void detailNonPublishShopsUseResultItemStats() { + void detailPerShopModuleGroupsByResultItem() { LocalDateTime now = LocalDateTime.now(); TaskCenterTaskRow row = taskRow(9L, "QUERY_ASIN", "RUNNING", now, now); - row.setUserId(5L); when(queryMapper.selectTaskByTaskNo("QUERY_ASIN-9")).thenReturn(row); when(queryMapper.selectSnapshots(any())).thenReturn(List.of()); when(queryMapper.selectUsernames(any())).thenReturn(List.of()); - when(queryMapper.selectPublishShops(any())).thenReturn(List.of()); - when(queryMapper.selectResultItemShops(any())).thenReturn(List.of(shopRow(9L, "店铺乙"))); + stubPublishShops(List.of()); + stubFileResultShops(List.of(shopRow(9L, "店铺乙"))); when(queryMapper.selectResultItemShopStats(9L)).thenReturn(List.of(shopStat("店铺乙", 3L, 1L, 1L))); TaskCenterTaskDetailVo detail = service.detail(superScope(), "QUERY_ASIN-9"); @@ -586,32 +663,62 @@ class TaskCenterQueryServiceTest { assertEquals(1, detail.getShops().size()); assertEquals("店铺乙", detail.getShops().get(0).getScopeKey()); assertEquals(3L, detail.getShops().get(0).getTotal()); - assertEquals(1L, detail.getShops().get(0).getSuccess()); - assertEquals(1L, detail.getShops().get(0).getFailed()); + assertEquals("店铺乙", detail.getShopName()); verify(queryMapper, never()).selectPublishShopStats(any()); } @Test - void detailStuckFlagAndDeviceNameFollowListRules() { + void detailLeavesShopEmptyWhenNoShopSourceHits() { + LocalDateTime now = LocalDateTime.now(); + TaskCenterTaskRow row = taskRow(4L, "COLLECT_DATA", "RUNNING", now, now); + + when(queryMapper.selectTaskByTaskNo("COLLECT_DATA-4")).thenReturn(row); + when(queryMapper.selectSnapshots(any())).thenReturn(List.of()); + when(queryMapper.selectUsernames(any())).thenReturn(List.of()); + stubPublishShops(List.of()); + stubFileResultShops(List.of()); + when(queryMapper.selectResultItemShopStats(4L)).thenReturn(List.of()); + + TaskCenterTaskDetailVo detail = service.detail(superScope(), "COLLECT_DATA-4"); + + assertNull(detail.getShopName(), "不落店铺的模块就是没有店铺,不做文件名兜底"); + assertEquals(0L, detail.getShopCount()); + assertEquals(List.of(), detail.getShops()); + } + + @Test + void detailAssemblesDeviceNameAndLastReport() { LocalDateTime now = LocalDateTime.now(); TaskCenterTaskRow row = taskRow(3L, "PRICE_TRACK", "RUNNING", now.minusHours(2), now.minusMinutes(30)); - row.setUserId(5L); row.setDeviceId("pc-0001"); when(queryMapper.selectTaskByTaskNo("PRICE_TRACK-3")).thenReturn(row); when(queryMapper.selectSnapshots(any())).thenReturn(List.of()); when(queryMapper.selectUsernames(any())).thenReturn(List.of(userRow(5L, "ali"))); - when(queryMapper.selectDeviceNames(any())).thenReturn(List.of(rosterRow("pc-0001", "PC-1", now, now))); - 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()); + when(queryMapper.selectDeviceNames(any())).thenReturn(List.of(deviceNameRow("pc-0001", "PC-1"))); + stubPublishShops(List.of()); + stubFileResultShops(List.of()); + when(queryMapper.selectResultItemShopStats(3L)).thenReturn(List.of()); TaskCenterTaskDetailVo detail = service.detail(superScope(), "PRICE_TRACK-3"); - assertTrue(detail.isStuck(), "进行中 30 分钟无更新 → 卡住"); + assertTrue(detail.isStuck(), "进行中 30 分钟无上报 → 卡住"); assertEquals("PC-1", detail.getDeviceName()); assertFalse(detail.isWebDevice()); - assertEquals(List.of(), detail.getShops(), "无结果明细时店铺统计为空"); + assertTrue(within(detail.getLastReportAt(), now.minusMinutes(30), 5)); + } + + // ── 口径护栏 ──────────────────────────────────────────────────────── + + @Test + void deviceDimensionAndJsonFallbackSourcesAreGoneFromTheMapper() { + Set methods = Arrays.stream(TaskCenterQueryMapper.class.getDeclaredMethods()) + .map(java.lang.reflect.Method::getName).collect(Collectors.toSet()); + + for (String retired : List.of("listRosterDevices", "countRosterDevices", "countOnlineDevices", + "countRunningTasksByDevice", "selectResultItemShops", "selectRequestJson")) { + assertFalse(methods.contains(retired), retired + " 不得回流:设备维度已下线," + + "把结果分组名/大 JSON 列当店铺是「在线设备」那类口径错误的同源写法"); + } } } diff --git a/docs/specs/16-client-task-console.md b/docs/specs/16-client-task-console.md index e13fa0afc..cdf5326b7 100644 --- a/docs/specs/16-client-task-console.md +++ b/docs/specs/16-client-task-console.md @@ -2,8 +2,13 @@ ## 模块职责 -后台新增「客户端任务管理」页面,让管理员**按账号 × 设备 × 业务**统一查看客户端任务执行情况, -不必逐台设备排查;超管可看全部。管理员只能看本组(本人 + 本组用户 + 自己管理的成员)。 +后台「客户端任务管理」页面,让管理员**按店铺 × 账号 × 业务**统一查看客户端任务执行情况。 +本页的目的地是「哪家店现在有任务在跑、跑得到不到底」,一屏看完,不必逐台客户端登录检查; +超管可看全部,管理员只能看本组(本人 + 本组用户 + 自己管理的成员)。 + +看板维度是**店铺**,不是设备:设备号只是任务的一个附注(详情里展示「跑在哪台机」), +不参与任何统计口径。改造前用「在线设备」计数,把「近 5 分钟有日志上报的设备」当成了存活, +网页登录设备与只上报日志的设备一起进数,与「有客户端任务在跑」根本不是同一件事。 覆盖页面: @@ -13,8 +18,12 @@ - **默认只有超管可见**;管理员需超管在「用户管理 → 菜单权限」授权后可见 —— 复用现有菜单授权机制 (`columns` + `user_column_permission`),**不新建权限机制**:无授权记录 = 管理员看不到。 -- 列表字段:账号名、店铺、业务名称、任务状态、执行开始时间、任务结束时间、执行进度 + - 当前处理等补充列,并提供筛选;设备维度经设备条 / 设备筛选与详情抽屉呈现。 +- 顶部汇总卡:总店铺 / 在跑店铺 / 进行中任务 / 今日完成 / 疑似卡住。 +- 全局在跑店铺面板:一行一个店铺,列在跑任务数、疑似卡住数、业务分布、最近上报;点行下钻到该店铺的任务。 +- 列表字段:账号名、店铺、业务名称、任务状态、当前处理、开始时间、最近上报、结束时间、执行进度, + 并提供筛选(账号/业务/状态/店铺/时间范围)。 +- 「只要客户端任务在跑就上报」是面板的前提:进行中任务的 `updated_at` 由心跳(60s)与结果回传共同顶新, + 因此不再需要任何设备身份基线(曾用过的 code.txt 台账已放弃)。 ## 依赖关系 @@ -23,9 +32,11 @@ - 菜单授权:`columns` / `user_column_permission`(整树替换授权;超管直通) - 组范围裁剪:`ShopManageGroupMapper.selectAccessibleGroupIds / selectUserIdsByGroupIds / selectManagedMemberUserIds`(先例 `DedupeTotalDataService.resolveAccessScope:1179`) -- 设备标识:`AdminAuthSupport.currentDeviceId`(JWT 签名 deviceId claim,空串=来源不明; - 先例 `PublishController` → `biz_publish_file.device_id`,V130) -- 设备花名册/存活:`device_log_file`(V127;客户端日志上报 60s 一轮) +- 设备标识(只在详情展示,不参与统计):`AdminAuthSupport.currentDeviceId`(JWT 签名 deviceId claim, + 空串=来源不明;先例 `PublishController` → `biz_publish_file.device_id`,V130), + 展示名回落 `device_log_file`(V127) +- 店铺库:`biz_shop_manage`(`shop_name` 唯一、`created_by_id` 归组,无软删列) +- 逐店落行的结果文件:`biz_file_result.source_filename`(仅 6 个模块按店铺建行) - 进度口径:`biz_task_progress_snapshot` 优先,文件计数兜底 - 麦象 console:`MaixiangConsoleClient`(复用,token 查询参数鉴权) @@ -37,7 +48,7 @@ |---|---| | `biz_file_task`(12) | PUBLISH 上架、DELETE_BRAND 删除ASIN、PRODUCT_RISK_RESOLVE 商品风险解决、PRICE_TRACK 跟价、SHOP_MATCH 定时匹配、PATROL_DELETE 巡店删除、QUERY_ASIN 查询ASIN、WITHDRAW 取款、APPEARANCE_PATENT 外观专利检测、SIMILAR_ASIN 货源查询、COLLECT_DATA 采集数据、SHOP_DATA_CRAWL 店铺数据抓取 | | `brand_crawl_tasks`(1) | BRAND 品牌检测(该表自建、不写 biz_file_task,见 BrandTaskRetentionService 注释) | -| 不显示 | DEDUPE / SPLIT / CONVERT(纯服务端执行,无客户端设备归属) | +| 不显示 | DEDUPE / SPLIT / CONVERT(纯服务端执行,客户端不跑,也就没有店铺/设备归属) | 两表字段映射(UNION ALL,子查询内下推过滤,外层排序分页): @@ -45,51 +56,60 @@ - `status` 统一大写输出(品牌表存小写):`UPPER(status)` - `created_at` / `updated_at` 同名;品牌任务无 `finished_at`,用终态时的 `updated_at` 代替 - 进度:品牌任务用 `progress_current / progress_total` -- 过滤条件(账号/状态/设备/时间范围)分别下推到两个子查询,各自走自己的索引 +- 过滤条件(账号/状态/店铺/时间范围)分别下推到两个子查询,各自走自己的索引 + (`biz_file_task` 有 `idx_module_status(module_type, status)`,进行中面板直接复用它) -### 设备口径 +### 设备号(只作附注,不参与统计) -- 任务创建时记录 `device_id` = JWT 签名 claim(`AdminAuthSupport.currentDeviceId`)。 - **网页登录**(`web--`)照记,列表按 `web-` 前缀识别并标注「网页」。 +- 任务创建时记录 `device_id` = JWT 签名 claim。 + **网页登录**(`web--`)照记,详情按 `web-` 前缀识别并标注「网页」。 - 记录点:13 个模块创建入口 controller 取 deviceId → service 落库(内部令牌调用取到空串, 照记空 = 未记录);续跑任务(`TaskResumeService`)**继承原任务 device_id**。 -- 新列:`biz_file_task.device_id`、`brand_crawl_tasks.device_id`(V138)。 -- 历史任务 device_id 为空 → 显示「未记录」(不回填,无法追溯)。 -- 设备展示名:`device_id` → `device_log_file` 该设备 `device_name`(主机名,同设备多行聚合取 MAX, - 与 `DeviceLogService.recentDevices` 同款);查不到时显示 device_id 截断值。 +- 列:`biz_file_task.device_id`、`brand_crawl_tasks.device_id`(V138)。 + 历史任务 device_id 为空 → 显示「未记录」(不回填,无法追溯)。 +- 展示名:`device_id` → `device_log_file` 该设备 `device_name`(主机名,同设备多行聚合取 MAX, + 与 `DeviceLogService.recentDevices` 同款);**只在详情查一次**,列表不查设备名。 +- 原「设备花名册 + 5 分钟在线」口径已整体删除(任务设备近 30 天 ∪ 日志设备近 7 天那套 UNION、 + `countOnlineDevices`、`/devices` 接口与前端设备条),不再有任何以设备为分母的数字。 -### 设备花名册(设备筛选器 + 设备状态卡) +### 店铺归属:两个真来源 + 一个「不挂店铺」桶 -两台来源合并去重: +面板与列表的店铺只认两个来源: -1. **任务设备**:`biz_file_task` / `brand_crawl_tasks` 中该范围可见用户**近 30 天创建过任务** - 的 device_id(空值不参与); -2. **日志设备**:`device_log_file` 中 `source='client'`、`uid` ∈ 可见用户且**近 7 天有上报** - (`last_upload_at`);`uid` 为空的日志设备不能归组,不显示(若其 device_id 已在任务设备 - 集合内则保留)。 +| 来源 | 覆盖模块 | 说明 | +|---|---|---| +| `biz_publish_file.shop_name` | PUBLISH | 上架结果文件,按 task_id 聚合 distinct | +| `biz_file_result.source_filename` | PATROL_DELETE、PRICE_TRACK、PRODUCT_RISK_RESOLVE、QUERY_ASIN、SHOP_DATA_CRAWL、SHOP_MATCH | 这 6 个模块逐店落行,`source_filename` 存的就是规范化后的店铺名;SQL 里必须带这份模块白名单,否则会把别的模块的**上传文件名**当店铺 | -状态判定: +已否决的候选(都会把不是店铺的东西当店铺): -- **在线** = 最近上报(`last_upload_at` 或任务 `updated_at` 取最新)≤ 5 分钟; -- **正在跑任务** = 该设备存在 RUNNING/进行中任务(含 BRAND 的 running/pending); -- 两者独立展示:在线但空闲、离线但仍有终态任务都可区分。 +- `biz_task_progress_snapshot.current_scope_key` —— 形如 `task::owner:`,是**实例锁**; + 品牌行该列是品牌关键字。列表仍原样透出这一列(排查「哪个实例占着任务」),但它不是店铺。 +- `biz_task_result_item.scope_key` —— 任务结果分组名。 +- `request_json.items[].shopName` —— 大 JSON 列;列表主查询刻意不拉它,为兜底把它读出来过一次代价太大。 -### 店铺口径 +COLLECT_DATA / SIMILAR_ASIN / APPEARANCE_PATENT / BRAND 这些不落店铺,面板给它们一行合成桶 +**「不挂店铺」**(`noShop=true`):按线上一次实测 42 个在跑任务里有 19 个属于这一类, +没有桶它们就会在看板里静默消失。桶行不可下钻(没有可筛的店铺名),要看这些任务用业务筛选。 -任务本身不存店铺(品牌检测按关键字执行,不落店铺),按**来源优先级链**取第一个非空的来源; -多店铺统一显示「当前店铺 + 共 N 个」: +一个任务挂多家店铺时在每家店下各计一次;归组键 `LOWER(TRIM(...))`,同一店两种写法不拆成两行, +展示名沿用首次出现的写法。 -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`(兜底,只对当页前四个来源都为空的任务批量拉一次)。 +### 店铺口径(面板与卡片) -各模块的主来源天然落在链上的对应位置,未列出的模块自动降级到下一来源;品牌行店铺恒空。 +- **总店铺** = `biz_shop_manage` 中可见账号(`created_by_id`)名下的店铺数(超管不裁剪)。 +- **在跑店铺** = 面板行数减去「不挂店铺」桶。汇总卡与 `/shops` **共用同一次聚合** + (`TaskCenterQueryService.aggregateShops`),卡片说几家在跑、面板就列几行,两处不允许各算各的。 +- 面板原料 = 当前全部进行中任务(客户端 12 模块 ∪ 品牌),行数上限 500;触顶时服务层 `log.warn`, + 卡片的进行中/卡住/今日完成三项仍走 SQL 精确计数。 +- 面板排序:有卡住的排前面 → 最久没上报的排前面 → 「不挂店铺」桶永远垫底。 +- 店铺筛选:上面两个来源任一命中(EXISTS + `LOWER(TRIM(...)) = LOWER(TRIM(?))` **精确**匹配, + LIKE 会让「林芳」命中「林芳芳」);品牌分支带店铺筛选时恒空(品牌不存店铺,且品牌 id 会与 biz 撞号)。 -店铺筛选:对来源 1~4 做 EXISTS 子查询(四张表都有 task_id 索引:`biz_publish_file` / -`idx_result_item_task` / `idx_task_id` / `uk_task_progress_snapshot`),与其余筛选一起下推到 -主查询;`request_json` 不参与筛选。 +### 任务列表的店铺列 + +`shopName` 取该任务店铺列表的第一个,`shopCount` 是数量;无来源命中时留空(显示「—」), +不做文件名/请求体兜底 —— 宁可空,不把文件名当店铺。 ### 进度口径(列表/详情展示) @@ -102,9 +122,13 @@ ### 「是否正常在跑」判定 -- 进行中且 `updated_at` 距今 ≤ 10 分钟 → 正常(任务心跳 60s 一轮); +- 进行中且 `updated_at` 距今 ≤ 10 分钟 → 正常(任务心跳 60s 一轮,结果回传也顶新); - 进行中且 > 10 分钟无更新 → 「疑似卡住」(**仅展示提示,不做处置动作**); -- 终态 → 成功/失败/已取消,按 `status` 展示。 + `updated_at` 缺失时回落 `created_at` 判老; +- 终态 → 成功/失败/已取消,按 `status` 展示; +- 列表/详情/面板统一输出 `lastReportAt`(= `updated_at`,缺失回落 `created_at`),文案用「最近上报」, + 不再说「在线/离线」——设备是否在线与任务是否在跑是两件事。 +- 唯一的窗口就是这 10 分钟;30 天 / 7 天 / 5 分钟那三个设备窗口随设备维度一起删除。 ## 数据库迁移 V138 @@ -118,7 +142,7 @@ 回滚:DROP 两列与索引;`DELETE FROM columns WHERE column_key='admin_task_center'`。 -## 后端接口(5 个,全部只读) +## 后端接口(6 个,全部只读) 新模块包 `modules/taskcenter/`(controller / service / mapper / vo)。 @@ -132,9 +156,10 @@ SQL 用 `@Select` 注解 mapper + 手写 LIMIT/OFFSET 分页(先例 `ImageVide | 接口 | 说明 | |---|---| -| `GET /api/admin/task-center/overview` | 汇总卡:设备总数/在线数、进行中任务数、今日完成任务数、疑似卡住数 | -| `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/overview` | 汇总卡:shopTotal 总店铺、shopRunning 在跑店铺、runningTasks 进行中、todayFinishedTasks 今日完成、stuckTasks 疑似卡住 | +| `GET /api/admin/task-center/shops` | 在跑店铺面板:shop、noShop(是否「不挂店铺」桶)、runningTasks、stuckTasks、moduleSummary(如「跟价×2 / 定时匹配×1」)、lastReportAt | +| `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 筛选 | @@ -142,10 +167,14 @@ SQL 用 `@Select` 注解 mapper + 手写 LIMIT/OFFSET 分页(先例 `ImageVide `admin-frontend-vue/src/pages/task-center/`: -- `TaskCenterBoardPage.vue`:外层页签 + 筛选栏(账号/业务/状态/设备/店铺/时间范围)+ 汇总卡 + - 设备状态卡条(在线点、运行中任务数,点击筛选该设备); -- 页签一「客户端任务」:`el-table`(账号、店铺、业务、状态、当前处理、开始、结束、进度条、操作) - + 详情 `el-drawer`; +- `TaskCenterBoardPage.vue`:外层页签 + 汇总卡(总店铺/在跑店铺/进行中任务/今日完成/疑似卡住)+ + 在跑店铺看板 + 筛选栏(账号/业务/状态/店铺/时间范围); +- 在跑店铺看板:表格一行一个店铺(店铺、在跑任务、疑似卡住、业务分布、最近上报), + 点真店铺行 = 按该店铺精确筛任务(再点一次取消),「不挂店铺」桶行不可点并带说明文案; +- 店铺筛选:`el-select filterable clearable`,候选 = 店铺库 ∪ 面板出现的店铺名 + (店铺已删、但任务还在的情形也筛得动); +- 页签一「客户端任务」:表格(账号、店铺、业务、状态、当前处理、开始、最近上报、结束、进度条、操作) + + 详情 `el-drawer`(设备名与分组明细只在详情出现); - 页签二「变体采集」:状态筛选 + 表格(账号、任务号、状态、开始/更新时间、进度文字 res_mes); - 30s 轮询:`document.hidden` 暂停、卸载清理、手动刷新按钮。 @@ -168,9 +197,15 @@ Java 侧同步扩展 `MaixiangConsoleClient.BatchTaskItem`(加 resMes 字段 ## 测试策略 -- Java:组裁剪(超管直通 / 空集 IN(-1) / 组内多用户)、两表 UNION 分页与筛选、 - 设备花名册合并、进度兜底、卡住判定边界(9/10/11 分钟)、V138 幂等; -- 前端:页面渲染/筛选/页签切换/轮询清理(vitest); +- Java:`TaskCenterQueryServiceTest` 守「卡片在跑店铺 = 面板行数减桶」「每个进行中任务恰好落进一个桶 + (无店铺归属的不许消失)」「多店任务每店各计一次」「两种写法归一行」「快照 scope 不是店铺」 + 「品牌行撞号时不继承 biz 行店铺」「卡住边界 9/10/11 分钟」「列表不查设备名」; + `TaskCenterQueryMapperSqlTest` 守 SQL:店铺筛选带模块白名单 + 精确匹配、面板查询不带筛选占位符、 + `current_scope_key` 不出现在店铺位置,并用反射断言 `selectRequestJson`/`selectResultItemShops`/ + 设备花名册那批方法已不存在;组裁剪(超管直通 / 空集 `IN(-1)` / 组内多用户)、V138 幂等同前; +- 前端:`tests/task-center-board.test.ts` 守接口清单(6 个)、设备维度不得回流(`deviceTotal`/ + `deviceOnline`/`/devices`/`filter.deviceId` 全部断言不存在)、面板下钻与桶行不可点接线、 + 筛选参数与三种空态; - 麦象:多 uid 过滤与 res_mes 返回(pytest); - 既有门禁:`align-operation-guide` / `AdminMenuRouteMatrix` / 路由注册表校验必须保持绿。 @@ -184,8 +219,13 @@ Java 侧同步扩展 `MaixiangConsoleClient.BatchTaskItem`(加 resMes 字段 ## 风险与边界 -- 历史任务无设备号(V138 之前创建)→ 统一「未记录」; -- 组裁剪按 **任务发起账号(user_id)** 判定可见性,不按设备归属; - 设备若跨组使用(同机多账号),任务仍按账号归组,不会串组; +- 历史任务无设备号(V138 之前创建)→ 详情显示「未记录」;看板不看设备,不受影响; +- 「不挂店铺」桶里的任务不能按店铺下钻(它们本来没有店铺维度),只能按业务筛; +- `biz_file_result.source_filename` 作为店铺只在这 6 个逐店落行的模块成立,其余模块该列是上传文件名, + 由 SQL 模块白名单挡在外面;店铺名对不上时表现为「不挂店铺」,不会串到别的店; +- 面板取进行中任务上限 500 行:触顶时卡片仍按 SQL 精确计数、面板会少列,服务层 `log.warn` + (实测在跑任务为数十量级); +- 组裁剪按 **任务发起账号(user_id)** 判定任务可见性,店铺库按 `created_by_id`; + 店铺若跨组共用,任务仍按账号归组,不会因为店铺同名而串组; - 品牌任务状态小写、其余大写,**接口层统一转大写**,前端只认一套; -- 变体采集无设备/店铺归属(麦象侧无此数据),页签二不显示这两列。 +- 变体采集无店铺归属(麦象侧无此数据),页签二不显示店铺列。