feat(看板): 客户端任务管理从设备维度改为店铺维度全局在跑看板

原「在线设备」卡按日志上报窗口统计,把 89 台算成在线,与实际在跑的客户端数差一个
量级,且设备维度并不能回答"哪台机器上有任务卡住"。改为:

- 汇总卡:总店铺 / 在跑店铺 / 进行中任务 / 今日完成 / 疑似卡住
- 新增「在跑店铺看板」:当前所有进行中任务按店铺归组(在跑数、卡住数、业务分布、
  最近上报),点店铺行下筛该店铺任务;不落店铺的任务归「不挂店铺」桶
- 卡片与面板同源(同一个 aggregateShops),杜绝口径分裂
- 店铺只认两个真来源:上架结果文件 + 逐店落行的结果文件名;
  biz_task_progress_snapshot.current_scope_key 是实例锁不是店铺,已从口径中剔除
- 设备号退为详情附注,花名册 /devices 与在线判定整条链删除
- 上报口径只留一个 10 分钟窗口(进行中且超 10 分钟无上报 = 疑似卡住)

后端 3487 例全绿;新增反射护栏断言设备维度查询与快照当店铺的来源已彻底移除。
This commit is contained in:
2026-10-03 22:41:29 +08:00
parent e3541a7aa7
commit e1f1aa8b16
18 changed files with 1222 additions and 1037 deletions
@@ -5,8 +5,8 @@ import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.modules.permission.service.PermissionMenuService;
import com.nanri.aiimage.modules.taskcenter.model.dto.TaskCenterTaskQuery;
import com.nanri.aiimage.modules.taskcenter.model.vo.TaskCenterDeviceVo;
import com.nanri.aiimage.modules.taskcenter.model.vo.TaskCenterOverviewVo;
import com.nanri.aiimage.modules.taskcenter.model.vo.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.TaskCenterVariantPageVo;
@@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* 后台「客户端任务管理」:按账号 × 设备 × 业务统一看客户端任务,不必逐台排查。
* 后台「客户端任务管理」:按店铺 × 账号 × 业务统一看客户端任务,不必逐台客户端排查。
*
* <p>仅超管默认可见;管理员需超管在「用户管理 → 菜单权限」授权 {@code admin_task_center}
* 后才能访问。数据范围 = 本人 + 本组用户 + 自己管理的成员(超管不裁剪)。</p>
@@ -35,7 +35,7 @@ import java.util.List;
@RequiredArgsConstructor
@Slf4j
@RequestMapping("/api/admin/task-center")
@Tag(name = "客户端任务管理(后台)", description = "客户端任务与设备状态看板;设备号取自 JWT 签名 claim。")
@Tag(name = "客户端任务管理(后台)", description = "客户端任务与店铺在跑状态看板;全部只读。")
public class AdminTaskCenterController {
private final AdminAuthSupport adminAuthSupport;
@@ -45,24 +45,35 @@ public class AdminTaskCenterController {
private final TaskCenterVariantService variantService;
@GetMapping("/overview")
@Operation(summary = "汇总卡", description = "设备总数/在线数、进行中任务数、今日完成任务数、疑似卡住数(>10 分钟无更新)。")
@Operation(summary = "汇总卡", description = "总店铺/在跑店铺数、进行中任务数、今日完成任务数、"
+ "疑似卡住数(进行中且 >10 分钟无上报)。")
public ApiResponse<TaskCenterOverviewVo> overview(HttpServletRequest request) {
TaskCenterScopeService.ScopeContext scope = resolveScope(request);
return ApiResponse.success(queryService.overview(scope));
}
@GetMapping("/devices")
@Operation(summary = "设备列表",
description = "设备花名册(任务设备近 30 天 ∪ 客户端日志设备近 7 天)+ 在线/跑任务状态;在线优先排序。")
public ApiResponse<List<TaskCenterDeviceVo>> devices(HttpServletRequest request) {
@GetMapping("/shops")
@Operation(summary = "店铺面板",
description = "当前所有进行中任务按店铺归组:在跑任务数/疑似卡住数/业务分布/最近上报时间;"
+ "不落店铺的任务归进「不挂店铺」桶,与汇总卡的在跑店铺数同源。")
public ApiResponse<List<TaskCenterShopVo>> shops(HttpServletRequest request) {
TaskCenterScopeService.ScopeContext scope = resolveScope(request);
return ApiResponse.success(queryService.devices(scope));
return ApiResponse.success(queryService.shops(scope));
}
@GetMapping("/shop-options")
@Operation(summary = "店铺筛选候选",
description = "店铺库(biz_shop_manage)在可见范围内的店铺名,供筛选下拉精确匹配;只出店铺名。")
public ApiResponse<List<String>> shopOptions(HttpServletRequest request) {
TaskCenterScopeService.ScopeContext scope = resolveScope(request);
return ApiResponse.success(queryService.shopOptions(scope));
}
@GetMapping("/tasks")
@Operation(summary = "任务分页列表",
description = "biz_file_task(12 个客户端模块)∪ brand_crawl_tasks 按创建时间倒序;"
+ "店铺跨 4 个来源模糊匹配;进行中且 >10 分钟无更新标记 stuck。")
+ "店铺按规范化名精确匹配(来源=上架结果文件 + 逐店落行的结果文件名);"
+ "进行中且 >10 分钟无上报标记 stuck。")
public ApiResponse<TaskCenterTaskPageVo> tasks(HttpServletRequest request, TaskCenterTaskQuery query) {
TaskCenterScopeService.ScopeContext scope = resolveScope(request);
return ApiResponse.success(queryService.tasks(scope, query));
@@ -22,6 +22,10 @@ import java.util.stream.Collectors;
* (品牌检测自建表,不写 biz_file_task)。状态口径:biz_file_task 大写、brand_crawl_tasks
* 小写,这里统一在 SQL 内各自匹配,不依赖外层转换。</p>
*
* <p>看板维度是<b>店铺</b>不是设备:店铺只有两个真来源({@link #FILE_RESULT_SHOP_MODULES}
* 里的模块写 {@code biz_file_result.source_filename},上架写 {@code biz_publish_file.shop_name}),
* 店铺库取 {@code biz_shop_manage}。任务侧的存活口径是 {@code updated_at}(心跳与结果回传都会顶新)。</p>
*
* <p>范围裁剪:{@code userIds == null} 表示超管(不过滤);非超管传可见用户集合
* (空集由调用方兜底为 {@code [-1]},保证选中零行)。</p>
*/
@@ -49,6 +53,20 @@ public interface TaskCenterQueryMapper {
/** brand_crawl_tasks 终态。 */
Set<String> BRAND_TERMINAL_STATUS_SET = Set.of("success", "failed", "cancelled");
/**
* 逐行把「规范化后的店铺名」写进 {@code biz_file_result.source_filename} 的模块白名单
* (各模块在结果行落库时调 {@code ziniaoShopSwitchService.normalizeShopName})。
*
* <p>不能放宽:{@code source_filename} 对所有模块都写,其它模块写的就是上传文件名
* (如「采集中.xlsx」「货源查询 文档格式.xlsx」)。加成员前必须去核实该模块的逐店行写法,
* 由 {@code TaskCenterQueryMapperSqlTest.fileResultShopSourceIsLimitedToPerShopModules} 守住。</p>
*/
Set<String> FILE_RESULT_SHOP_MODULE_SET = Set.of("PATROL_DELETE", "PRICE_TRACK",
"PRODUCT_RISK_RESOLVE", "QUERY_ASIN", "SHOP_DATA_CRAWL", "SHOP_MATCH");
String FILE_RESULT_SHOP_MODULES = "'PATROL_DELETE','PRICE_TRACK','PRODUCT_RISK_RESOLVE',"
+ "'QUERY_ASIN','SHOP_DATA_CRAWL','SHOP_MATCH'";
String ACTIVE_STATUSES = "'PENDING','RUNNING','SCHEDULED'";
String TERMINAL_STATUSES = "'CANCELED','CANCELLED','FAILED','SUCCESS'";
String BRAND_ACTIVE_STATUSES = "'pending','running'";
@@ -60,73 +78,26 @@ public interface TaskCenterQueryMapper {
.collect(Collectors.joining(","));
}
/**
* 任务设备原始行:近 N 天创建过任务、设备号非空(biz_file_task ∪ brand_crawl_tasks)。
* {@code createdAt} 供「最近任务时间」,{@code activityAt} 供在线判定;任务侧没有设备名。
*/
String TASK_DEVICE_ROWS = "(SELECT t.device_id AS deviceId, NULL AS deviceName,"
+ " t.updated_at AS activityAt, t.created_at AS createdAt"
+ " FROM biz_file_task t"
+ " WHERE t.module_type IN (" + CLIENT_MODULE_TYPES + ")"
+ " AND t.device_id IS NOT NULL AND t.device_id != ''"
+ " AND t.created_at >= #{taskSince}"
+ " <if test='userIds != null'> AND t.user_id IN"
+ " <foreach collection='userIds' item='uid' open='(' separator=',' close=')'>#{uid}</foreach></if>"
+ " UNION ALL"
+ " SELECT b.device_id, NULL, b.updated_at, b.created_at FROM brand_crawl_tasks b"
+ " WHERE b.device_id IS NOT NULL AND b.device_id != ''"
+ " AND b.created_at >= #{taskSince}"
+ " <if test='userIds != null'> AND b.user_id IN"
+ " <foreach collection='userIds' item='uid' open='(' separator=',' close=')'>#{uid}</foreach></if>)";
/** 账号范围裁剪:两张任务表各写一份,别名不同。 */
String USER_SCOPE_T = "<if test='userIds != null'> AND t.user_id IN"
+ " <foreach collection='userIds' item='uid' open='(' separator=',' close=')'>#{uid}</foreach></if>";
String USER_SCOPE_B = "<if test='userIds != null'> AND b.user_id IN"
+ " <foreach collection='userIds' item='uid' open='(' separator=',' close=')'>#{uid}</foreach></if>";
/**
* 日志设备原始行:客户端日志、uid 非空(为空无法归组)、近 N 天有上报。
* {@code createdAt} 恒空,只为了与任务侧列对齐。
*
* <p>{@code device_id} 必须显式 COLLATE:本表列是 utf8mb4_0900_ai_ci,两张任务表是
* utf8mb4_general_ci,三个 UNION 分支混排规则会直接报 ERROR 1271。</p>
*/
String LOG_DEVICE_ROWS = "(SELECT d.device_id COLLATE utf8mb4_general_ci AS deviceId,"
+ " d.device_name AS deviceName,"
+ " COALESCE(d.last_upload_at, d.updated_at) AS activityAt, NULL AS createdAt"
+ " FROM device_log_file d"
+ " WHERE d.source = 'client'"
+ " AND d.device_id != ''"
+ " AND d.uid IS NOT NULL"
+ " AND d.last_upload_at >= #{logSince}"
+ " <if test='userIds != null'> AND d.uid IN"
+ " <foreach collection='userIds' item='uid' open='(' separator=',' close=')'>#{uid}</foreach></if>)";
/** 设备花名册:任务设备 ∪ 日志设备(同设备多行由外层聚合)。 */
String ROSTER_ROWS = "(" + TASK_DEVICE_ROWS + " UNION ALL " + LOG_DEVICE_ROWS + ")";
/** 进行中任务原始行(带设备号),供按设备计数。 */
String RUNNING_TASK_DEVICE_ROWS = "(SELECT t.device_id AS deviceId"
+ " FROM biz_file_task t"
+ " WHERE t.module_type IN (" + CLIENT_MODULE_TYPES + ")"
+ " AND t.status IN (" + ACTIVE_STATUSES + ")"
+ " AND t.device_id IS NOT NULL AND t.device_id != ''"
+ " <if test='userIds != null'> AND t.user_id IN"
+ " <foreach collection='userIds' item='uid' open='(' separator=',' close=')'>#{uid}</foreach></if>"
+ " UNION ALL"
+ " SELECT b.device_id FROM brand_crawl_tasks b"
+ " WHERE b.status IN (" + BRAND_ACTIVE_STATUSES + ")"
+ " AND b.device_id IS NOT NULL AND b.device_id != ''"
+ " <if test='userIds != null'> AND b.user_id IN"
+ " <foreach collection='userIds' item='uid' open='(' separator=',' close=')'>#{uid}</foreach></if>)";
/** 店铺库范围裁剪({@code biz_shop_manage.created_by_id} = 归属账号)。 */
String USER_SCOPE_S = "<if test='userIds != null'> AND s.created_by_id IN"
+ " <foreach collection='userIds' item='uid' open='(' separator=',' close=')'>#{uid}</foreach></if>";
@Select("<script>"
+ "SELECT COUNT(*) FROM ("
+ " SELECT t.id FROM biz_file_task t"
+ " WHERE t.module_type IN (" + CLIENT_MODULE_TYPES + ")"
+ " AND t.status IN (" + ACTIVE_STATUSES + ")"
+ " <if test='userIds != null'> AND t.user_id IN"
+ " <foreach collection='userIds' item='uid' open='(' separator=',' close=')'>#{uid}</foreach></if>"
+ USER_SCOPE_T
+ " UNION ALL"
+ " SELECT b.id FROM brand_crawl_tasks b"
+ " WHERE b.status IN (" + BRAND_ACTIVE_STATUSES + ")"
+ " <if test='userIds != null'> AND b.user_id IN"
+ " <foreach collection='userIds' item='uid' open='(' separator=',' close=')'>#{uid}</foreach></if>"
+ USER_SCOPE_B
+ ") u"
+ "</script>")
long countRunningTasks(@Param("userIds") List<Long> 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 &lt; #{idleBefore}"
+ " <if test='userIds != null'> AND t.user_id IN"
+ " <foreach collection='userIds' item='uid' open='(' separator=',' close=')'>#{uid}</foreach></if>"
+ USER_SCOPE_T
+ " UNION ALL"
+ " SELECT b.id FROM brand_crawl_tasks b"
+ " WHERE b.status IN (" + BRAND_ACTIVE_STATUSES + ")"
+ " AND b.updated_at &lt; #{idleBefore}"
+ " <if test='userIds != null'> AND b.user_id IN"
+ " <foreach collection='userIds' item='uid' open='(' separator=',' close=')'>#{uid}</foreach></if>"
+ USER_SCOPE_B
+ ") u"
+ "</script>")
long countStuckTasks(@Param("userIds") List<Long> 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}"
+ " <if test='userIds != null'> AND t.user_id IN"
+ " <foreach collection='userIds' item='uid' open='(' separator=',' close=')'>#{uid}</foreach></if>"
+ 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}"
+ " <if test='userIds != null'> AND b.user_id IN"
+ " <foreach collection='userIds' item='uid' open='(' separator=',' close=')'>#{uid}</foreach></if>"
+ USER_SCOPE_B
+ ") u"
+ "</script>")
long countFinishedTasksSince(@Param("userIds") List<Long> userIds,
@Param("since") LocalDateTime since);
/** 总店铺:店铺库(biz_shop_manage)在可见账号下的数量。 */
@Select("<script>"
+ "SELECT COUNT(DISTINCT u.deviceId) FROM " + ROSTER_ROWS + " u"
+ "SELECT COUNT(*) FROM biz_shop_manage s WHERE 1 = 1"
+ USER_SCOPE_S
+ "</script>")
long countRosterDevices(@Param("userIds") List<Long> userIds,
@Param("taskSince") LocalDateTime taskSince,
@Param("logSince") LocalDateTime logSince);
long countShops(@Param("userIds") List<Long> userIds);
/**
* 店铺筛选下拉候选:只取店铺名。
*
* <p>biz_shop_manage 里带 account/password/zn_username,这一列之外的都不能出,
* 由 {@code TaskCenterQueryMapperSqlTest.shopOptionsAreDistinctNamesWithoutCredentialColumns} 守住。</p>
*/
@Select("<script>"
+ "SELECT COUNT(*) FROM ("
+ " SELECT u.deviceId, MAX(u.activityAt) AS lastActiveAt FROM " + ROSTER_ROWS + " u"
+ " GROUP BY u.deviceId"
+ " HAVING MAX(u.activityAt) >= #{onlineSince}"
+ ") online"
+ "SELECT DISTINCT s.shop_name FROM biz_shop_manage s WHERE 1 = 1"
+ USER_SCOPE_S
+ " ORDER BY s.shop_name LIMIT 2000"
+ "</script>")
long countOnlineDevices(@Param("userIds") List<Long> userIds,
@Param("taskSince") LocalDateTime taskSince,
@Param("logSince") LocalDateTime logSince,
@Param("onlineSince") LocalDateTime onlineSince);
/** 设备花名册列表:名称取日志侧,活动时间取两侧最大,最近任务时间取任务侧最大创建时间。 */
@Select("<script>"
+ "SELECT u.deviceId AS deviceId, MAX(u.deviceName) AS deviceName,"
+ " MAX(u.activityAt) AS lastActiveAt, MAX(u.createdAt) AS recentTaskAt"
+ " FROM " + ROSTER_ROWS + " u"
+ " GROUP BY u.deviceId"
+ "</script>")
List<TaskCenterDeviceRow> listRosterDevices(@Param("userIds") List<Long> userIds,
@Param("taskSince") LocalDateTime taskSince,
@Param("logSince") LocalDateTime logSince);
/** 按设备统计进行中任务数(设备号为空的任务不归属任何设备)。 */
@Select("<script>"
+ "SELECT u.deviceId AS deviceId, COUNT(*) AS runningTasks"
+ " FROM " + RUNNING_TASK_DEVICE_ROWS + " u"
+ " GROUP BY u.deviceId"
+ "</script>")
List<TaskCenterDeviceRow> countRunningTasksByDevice(@Param("userIds") List<Long> userIds);
List<String> selectShopNames(@Param("userIds") List<Long> 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 放大行数)。
*
* <p>按 {@code LOWER(TRIM(...))} 规范化后<b>精确</b>匹配:面板行下钻和下拉候选给的都是
* 整名,模糊 LIKE 会把「林芳」命中「林芳芳」。biz_file_result 一侧必须带模块白名单,
* 否则会把采集数据/货源查询的上传文件名当店铺。</p>
*/
String SHOP_FILTER_T = "<if test='shop != null'>"
+ " 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}, '%')))"
+ "</if>";
+ " 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}))))"
+ ")</if>";
/** biz_file_task 分支筛选(账号范围 + 业务/状态/设备/时间范围 + 店铺)。 */
String TASK_FILTER_T = "<if test='userIds != null'> AND t.user_id IN"
+ " <foreach collection='userIds' item='uid' open='(' separator=',' close=')'>#{uid}</foreach></if>"
/** biz_file_task 分支筛选(账号范围 + 业务/状态/时间范围 + 店铺)。 */
String TASK_FILTER_T = USER_SCOPE_T
+ "<if test='moduleType != null'> AND UPPER(t.module_type) = #{moduleType}</if>"
+ "<if test='status != null'> AND " + STATUS_T + " = #{status}</if>"
+ "<if test='deviceId != null'> AND t.device_id = #{deviceId}</if>"
+ "<if test='startTime != null'> AND t.created_at &gt;= #{startTime}</if>"
+ "<if test='endTime != null'> AND t.created_at &lt;= #{endTime}</if>"
+ SHOP_FILTER_T;
@@ -242,11 +201,9 @@ public interface TaskCenterQueryMapper {
* 品牌分支筛选:业务名固定 BRAND(选了别的业务则该分支恒空);品牌任务不存店铺,
* 带店铺筛选时直接排除——否则品牌 id 与 biz id 撞号会被 EXISTS 误判命中。
*/
String TASK_FILTER_B = "<if test='userIds != null'> AND b.user_id IN"
+ " <foreach collection='userIds' item='uid' open='(' separator=',' close=')'>#{uid}</foreach></if>"
String TASK_FILTER_B = USER_SCOPE_B
+ "<if test='moduleType != null'> AND 'BRAND' = #{moduleType}</if>"
+ "<if test='status != null'> AND " + STATUS_B + " = #{status}</if>"
+ "<if test='deviceId != null'> AND b.device_id = #{deviceId}</if>"
+ "<if test='startTime != null'> AND b.created_at &gt;= #{startTime}</if>"
+ "<if test='endTime != null'> AND b.created_at &lt;= #{endTime}</if>"
+ "<if test='shop != null'> AND 1 = 0</if>";
@@ -255,24 +212,30 @@ public interface TaskCenterQueryMapper {
* 任务列表行:biz_file_task(12 个客户端模块)∪ brand_crawl_tasks。
* 品牌行 task_no 合成 {@code brand-<id>},终态时用 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("<script>"
+ "SELECT m.* FROM " + TASK_LIST_ROWS + " m"
+ " ORDER BY m.createdAt DESC, m.id DESC"
@@ -281,7 +244,6 @@ public interface TaskCenterQueryMapper {
List<TaskCenterTaskRow> selectTaskPage(@Param("userIds") List<Long> userIds,
@Param("moduleType") String moduleType,
@Param("status") String status,
@Param("deviceId") String deviceId,
@Param("shop") String shop,
@Param("startTime") LocalDateTime startTime,
@Param("endTime") LocalDateTime endTime,
@@ -294,11 +256,19 @@ public interface TaskCenterQueryMapper {
long countTaskPage(@Param("userIds") List<Long> userIds,
@Param("moduleType") String moduleType,
@Param("status") String status,
@Param("deviceId") String deviceId,
@Param("shop") String shop,
@Param("startTime") LocalDateTime startTime,
@Param("endTime") LocalDateTime endTime);
/** 店铺面板的原料:当前全部进行中任务(超管口径下上限 500,截断由服务层显式提示)。 */
@Select("<script>"
+ "SELECT m.* FROM " + ACTIVE_TASK_ROWS + " m"
+ " ORDER BY m.createdAt DESC, m.id DESC"
+ " LIMIT #{limit}"
+ "</script>")
List<TaskCenterTaskRow> selectActiveTasks(@Param("userIds") List<Long> userIds,
@Param("limit") long limit);
/** 账号名筛选 → 用户号(与可见账号集合求交由服务层负责)。 */
@Select("SELECT id FROM users WHERE username LIKE CONCAT('%', #{keyword}, '%') LIMIT 500")
List<Long> selectUserIdsByUsername(@Param("keyword") String keyword);
@@ -309,7 +279,7 @@ public interface TaskCenterQueryMapper {
+ "</script>")
List<TaskCenterUserRow> selectUsernames(@Param("userIds") List<Long> userIds);
/** 设备展示名(不限窗口:设备名与任务时间无关)。 */
/** 设备展示名(详情里保留「跑在哪台机」;列表与面板不再按设备装配)。 */
@Select("<script>"
+ "SELECT d.device_id AS deviceId, MAX(d.device_name) AS deviceName"
+ " FROM device_log_file d WHERE d.device_id IN"
@@ -329,25 +299,25 @@ public interface TaskCenterQueryMapper {
+ " GROUP BY p.task_id, p.shop_name"
+ "</script>")
List<TaskCenterShopRow> selectPublishShops(@Param("taskIds") List<Long> taskIds);
/** 店铺来源二:任务结果分组(scope_key)。 */
@Select("<script>"
+ "SELECT i.task_id AS taskId, i.scope_key AS shop FROM biz_task_result_item i"
+ " WHERE i.task_id IN <foreach collection='taskIds' item='tid' open='(' separator=',' close=')'>#{tid}</foreach>"
+ " AND i.scope_key IS NOT NULL AND i.scope_key != ''"
+ " GROUP BY i.task_id, i.scope_key"
+ "</script>")
List<TaskCenterShopRow> selectResultItemShops(@Param("taskIds") List<Long> taskIds);
/** 店铺来源三:结果文件名(跟价/定时匹配的文件名里带店铺)。 */
/**
* 店铺来源二:结果行的 source_filename,只认 {@link #FILE_RESULT_SHOP_MODULES} 里的模块
* (其余模块这里存的是上传文件名)。
*
* <p>JOIN 回 biz_file_task 而不是靠调用方保证:店铺面板传进来的是两表混合 id,
* 品牌任务 id 与 biz id 会撞号,白名单必须先由 biz 行筛掉。</p>
*/
@Select("<script>"
+ "SELECT f.task_id AS taskId, f.source_filename AS shop FROM biz_file_result f"
+ " JOIN biz_file_task ft ON ft.id = f.task_id"
+ " AND ft.module_type IN (" + FILE_RESULT_SHOP_MODULES + ")"
+ " WHERE f.task_id IN <foreach collection='taskIds' item='tid' open='(' separator=',' close=')'>#{tid}</foreach>"
+ " AND f.source_filename IS NOT NULL AND f.source_filename != ''"
+ " GROUP BY f.task_id, f.source_filename"
+ "</script>")
List<TaskCenterShopRow> selectFileResultShops(@Param("taskIds") List<Long> taskIds);
/** 进度快照(同时充当店铺来源四:current_scope_key)。按 (taskId, moduleType) 由服务层匹配。 */
/** 进度快照(只用于「当前处理」与进度列,不作为店铺来源)。按 (taskId, moduleType) 由服务层匹配。 */
@Select("<script>"
+ "SELECT s.task_id AS taskId, s.module_type AS moduleType, s.total_count AS totalCount,"
+ " s.success_count AS successCount, s.failed_count AS failedCount, s.pending_count AS pendingCount,"
@@ -357,13 +327,6 @@ public interface TaskCenterQueryMapper {
+ "</script>")
List<TaskCenterSnapshotRow> selectSnapshots(@Param("taskIds") List<Long> taskIds);
/** 店铺兜底:请求体 items[].shopName(只在前面四个来源都为空时按需拉取,避免列表查询带大 JSON 列)。 */
@Select("<script>"
+ "SELECT t.id AS id, t.request_json AS requestJson FROM biz_file_task t"
+ " WHERE t.id IN <foreach collection='taskIds' item='tid' open='(' separator=',' close=')'>#{tid}</foreach>"
+ "</script>")
List<TaskCenterTaskRow> selectRequestJson(@Param("taskIds") List<Long> 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"
@@ -2,26 +2,11 @@ package com.nanri.aiimage.modules.taskcenter.model.dto;
import lombok.Data;
import java.time.LocalDateTime;
/**
* 设备聚合行:三条查询各填一部分字段(MyBatis 自动映射,未选出的列留空)。
*
* <ul>
* <li>花名册查询(任务设备 ∪ 日志设备):deviceId / deviceName / lastActiveAt / recentTaskAt</li>
* <li>进行中统计(按设备):deviceId / runningTasks</li>
* </ul>
*/
/** 设备展示名行(详情里「跑在哪台机」用;看板维度是店铺,不再装配设备列表)。 */
@Data
public class TaskCenterDeviceRow {
private String deviceId;
/** 日志侧展示名(机器名/登录名);任务侧无此数据。 */
private String deviceName;
/** 最近活动:任务 updated_at ∪ 日志上报时间。 */
private LocalDateTime lastActiveAt;
/** 最近一次任务的创建时间(30 天窗口内)。 */
private LocalDateTime recentTaskAt;
/** 该设备进行中任务数。 */
private Long runningTasks;
}
@@ -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)
@@ -28,8 +28,6 @@ public class TaskCenterTaskRow {
private Long successCount;
private Long failedCount;
private boolean brand;
/** 仅店铺兜底查询填充(列表主查询不拉大 JSON 列)。 */
private String requestJson;
/** 仅详情查询填充(列表不带这一列)。 */
private String errorMessage;
}
@@ -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;
}
@@ -3,19 +3,22 @@ package com.nanri.aiimage.modules.taskcenter.model.vo;
import lombok.Data;
/**
* 客户端任务管理汇总卡。设备口径见设备花名册(任务设备近 30 天 ∪ 日志设备近 7 天)。
* 客户端任务管理汇总卡(店铺口径)。
*
* <p>总店铺来自店铺库 {@code biz_shop_manage},在跑店铺来自进行中任务的店铺归属聚合,
* 两者口径不同:后者是前者的子集,加上「不挂店铺」的任务不进任何店铺。</p>
*/
@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;
}
@@ -0,0 +1,28 @@
package com.nanri.aiimage.modules.taskcenter.model.vo;
import lombok.Data;
import java.time.LocalDateTime;
/**
* 店铺面板行:一个店铺在当前所有进行中任务里的汇总(点行下钻到该店铺的任务列表)。
*
* <p>「不挂店铺」是一行合成桶({@code noShop=true}):采集数据、货源查询、品牌检测这些模块
* 的任务不落店铺,但它们同样在跑,不能让它们在看板里消失。</p>
*/
@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;
}
@@ -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;
@@ -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 天。
* 客户端任务管理的只读查询,看板维度是<b>店铺</b>。
*
* <p>时间口径只有一个:进行中且 {@code updated_at} 超过 10 分钟没动 = 疑似卡住。
* {@code updated_at} 由客户端心跳(60s)与结果回传共同顶新,所以「在跑的任务必然在上报」
* 是这条判定的前提;设备维度不再参与统计(设备号只在详情里作为附注展示)。</p>
*
* <p>店铺面板与汇总卡共用 {@link #aggregateShops} 一份聚合,卡片说几家在跑、面板就列几行,
* 不允许两个数字各算各的。</p>
*/
@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<String> ACTIVE_STATUSES = TaskCenterQueryMapper.ACTIVE_STATUS_SET;
private static final ObjectMapper JSON = new ObjectMapper();
/** 面板排序:该去看谁的店排前面——有卡住的先,其次最久没上报的,「不挂店铺」桶永远垫底。 */
private static final Comparator<TaskCenterShopVo> 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<Long> 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<TaskCenterDeviceVo> devices(TaskCenterScopeService.ScopeContext scope) {
LocalDateTime now = LocalDateTime.now();
List<Long> userIds = scope.sqlUserIds();
Map<String, TaskCenterDeviceVo> 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<TaskCenterDeviceVo> 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<TaskCenterShopVo> shops(TaskCenterScopeService.ScopeContext scope) {
return aggregateShops(scope.sqlUserIds(), LocalDateTime.now()).rows();
}
/** 空设备号入册无意义(SQL 已滤,这里挡住直调服务或脏数据)。 */
private static TaskCenterDeviceVo deviceOf(Map<String, TaskCenterDeviceVo> byDevice, String deviceId) {
if (deviceId == null || deviceId.isBlank()) {
return null;
/** 店铺筛选下拉候选(店铺库内的店铺名,精确匹配用)。 */
public List<String> shopOptions(TaskCenterScopeService.ScopeContext scope) {
return safe(queryMapper.selectShopNames(scope.sqlUserIds()));
}
/** 店铺面板的聚合结果:行 + 其中真店铺数(不含合成桶)。 */
private record ShopBoard(List<TaskCenterShopVo> rows, long runningShops) {
private static final ShopBoard EMPTY = new ShopBoard(List.of(), 0);
}
private ShopBoard aggregateShops(List<Long> userIds, LocalDateTime now) {
List<TaskCenterTaskRow> 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<Long> bizIds = rows.stream().filter(row -> !row.isBrand())
.map(TaskCenterTaskRow::getId).filter(Objects::nonNull).distinct().toList();
Map<Long, List<String>> shopsByTask = collectShops(bizIds);
Map<String, ShopAggregate> byShopKey = new LinkedHashMap<>();
for (TaskCenterTaskRow row : rows) {
List<String> 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<TaskCenterShopVo> 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<String, ShopAggregate> 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<String, Long> 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.<String, Long>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<TaskCenterTaskRow> 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<TaskCenterTaskRow> rows = List.of(row);
List<Long> bizIds = row.isBrand() || row.getId() == null ? List.of() : List.of(row.getId());
List<String> deviceIds = row.getDeviceId() == null || row.getDeviceId().isBlank()
? List.of() : List.of(row.getDeviceId());
List<Long> userIds = row.getUserId() == null || row.getUserId() <= 0
@@ -199,11 +257,11 @@ public class TaskCenterQueryService {
: toDeviceNames(safe(queryMapper.selectDeviceNames(deviceIds)));
Map<Long, String> usernames = userIds.isEmpty() ? Map.of()
: toUserNames(safe(queryMapper.selectUsernames(userIds)));
Map<String, TaskCenterSnapshotRow> snapshots = toSnapshots(safe(queryMapper.selectSnapshots(List.of(row.getId()))));
Map<Long, List<String>> shops = collectShops(rows);
Map<String, TaskCenterSnapshotRow> 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<TaskCenterShopStatVo> shopStats(TaskCenterTaskRow row) {
if (row.isBrand() || row.getId() == null) {
return List.of();
@@ -241,27 +299,24 @@ public class TaskCenterQueryService {
return stats;
}
private List<TaskCenterTaskRowVo> assembleRows(List<TaskCenterTaskRow> rows, Map<Long, List<String>> shops) {
List<String> deviceIds = rows.stream().map(TaskCenterTaskRow::getDeviceId)
.filter(id -> id != null && !id.isBlank()).distinct().toList();
private List<TaskCenterTaskRowVo> assembleRows(List<TaskCenterTaskRow> rows) {
List<Long> userIds = rows.stream().map(TaskCenterTaskRow::getUserId)
.filter(id -> id != null && id > 0).distinct().toList();
List<Long> rowIds = rows.stream().map(TaskCenterTaskRow::getId)
.filter(Objects::nonNull).distinct().toList();
List<Long> bizIds = rows.stream().filter(row -> !row.isBrand())
.map(TaskCenterTaskRow::getId).filter(Objects::nonNull).distinct().toList();
Map<Long, String> usernames = userIds.isEmpty() ? Map.of()
: toUserNames(safe(queryMapper.selectUsernames(userIds)));
Map<String, String> deviceNames = deviceIds.isEmpty() ? Map.of()
: toDeviceNames(safe(queryMapper.selectDeviceNames(deviceIds)));
Map<String, TaskCenterSnapshotRow> snapshots = rowIds.isEmpty() ? Map.of()
: toSnapshots(safe(queryMapper.selectSnapshots(rowIds)));
Map<Long, List<String>> requestShops = collectRequestShops(rows, shops, snapshots);
Map<Long, List<String>> shops = collectShops(bizIds);
LocalDateTime now = LocalDateTime.now();
List<TaskCenterTaskRowVo> 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 里已按模块白名单筛)。
*
* <p>任务结果分组与进度快照的 scope 都不是店铺(快照那是 {@code task:<id>:owner:<instance>}
* 实例锁),请求体兜底也不再用:宁可显示「不挂店铺」,不把文件名当店铺。</p>
*
* <p>入参只接 biz 表 id:品牌任务 id 会与 biz 撞号。</p>
*/
private Map<Long, List<String>> collectShops(List<TaskCenterTaskRow> rows) {
List<Long> bizIds = rows.stream().filter(row -> !row.isBrand())
.map(TaskCenterTaskRow::getId).filter(Objects::nonNull).distinct().toList();
private Map<Long, List<String>> collectShops(List<Long> bizIds) {
if (bizIds.isEmpty()) {
return Map.of();
}
Map<Long, List<String>> 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<String> taken = new HashSet<>();
appendShops(safe(queryMapper.selectPublishShops(bizIds)), shops, taken);
appendShops(safe(queryMapper.selectFileResultShops(bizIds)), shops, taken);
return shops;
}
/** 只对仍缺店铺的任务打这个来源的批量查询;已命中的任务保持更高优先级。 */
private void lazyMerge(List<Long> ids, Map<Long, List<String>> target,
Function<List<Long>, Map<Long, List<String>>> source) {
List<Long> missing = ids.stream().filter(id -> !target.containsKey(id)).toList();
if (missing.isEmpty()) {
return;
}
for (Map.Entry<Long, List<String>> entry : source.apply(missing).entrySet()) {
target.putIfAbsent(entry.getKey(), entry.getValue());
}
}
private static Map<Long, List<String>> toShops(List<TaskCenterShopRow> rows) {
Map<Long, List<String>> map = new HashMap<>();
private static void appendShops(List<TaskCenterShopRow> rows, Map<Long, List<String>> shops, Set<String> 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<Long, List<String>> collectRequestShops(List<TaskCenterTaskRow> rows,
Map<Long, List<String>> shops,
Map<String, TaskCenterSnapshotRow> snapshots) {
List<Long> candidates = rows.stream()
.filter(row -> !row.isBrand() && row.getId() != null)
.filter(row -> {
List<String> 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<Long, List<String>> 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<String> 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<String> extractShopNames(String requestJson) {
if (requestJson.isBlank()) {
return List.of();
}
try {
JsonNode items = JSON.readTree(requestJson).path("items");
if (!items.isArray()) {
return List.of();
}
LinkedHashSet<String> 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<String, String> deviceNames,
Map<String, TaskCenterSnapshotRow> snapshots,
Map<Long, List<String>> shops,
Map<Long, List<String>> 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<String> 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;
}