feat(taskcenter): 变体采集接口(麦象代理,多 uid + res_mes)
This commit is contained in:
+16
@@ -9,8 +9,10 @@ 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.TaskCenterVariantPageVo;
|
||||
import com.nanri.aiimage.modules.taskcenter.service.TaskCenterQueryService;
|
||||
import com.nanri.aiimage.modules.taskcenter.service.TaskCenterScopeService;
|
||||
import com.nanri.aiimage.modules.taskcenter.service.TaskCenterVariantService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
@@ -40,6 +42,7 @@ public class AdminTaskCenterController {
|
||||
private final PermissionMenuService permissionMenuService;
|
||||
private final TaskCenterScopeService scopeService;
|
||||
private final TaskCenterQueryService queryService;
|
||||
private final TaskCenterVariantService variantService;
|
||||
|
||||
@GetMapping("/overview")
|
||||
@Operation(summary = "汇总卡", description = "设备总数/在线数、进行中任务数、今日完成任务数、疑似卡住数(>10 分钟无更新)。")
|
||||
@@ -79,6 +82,19 @@ public class AdminTaskCenterController {
|
||||
return ApiResponse.success(detail);
|
||||
}
|
||||
|
||||
@GetMapping("/variant-tasks")
|
||||
@Operation(summary = "变体采集列表",
|
||||
description = "代理麦象 console 批量任务(默认只看 variant-collection):非超管按可见用户 uid 过滤,"
|
||||
+ "超管看全部;麦象未配置或不可达时返回空页。status 为麦象状态码:0 等待/1 处理中/2 已完成/3 失败。")
|
||||
public ApiResponse<TaskCenterVariantPageVo> variantTasks(HttpServletRequest request,
|
||||
@RequestParam(required = false) Integer status,
|
||||
@RequestParam(required = false) String taskType,
|
||||
@RequestParam(required = false) Integer page,
|
||||
@RequestParam(required = false) Integer pageSize) {
|
||||
TaskCenterScopeService.ScopeContext scope = resolveScope(request);
|
||||
return ApiResponse.success(variantService.variantTasks(scope, status, taskType, page, pageSize));
|
||||
}
|
||||
|
||||
private TaskCenterScopeService.ScopeContext resolveScope(HttpServletRequest request) {
|
||||
AdminUserEntity operator = adminAuthSupport.requireAdminOrInternal(request);
|
||||
permissionMenuService.requireClientTaskCenterAccess(operator);
|
||||
|
||||
+15
@@ -0,0 +1,15 @@
|
||||
package com.nanri.aiimage.modules.taskcenter.model.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/** 变体采集分页结果(字段与 biz 任务列表分页一致的 page/pageSize/total)。 */
|
||||
@Data
|
||||
public class TaskCenterVariantPageVo {
|
||||
|
||||
private List<TaskCenterVariantTaskVo> items = List.of();
|
||||
private long total;
|
||||
private long page;
|
||||
private long pageSize;
|
||||
}
|
||||
+22
@@ -0,0 +1,22 @@
|
||||
package com.nanri.aiimage.modules.taskcenter.model.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/** 变体采集(麦象批量任务)一行。状态码沿麦象语义:0 等待 / 1 处理中 / 2 已完成 / 3 失败。 */
|
||||
@Data
|
||||
public class TaskCenterVariantTaskVo {
|
||||
|
||||
private String taskId;
|
||||
private String uid;
|
||||
/** 平台账号名;uid 非数字(历史伪 uid,如 collect-27475)时为 null,前端回落显示 uid。 */
|
||||
private String username;
|
||||
private Integer status;
|
||||
private String statusLabel;
|
||||
private String resMes;
|
||||
/** 任务参数原文(麦象 task_data,可空)。 */
|
||||
private String taskData;
|
||||
private LocalDateTime createTime;
|
||||
private LocalDateTime updateTime;
|
||||
}
|
||||
+135
@@ -0,0 +1,135 @@
|
||||
package com.nanri.aiimage.modules.taskcenter.service;
|
||||
|
||||
import com.nanri.aiimage.modules.notification.client.MaixiangConsoleClient;
|
||||
import com.nanri.aiimage.modules.notification.client.MaixiangConsoleClient.BatchTaskItem;
|
||||
import com.nanri.aiimage.modules.notification.client.MaixiangConsoleClient.BatchTaskPage;
|
||||
import com.nanri.aiimage.modules.taskcenter.mapper.TaskCenterQueryMapper;
|
||||
import com.nanri.aiimage.modules.taskcenter.model.dto.TaskCenterUserRow;
|
||||
import com.nanri.aiimage.modules.taskcenter.model.vo.TaskCenterVariantPageVo;
|
||||
import com.nanri.aiimage.modules.taskcenter.model.vo.TaskCenterVariantTaskVo;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 「变体采集」页签:代理麦象 console 的批量任务列表(数据只在麦象侧,看板不落地)。
|
||||
*
|
||||
* <p>可见范围靠 uid 过滤实现:非超管把可见用户号拼成逗号分隔的 uid 参数(麦象侧拆分后 IN),
|
||||
* 超管不传 uid(看全部)。麦象未配置或不可达时返回空页并记日志,页面不因外部依赖炸掉。</p>
|
||||
*/
|
||||
@Service
|
||||
@Slf4j
|
||||
@RequiredArgsConstructor
|
||||
public class TaskCenterVariantService {
|
||||
|
||||
/** 页签默认只看变体采集这一类批量任务;传 taskType 可覆盖。 */
|
||||
public static final String VARIANT_TASK_TYPE = "variant-collection";
|
||||
|
||||
private static final long DEFAULT_PAGE_SIZE = 20;
|
||||
private static final long MAX_PAGE_SIZE = 100;
|
||||
|
||||
private final MaixiangConsoleClient consoleClient;
|
||||
private final TaskCenterQueryMapper queryMapper;
|
||||
|
||||
public TaskCenterVariantPageVo variantTasks(TaskCenterScopeService.ScopeContext scope, Integer status,
|
||||
String taskType, Integer page, Integer pageSize) {
|
||||
long normalizedPage = page == null || page < 1 ? 1 : page;
|
||||
long normalizedSize = pageSize == null || pageSize < 1 ? DEFAULT_PAGE_SIZE
|
||||
: Math.min(pageSize, MAX_PAGE_SIZE);
|
||||
String type = taskType == null || taskType.isBlank() ? VARIANT_TASK_TYPE : taskType.trim();
|
||||
|
||||
TaskCenterVariantPageVo vo = new TaskCenterVariantPageVo();
|
||||
vo.setPage(normalizedPage);
|
||||
vo.setPageSize(normalizedSize);
|
||||
if (!scope.allUsers() && scope.visibleUserIds().isEmpty()) {
|
||||
log.warn("[task-center] 变体采集查询:可见用户为空,直接返回空页");
|
||||
return vo;
|
||||
}
|
||||
if (!consoleClient.configured()) {
|
||||
log.warn("[task-center] 变体采集查询:麦象 console 未配置,返回空页");
|
||||
return vo;
|
||||
}
|
||||
|
||||
String uidsCsv = scope.allUsers() ? null
|
||||
: scope.visibleUserIds().stream().sorted().map(String::valueOf).collect(Collectors.joining(","));
|
||||
BatchTaskPage maixiang = consoleClient.batchTasksPage(uidsCsv, status, type,
|
||||
(int) normalizedPage, (int) normalizedSize);
|
||||
vo.setTotal(maixiang.total());
|
||||
vo.setItems(assemble(maixiang.items()));
|
||||
return vo;
|
||||
}
|
||||
|
||||
/** uid → 账号名映射只对数字 uid 生效;麦象任务可能带非数字伪 uid(如 collect-27475)。 */
|
||||
private List<TaskCenterVariantTaskVo> assemble(List<BatchTaskItem> items) {
|
||||
Set<Long> userIds = new LinkedHashSet<>();
|
||||
for (BatchTaskItem item : items) {
|
||||
Long id = parseUserId(item.uid());
|
||||
if (id != null) {
|
||||
userIds.add(id);
|
||||
}
|
||||
}
|
||||
Map<Long, String> usernames = userIds.isEmpty() ? Map.of() : queryUsernames(new ArrayList<>(userIds));
|
||||
|
||||
List<TaskCenterVariantTaskVo> rows = new ArrayList<>();
|
||||
for (BatchTaskItem item : items) {
|
||||
TaskCenterVariantTaskVo row = new TaskCenterVariantTaskVo();
|
||||
row.setTaskId(item.taskId());
|
||||
row.setUid(item.uid());
|
||||
Long id = parseUserId(item.uid());
|
||||
row.setUsername(id == null ? null : usernames.get(id));
|
||||
row.setStatus(item.status());
|
||||
row.setStatusLabel(statusLabel(item.status()));
|
||||
row.setResMes(item.resMes());
|
||||
row.setTaskData(item.taskData());
|
||||
row.setCreateTime(item.createTime());
|
||||
row.setUpdateTime(item.updateTime());
|
||||
rows.add(row);
|
||||
}
|
||||
return rows;
|
||||
}
|
||||
|
||||
private Map<Long, String> queryUsernames(List<Long> userIds) {
|
||||
List<TaskCenterUserRow> rows = queryMapper.selectUsernames(userIds);
|
||||
if (rows == null) {
|
||||
return Map.of();
|
||||
}
|
||||
Map<Long, String> byId = new LinkedHashMap<>();
|
||||
for (TaskCenterUserRow row : rows) {
|
||||
if (row.getUserId() != null) {
|
||||
byId.put(row.getUserId(), row.getUsername());
|
||||
}
|
||||
}
|
||||
return byId;
|
||||
}
|
||||
|
||||
private static Long parseUserId(String uid) {
|
||||
if (uid == null || uid.isBlank()) {
|
||||
return null;
|
||||
}
|
||||
try {
|
||||
long id = Long.parseLong(uid.trim());
|
||||
return id > 0 ? id : null;
|
||||
} catch (NumberFormatException ex) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/** 麦象状态码:0 等待 / 1 处理中 / 2 已完成 / 3 失败;未识别的一律「未知」不冒充成功。 */
|
||||
private static String statusLabel(int status) {
|
||||
return switch (status) {
|
||||
case 0 -> "等待执行";
|
||||
case 1 -> "处理中";
|
||||
case 2 -> "已完成";
|
||||
case 3 -> "处理失败";
|
||||
default -> "未知";
|
||||
};
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user