feat(看板): 客户端任务管理从设备维度改为店铺维度全局在跑看板
原「在线设备」卡按日志上报窗口统计,把 89 台算成在线,与实际在跑的客户端数差一个 量级,且设备维度并不能回答"哪台机器上有任务卡住"。改为: - 汇总卡:总店铺 / 在跑店铺 / 进行中任务 / 今日完成 / 疑似卡住 - 新增「在跑店铺看板」:当前所有进行中任务按店铺归组(在跑数、卡住数、业务分布、 最近上报),点店铺行下筛该店铺任务;不落店铺的任务归「不挂店铺」桶 - 卡片与面板同源(同一个 aggregateShops),杜绝口径分裂 - 店铺只认两个真来源:上架结果文件 + 逐店落行的结果文件名; biz_task_progress_snapshot.current_scope_key 是实例锁不是店铺,已从口径中剔除 - 设备号退为详情附注,花名册 /devices 与在线判定整条链删除 - 上报口径只留一个 10 分钟窗口(进行中且超 10 分钟无上报 = 疑似卡住) 后端 3487 例全绿;新增反射护栏断言设备维度查询与快照当店铺的来源已彻底移除。
This commit is contained in:
+119
-82
@@ -54,6 +54,12 @@ class TaskCenterQueryMapperSqlTest {
|
||||
.replaceAll("\\s*,\\s*", ",");
|
||||
}
|
||||
|
||||
/** 任务列表分页的查询参数(店铺口径下已不再有设备号)。 */
|
||||
private static Map<String, Object> 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"));
|
||||
|
||||
+503
-396
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user