From f9d702f9a646835fe3ec9b9c526432d91875463f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Mon, 28 Sep 2026 23:16:28 +0800 Subject: [PATCH] =?UTF-8?q?feat(taskcenter):=20=E4=BB=BB=E5=8A=A1=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AdminTaskCenterController.java | 16 ++ .../mapper/TaskCenterQueryMapper.java | 42 ++++- .../model/dto/TaskCenterShopStatRow.java | 17 ++ .../model/dto/TaskCenterTaskRow.java | 2 + .../model/vo/TaskCenterShopStatVo.java | 13 ++ .../model/vo/TaskCenterTaskDetailVo.java | 20 +++ .../service/TaskCenterQueryService.java | 90 +++++++++- .../mapper/TaskCenterQueryMapperSqlTest.java | 33 ++++ .../service/TaskCenterQueryServiceTest.java | 156 ++++++++++++++++++ 9 files changed, 379 insertions(+), 10 deletions(-) create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/dto/TaskCenterShopStatRow.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/vo/TaskCenterShopStatVo.java create mode 100644 backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/vo/TaskCenterTaskDetailVo.java diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/controller/AdminTaskCenterController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/controller/AdminTaskCenterController.java index a54d8fccc..2a18f6efc 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/controller/AdminTaskCenterController.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/controller/AdminTaskCenterController.java @@ -7,6 +7,7 @@ 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.TaskCenterTaskDetailVo; import com.nanri.aiimage.modules.taskcenter.model.vo.TaskCenterTaskPageVo; import com.nanri.aiimage.modules.taskcenter.service.TaskCenterQueryService; import com.nanri.aiimage.modules.taskcenter.service.TaskCenterScopeService; @@ -17,6 +18,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import java.util.List; @@ -63,6 +65,20 @@ public class AdminTaskCenterController { return ApiResponse.success(queryService.tasks(scope, query)); } + @GetMapping("/tasks/detail") + @Operation(summary = "任务详情", + description = "参数 taskNo(品牌任务为 brand-):基础信息 + 进度快照 + 分组明细 + 错误信息;" + + "任务不存在或不在可见范围时 data 为空。") + public ApiResponse taskDetail(HttpServletRequest request, + @RequestParam String taskNo) { + TaskCenterScopeService.ScopeContext scope = resolveScope(request); + TaskCenterTaskDetailVo detail = queryService.detail(scope, taskNo); + if (detail == null) { + return ApiResponse.success("任务不存在或无权查看", null); + } + return ApiResponse.success(detail); + } + private TaskCenterScopeService.ScopeContext resolveScope(HttpServletRequest request) { AdminUserEntity operator = adminAuthSupport.requireAdminOrInternal(request); permissionMenuService.requireClientTaskCenterAccess(operator); diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/mapper/TaskCenterQueryMapper.java b/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/mapper/TaskCenterQueryMapper.java index 0a459dab3..bb9f5226a 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/mapper/TaskCenterQueryMapper.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/mapper/TaskCenterQueryMapper.java @@ -2,6 +2,7 @@ package com.nanri.aiimage.modules.taskcenter.mapper; import com.nanri.aiimage.modules.taskcenter.model.dto.TaskCenterDeviceRow; import com.nanri.aiimage.modules.taskcenter.model.dto.TaskCenterShopRow; +import com.nanri.aiimage.modules.taskcenter.model.dto.TaskCenterShopStatRow; import com.nanri.aiimage.modules.taskcenter.model.dto.TaskCenterSnapshotRow; import com.nanri.aiimage.modules.taskcenter.model.dto.TaskCenterTaskRow; import com.nanri.aiimage.modules.taskcenter.model.dto.TaskCenterUserRow; @@ -313,6 +314,9 @@ public interface TaskCenterQueryMapper { + "") List selectDeviceNames(@Param("deviceIds") List deviceIds); + /** 品牌任务在列表/详情里的任务号前缀(task_no = brand-)。 */ + String BRAND_TASK_NO_PREFIX = "brand-"; + /** 店铺来源一:上架结果文件(shop_name)。 */ @Select("") List selectPublishShops(@Param("taskIds") List taskIds); - /** 店铺来源二:任务结果分组(scope_key)。 */ @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," + + " 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, t.error_message AS errorMessage" + + " FROM biz_file_task t" + + " WHERE t.task_no = #{taskNo} AND t.module_type IN (" + CLIENT_MODULE_TYPES + ")" + + " LIMIT 1") + TaskCenterTaskRow selectTaskByTaskNo(@Param("taskNo") String taskNo); + + /** 详情:品牌任务行(task_no = brand-,这里按 id 取)。 */ + @Select("SELECT b.id AS id, CONCAT('" + BRAND_TASK_NO_PREFIX + "', b.id) AS taskNo, 'BRAND' AS moduleType," + + " " + STATUS_B + " AS status, b.user_id AS userId, b.device_id AS deviceId," + + " b.created_at AS createdAt," + + " CASE WHEN b.status IN (" + BRAND_TERMINAL_STATUSES + ") THEN b.updated_at END AS finishedAt," + + " b.updated_at AS updatedAt, b.progress_total AS totalCount, b.progress_current AS successCount," + + " 0 AS failedCount, 1 AS brand, b.error_message AS errorMessage" + + " 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" + + " WHERE p.task_id = #{taskId} AND p.shop_name IS NOT NULL AND p.shop_name != ''" + + " GROUP BY p.shop_name ORDER BY COUNT(*) DESC, p.shop_name LIMIT 200") + List selectPublishShopStats(@Param("taskId") Long taskId); + + /** 详情分组明细(其余模块):按任务结果分组 scope_key 聚合条目数。 */ + @Select("SELECT i.scope_key AS scopeKey, COUNT(*) AS total," + + " SUM(UPPER(i.status) = 'SUCCESS') AS success, SUM(UPPER(i.status) = 'FAILED') AS failed" + + " FROM biz_task_result_item i" + + " WHERE i.task_id = #{taskId} AND i.scope_key IS NOT NULL AND i.scope_key != ''" + + " GROUP BY i.scope_key ORDER BY COUNT(*) DESC, i.scope_key LIMIT 200") + List selectResultItemShopStats(@Param("taskId") Long taskId); } diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/dto/TaskCenterShopStatRow.java b/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/dto/TaskCenterShopStatRow.java new file mode 100644 index 000000000..af6411c4f --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/dto/TaskCenterShopStatRow.java @@ -0,0 +1,17 @@ +package com.nanri.aiimage.modules.taskcenter.model.dto; + +import lombok.Data; + +/** + * 任务详情的分组统计行(按 scope_key 聚合任务结果明细)。 + * {@code success}/{@code failed} 来自 {@code SUM(status = 'SUCCESS'|'FAILED')}, + * 故可能小于 {@code total}(进行中的行不计入任一侧)。 + */ +@Data +public class TaskCenterShopStatRow { + + private String scopeKey; + private Long total; + private Long success; + private Long failed; +} 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 353aa516a..e53c24ccb 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 @@ -30,4 +30,6 @@ public class TaskCenterTaskRow { 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/TaskCenterShopStatVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/vo/TaskCenterShopStatVo.java new file mode 100644 index 000000000..ef444123b --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/vo/TaskCenterShopStatVo.java @@ -0,0 +1,13 @@ +package com.nanri.aiimage.modules.taskcenter.model.vo; + +import lombok.Data; + +/** 店铺/分组明细行(详情抽屉):成功 + 失败可能小于总数(进行中的行不计入任一侧)。 */ +@Data +public class TaskCenterShopStatVo { + + private String scopeKey; + private long total; + private long success; + private long failed; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/vo/TaskCenterTaskDetailVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/vo/TaskCenterTaskDetailVo.java new file mode 100644 index 000000000..7364bde89 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/taskcenter/model/vo/TaskCenterTaskDetailVo.java @@ -0,0 +1,20 @@ +package com.nanri.aiimage.modules.taskcenter.model.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.List; + +/** + * 任务详情(抽屉):列表行字段 + 分组明细 + 任务级错误信息。 + * 装配口径与列表一致(进度快照优先、店铺走同一优先级链),避免两处展示打架。 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class TaskCenterTaskDetailVo extends TaskCenterTaskRowVo { + + /** 分组明细:上架按 shop_name,其余模块按任务结果分组 scope_key;最多 200 组。 */ + private List shops; + /** 任务级错误信息(biz_file_task / brand_crawl_tasks 的 error_message)。 */ + private String errorMessage; +} 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 91abb6724..32c6c2528 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 @@ -7,12 +7,15 @@ import com.nanri.aiimage.common.module.TaskModuleRegistry; import com.nanri.aiimage.modules.taskcenter.mapper.TaskCenterQueryMapper; import com.nanri.aiimage.modules.taskcenter.model.dto.TaskCenterDeviceRow; import com.nanri.aiimage.modules.taskcenter.model.dto.TaskCenterShopRow; +import com.nanri.aiimage.modules.taskcenter.model.dto.TaskCenterShopStatRow; 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.TaskCenterTaskDetailVo; import com.nanri.aiimage.modules.taskcenter.model.vo.TaskCenterTaskPageVo; import com.nanri.aiimage.modules.taskcenter.model.vo.TaskCenterTaskRowVo; import lombok.RequiredArgsConstructor; @@ -171,6 +174,73 @@ public class TaskCenterQueryService { return hit.isEmpty() ? List.of() : hit; } + /** + * 任务详情:{@code brand-} 走品牌表,其余按 task_no 查 biz_file_task; + * 任务不存在或不在可见范围内统一返回 null(前端提示,不泄漏存在性)。 + */ + public TaskCenterTaskDetailVo detail(TaskCenterScopeService.ScopeContext scope, String taskNo) { + if (taskNo == null || taskNo.isBlank()) { + return null; + } + String key = taskNo.trim(); + TaskCenterTaskRow row = key.startsWith(TaskCenterQueryMapper.BRAND_TASK_NO_PREFIX) + ? brandRow(key) + : queryMapper.selectTaskByTaskNo(key); + if (row == null || !scope.visible(row.getUserId())) { + return null; + } + + List rows = List.of(row); + List deviceIds = row.getDeviceId() == null || row.getDeviceId().isBlank() + ? List.of() : List.of(row.getDeviceId()); + List userIds = row.getUserId() == null || row.getUserId() <= 0 + ? List.of() : List.of(row.getUserId()); + Map deviceNames = deviceIds.isEmpty() ? Map.of() + : 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); + + TaskCenterTaskDetailVo vo = fillRow(new TaskCenterTaskDetailVo(), row, usernames, deviceNames, + snapshots, shops, collectRequestShops(rows, shops, snapshots), LocalDateTime.now()); + vo.setShops(shopStats(row)); + vo.setErrorMessage(row.getErrorMessage()); + return vo; + } + + private TaskCenterTaskRow brandRow(String taskNo) { + String idPart = taskNo.substring(TaskCenterQueryMapper.BRAND_TASK_NO_PREFIX.length()); + if (idPart.isBlank()) { + return null; + } + try { + return queryMapper.selectBrandTaskById(Long.parseLong(idPart)); + } catch (NumberFormatException ex) { + return null; + } + } + + /** 详情分组明细:上架按店铺(publish_file),其余按任务结果分组(result_item);品牌无店铺维度。 */ + private List shopStats(TaskCenterTaskRow row) { + if (row.isBrand() || row.getId() == null) { + return List.of(); + } + List rows = "PUBLISH".equals(row.getModuleType()) + ? queryMapper.selectPublishShopStats(row.getId()) + : queryMapper.selectResultItemShopStats(row.getId()); + List stats = new ArrayList<>(); + for (TaskCenterShopStatRow stat : safe(rows)) { + TaskCenterShopStatVo vo = new TaskCenterShopStatVo(); + vo.setScopeKey(stat.getScopeKey()); + vo.setTotal(nullToZero(stat.getTotal())); + vo.setSuccess(nullToZero(stat.getSuccess())); + vo.setFailed(nullToZero(stat.getFailed())); + stats.add(vo); + } + return stats; + } + private List assembleRows(List rows, Map> shops) { List deviceIds = rows.stream().map(TaskCenterTaskRow::getDeviceId) .filter(id -> id != null && !id.isBlank()).distinct().toList(); @@ -190,7 +260,8 @@ public class TaskCenterQueryService { LocalDateTime now = LocalDateTime.now(); List items = new ArrayList<>(rows.size()); for (TaskCenterTaskRow row : rows) { - items.add(toRowVo(row, usernames, deviceNames, snapshots, shops, requestShops, now)); + items.add(fillRow(new TaskCenterTaskRowVo(), row, usernames, deviceNames, snapshots, + shops, requestShops, now)); } return items; } @@ -328,14 +399,15 @@ public class TaskCenterQueryService { } } - private TaskCenterTaskRowVo toRowVo(TaskCenterTaskRow row, - Map usernames, - Map deviceNames, - Map snapshots, - Map> shops, - Map> requestShops, - LocalDateTime now) { - TaskCenterTaskRowVo vo = new TaskCenterTaskRowVo(); + /** 列表行与详情行共用同一套装配口径(详情只是多带分组明细与错误信息)。 */ + private T fillRow(T vo, + TaskCenterTaskRow row, + Map usernames, + Map deviceNames, + Map snapshots, + Map> shops, + Map> requestShops, + LocalDateTime now) { vo.setId(row.getId()); vo.setTaskNo(row.getTaskNo()); vo.setModuleType(row.getModuleType()); 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 cc186623d..4a70f3818 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 @@ -312,4 +312,37 @@ class TaskCenterQueryMapperSqlTest { assertEquals(TaskCenterQueryMapper.sqlList(TaskCenterQueryMapper.BRAND_TERMINAL_STATUS_SET), TaskCenterQueryMapper.BRAND_TERMINAL_STATUSES); } + + // ── 任务详情(Task 6)────────────────────────────────────────────── + + @Test + void detailRoutesByTaskNoOrBrandId() { + String biz = sqlOf(render("selectTaskByTaskNo", params("taskNo", "PUBLISH-1"))); + assertTrue(biz.contains("WHERE t.task_no = ? AND t.module_type IN")); + assertTrue(biz.contains("t.error_message AS errorMessage")); + assertTrue(biz.contains("LIMIT 1")); + + String brand = sqlOf(render("selectBrandTaskById", params("id", 12L))); + assertTrue(brand.contains("CONCAT('brand-',b.id) AS taskNo"), "与列表同款任务号合成"); + assertTrue(brand.contains("FROM brand_crawl_tasks b WHERE b.id = ?")); + assertTrue(brand.contains("b.error_message AS errorMessage")); + assertTrue(brand.contains("1 AS brand"), "详情按品牌口径装配"); + } + + @Test + void detailShopStatsGroupByScopeWithCap() { + String publish = sqlOf(render("selectPublishShopStats", params("taskId", 1L))); + assertTrue(publish.contains("p.shop_name AS scopeKey")); + assertTrue(publish.contains("SUM(UPPER(p.status) = 'SUCCESS') AS success")); + assertTrue(publish.contains("SUM(UPPER(p.status) = 'FAILED') AS failed")); + assertTrue(publish.contains("GROUP BY p.shop_name")); + assertTrue(publish.contains("LIMIT 200"), "分组过多时封顶,防详情页拉爆"); + + String items = sqlOf(render("selectResultItemShopStats", params("taskId", 1L))); + assertTrue(items.contains("i.scope_key AS scopeKey")); + assertTrue(items.contains("SUM(UPPER(i.status) = 'SUCCESS') AS success")); + assertTrue(items.contains("GROUP BY i.scope_key")); + assertTrue(items.contains("LIMIT 200")); + assertFalse(items.contains("payload_json"), "聚合不碰大 JSON 列"); + } } 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 a3bcf0d95..ab2d00ff0 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 @@ -3,11 +3,14 @@ package com.nanri.aiimage.modules.taskcenter.service; import com.nanri.aiimage.modules.taskcenter.mapper.TaskCenterQueryMapper; import com.nanri.aiimage.modules.taskcenter.model.dto.TaskCenterDeviceRow; import com.nanri.aiimage.modules.taskcenter.model.dto.TaskCenterShopRow; +import com.nanri.aiimage.modules.taskcenter.model.dto.TaskCenterShopStatRow; 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.TaskCenterTaskDetailVo; import com.nanri.aiimage.modules.taskcenter.model.vo.TaskCenterTaskPageVo; import com.nanri.aiimage.modules.taskcenter.model.vo.TaskCenterTaskRowVo; import org.junit.jupiter.api.Test; @@ -458,4 +461,157 @@ class TaskCenterQueryServiceTest { 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); + row.setTotal(total); + row.setSuccess(success); + row.setFailed(failed); + return row; + } + + private static TaskCenterUserRow userRow(long userId, String username) { + TaskCenterUserRow row = new TaskCenterUserRow(); + row.setUserId(userId); + row.setUsername(username); + return row; + } + + @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); + brand.setTotalCount(5L); + brand.setSuccessCount(2L); + brand.setErrorMessage("代理超时"); + when(queryMapper.selectBrandTaskById(12L)).thenReturn(brand); + when(queryMapper.selectSnapshots(any())).thenReturn(List.of()); + when(queryMapper.selectUsernames(any())).thenReturn(List.of(userRow(5L, "ali"))); + + TaskCenterTaskDetailVo detail = service.detail(superScope(), "brand-12"); + + 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(), "品牌任务无店铺维度"); + verify(queryMapper, never()).selectTaskByTaskNo(any()); + verify(queryMapper, never()).selectResultItemShopStats(any()); + } + + @Test + void detailRejectsMalformedBrandTaskNoWithoutQuerying() { + assertNull(service.detail(superScope(), "brand-")); + assertNull(service.detail(superScope(), "brand-x")); + assertNull(service.detail(superScope(), "brand-12x")); + assertNull(service.detail(superScope(), " ")); + assertNull(service.detail(superScope(), null)); + + verify(queryMapper, never()).selectBrandTaskById(anyLong()); + verify(queryMapper, never()).selectTaskByTaskNo(any()); + } + + @Test + void detailOutOfScopeReturnsEmpty() { + TaskCenterTaskRow outOfScope = taskRow(7L, "PUBLISH", "SUCCESS", LocalDateTime.now(), LocalDateTime.now()); + outOfScope.setUserId(99L); + when(queryMapper.selectTaskByTaskNo("PUBLISH-7")).thenReturn(outOfScope); + + assertNull(service.detail(scoped(5L, 11L), "PUBLISH-7"), "组外账号的任务不可见"); + verify(queryMapper, never()).selectSnapshots(any()); + } + + @Test + void detailUnknownTaskNoReturnsEmpty() { + when(queryMapper.selectTaskByTaskNo("PUBLISH-404")).thenReturn(null); + + assertNull(service.detail(superScope(), "PUBLISH-404")); + } + + @Test + void detailPublishShopsUsePublishFileStats() { + LocalDateTime now = LocalDateTime.now(); + TaskCenterTaskRow row = taskRow(1L, "PUBLISH", "SUCCESS", now, now); + row.setUserId(5L); + row.setTotalCount(12L); + row.setSuccessCount(10L); + row.setFailedCount(2L); + + 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, "店铺乙"))); + when(queryMapper.selectPublishShopStats(1L)).thenReturn(List.of( + shopStat("店铺甲", 12L, 10L, 2L), shopStat("店铺乙", 3L, 0L, 3L))); + + TaskCenterTaskDetailVo detail = service.detail(superScope(), "PUBLISH-1"); + + assertEquals(2, detail.getShops().size()); + assertEquals("店铺甲", detail.getShops().get(0).getScopeKey()); + 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(2L, detail.getShopCount()); + assertEquals(12L, detail.getProgressTotal(), "无快照用行内文件计数"); + verify(queryMapper, never()).selectResultItemShopStats(any()); + } + + @Test + void detailNonPublishShopsUseResultItemStats() { + 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, "店铺乙"))); + when(queryMapper.selectResultItemShopStats(9L)).thenReturn(List.of(shopStat("店铺乙", 3L, 1L, 1L))); + + TaskCenterTaskDetailVo detail = service.detail(superScope(), "QUERY_ASIN-9"); + + 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()); + verify(queryMapper, never()).selectPublishShopStats(any()); + } + + @Test + void detailStuckFlagAndDeviceNameFollowListRules() { + 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()); + + TaskCenterTaskDetailVo detail = service.detail(superScope(), "PRICE_TRACK-3"); + + assertTrue(detail.isStuck(), "进行中 30 分钟无更新 → 卡住"); + assertEquals("PC-1", detail.getDeviceName()); + assertFalse(detail.isWebDevice()); + assertEquals(List.of(), detail.getShops(), "无结果明细时店铺统计为空"); + } }