feat(taskcenter): 任务详情接口
This commit is contained in:
+16
@@ -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-<id>):基础信息 + 进度快照 + 分组明细 + 错误信息;"
|
||||
+ "任务不存在或不在可见范围时 data 为空。")
|
||||
public ApiResponse<TaskCenterTaskDetailVo> 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);
|
||||
|
||||
+41
-1
@@ -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 {
|
||||
+ "</script>")
|
||||
List<TaskCenterDeviceRow> selectDeviceNames(@Param("deviceIds") List<String> deviceIds);
|
||||
|
||||
/** 品牌任务在列表/详情里的任务号前缀(task_no = brand-<id>)。 */
|
||||
String BRAND_TASK_NO_PREFIX = "brand-";
|
||||
|
||||
/** 店铺来源一:上架结果文件(shop_name)。 */
|
||||
@Select("<script>"
|
||||
+ "SELECT p.task_id AS taskId, p.shop_name AS shop FROM biz_publish_file p"
|
||||
@@ -321,7 +325,6 @@ 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"
|
||||
@@ -356,4 +359,41 @@ public interface TaskCenterQueryMapper {
|
||||
+ " 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,"
|
||||
+ " 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>,这里按 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<TaskCenterShopStatRow> 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<TaskCenterShopStatRow> selectResultItemShopStats(@Param("taskId") Long taskId);
|
||||
}
|
||||
|
||||
+17
@@ -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;
|
||||
}
|
||||
+2
@@ -30,4 +30,6 @@ public class TaskCenterTaskRow {
|
||||
private boolean brand;
|
||||
/** 仅店铺兜底查询填充(列表主查询不拉大 JSON 列)。 */
|
||||
private String requestJson;
|
||||
/** 仅详情查询填充(列表不带这一列)。 */
|
||||
private String errorMessage;
|
||||
}
|
||||
|
||||
+13
@@ -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;
|
||||
}
|
||||
+20
@@ -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<TaskCenterShopStatVo> shops;
|
||||
/** 任务级错误信息(biz_file_task / brand_crawl_tasks 的 error_message)。 */
|
||||
private String errorMessage;
|
||||
}
|
||||
+81
-9
@@ -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-<id>} 走品牌表,其余按 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<TaskCenterTaskRow> rows = List.of(row);
|
||||
List<String> deviceIds = row.getDeviceId() == null || row.getDeviceId().isBlank()
|
||||
? List.of() : List.of(row.getDeviceId());
|
||||
List<Long> userIds = row.getUserId() == null || row.getUserId() <= 0
|
||||
? List.of() : List.of(row.getUserId());
|
||||
Map<String, String> deviceNames = deviceIds.isEmpty() ? Map.of()
|
||||
: 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);
|
||||
|
||||
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<TaskCenterShopStatVo> shopStats(TaskCenterTaskRow row) {
|
||||
if (row.isBrand() || row.getId() == null) {
|
||||
return List.of();
|
||||
}
|
||||
List<TaskCenterShopStatRow> rows = "PUBLISH".equals(row.getModuleType())
|
||||
? queryMapper.selectPublishShopStats(row.getId())
|
||||
: queryMapper.selectResultItemShopStats(row.getId());
|
||||
List<TaskCenterShopStatVo> 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<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();
|
||||
@@ -190,7 +260,8 @@ public class TaskCenterQueryService {
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
List<TaskCenterTaskRowVo> 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<Long, String> usernames,
|
||||
Map<String, String> deviceNames,
|
||||
Map<String, TaskCenterSnapshotRow> snapshots,
|
||||
Map<Long, List<String>> shops,
|
||||
Map<Long, List<String>> requestShops,
|
||||
LocalDateTime now) {
|
||||
TaskCenterTaskRowVo vo = new TaskCenterTaskRowVo();
|
||||
/** 列表行与详情行共用同一套装配口径(详情只是多带分组明细与错误信息)。 */
|
||||
private <T extends TaskCenterTaskRowVo> T fillRow(T vo,
|
||||
TaskCenterTaskRow row,
|
||||
Map<Long, String> usernames,
|
||||
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());
|
||||
vo.setModuleType(row.getModuleType());
|
||||
|
||||
Reference in New Issue
Block a user