feat(taskcenter): 变体采集接口(麦象代理,多 uid + res_mes)

This commit is contained in:
2026-09-28 23:22:41 +08:00
parent f9d702f9a6
commit 4f414b46e6
8 changed files with 420 additions and 4 deletions
@@ -68,6 +68,25 @@ public class MaixiangConsoleClient {
return parseSingleTaskPage(fetch(url, "单任务列表 status=" + status));
}
/**
* 批量任务分页查询(后台看板用):按 uid 集合(逗号分隔,服务端拆分后 IN)、状态、类型筛选。
* {@code uidsCsv} 为空表示不加 uid 过滤(超管),此时会看到所有客户端提交的任务。
* 查询失败(含未部署新麦象接口)返回空页,由调用方展示空列表。
*/
public BatchTaskPage batchTasksPage(String uidsCsv, Integer status, String taskType, int page, int pageSize) {
return parseBatchTaskPage(fetch(batchTasksUrl(uidsCsv, status, taskType, page, pageSize), "批量任务列表(看板)"));
}
/** 组装看板批量任务查询 URL(包内可见供单测校验参数编码)。 */
String batchTasksUrl(String uidsCsv, Integer status, String taskType, int page, int pageSize) {
return buildUrl("/api/console/batch/tasks",
hasText(uidsCsv) ? "uid=" + uidsCsv.trim() : null,
status == null ? null : "status=" + status,
hasText(taskType) ? "task_type=" + taskType.trim() : null,
"page=" + page,
"page_size=" + pageSize);
}
/** 单任务队列状态(task:queue:N / task:processing:N,仅返回非零级别)。 */
public List<QueueStateItem> queueStatus() {
return parseQueueStates(fetch(buildUrl("/api/console/queue/status"), "队列状态"));
@@ -154,7 +173,10 @@ public class MaixiangConsoleClient {
node.path("uid").asText(""),
node.path("status").asInt(-1),
parseTime(node.path("create_time").asText(null)),
parseTime(node.path("update_time").asText(null))));
parseTime(node.path("update_time").asText(null)),
node.path("res_mes").asText(""),
node.path("task_data").isMissingNode() || node.path("task_data").isNull()
? null : node.path("task_data").asText("")));
}
return new BatchTaskPage(data.path("total").asLong(items.size()), items);
}
@@ -220,9 +242,10 @@ public class MaixiangConsoleClient {
// ======================== 数据模型 ========================
/** 批量任务(all_task)单条。 */
/** 批量任务(all_task)单条;{@code resMes} 是进度/结果文字(旧版接口缺失时为空串)。 */
public record BatchTaskItem(String taskId, String taskType, String uid, int status,
LocalDateTime createTime, LocalDateTime updateTime) {
LocalDateTime createTime, LocalDateTime updateTime,
String resMes, String taskData) {
}
public record BatchTaskPage(long total, List<BatchTaskItem> items) {
@@ -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);
@@ -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;
}
@@ -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;
}
@@ -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 -> "未知";
};
}
}
@@ -115,6 +115,61 @@ class MaixiangConsoleClientTest {
"test"));
assertThat(page.items().get(0).uid()).isEqualTo("collect-27475");
assertThat(page.items().get(0).updateTime()).isNull();
// 旧版麦象(未返回 res_mes)解析成空串而非 null,前端直接展示不判空
assertThat(page.items().get(0).resMes()).isEmpty();
}
@Test
void batchTasksPageUrlCarriesUidCsvAndFilters() {
// 变体采集看板:可见用户拼成一个逗号分隔的 uid 参数(服务端按逗号拆分),筛选与分页透传。
// 断言解码后的 query —— 逗号是否被百分号编码都不影响服务端拿到的值。
NotificationProperties properties = new NotificationProperties();
properties.setPriceTrackApiUrl("http://192.168.0.170:18960");
properties.setMaixiangConsoleToken("test-token");
MaixiangConsoleClient underTest = new MaixiangConsoleClient(properties, new ObjectMapper());
String url = underTest.batchTasksUrl("5,11", 1, "variant-collection", 2, 15);
assertThat(url).startsWith("http://192.168.0.170:18960/api/console/batch/tasks?");
String query = java.net.URI.create(url).getQuery();
assertThat(query).contains("uid=5,11");
assertThat(query).contains("status=1");
assertThat(query).contains("task_type=variant-collection");
assertThat(query).contains("page=2");
assertThat(query).contains("page_size=15");
}
@Test
void batchTasksPageUrlOmitsBlankFilters() {
// 超管 uidsCsv=null → 不带 uid 参数(全量);status/taskType 为空同样不传
NotificationProperties properties = new NotificationProperties();
properties.setPriceTrackApiUrl("http://192.168.0.170:18960");
properties.setMaixiangConsoleToken("test-token");
MaixiangConsoleClient underTest = new MaixiangConsoleClient(properties, new ObjectMapper());
String query = java.net.URI.create(underTest.batchTasksUrl(null, null, null, 1, 20)).getQuery();
assertThat(query).doesNotContain("uid=");
assertThat(query).doesNotContain("status=");
assertThat(query).doesNotContain("task_type=");
assertThat(query).contains("page=1");
assertThat(query).contains("page_size=20");
}
@Test
void parseBatchTasksReadsResMesAndTaskData() {
// Task 8 之后的 items 契约:多出 res_mes(进度/结果文字)与 task_data(任务参数)
BatchTaskPage page = client.parseBatchTaskPage(client.parseEnvelope(
"{\"code\":1,\"mes\":\"成功\",\"data\":{\"total\":1,\"items\":[{"
+ "\"task_id\":\"t-9\",\"task_type\":\"variant-collection\",\"uid\":\"1053\","
+ "\"status\":1,\"res_mes\":\"最新采集到 B0XXXXXXX 数据,已采集 12 条\","
+ "\"task_data\":\"{\\\"file_url\\\": \\\"https://oss.aishufu.top/a.xlsx\\\"}\","
+ "\"create_time\":\"2026-09-15 10:00:00\",\"update_time\":\"2026-09-15 10:05:00\"}]}}",
"test"));
var item = page.items().get(0);
assertThat(item.resMes()).contains("已采集 12 条");
assertThat(item.taskData()).contains("a.xlsx");
}
@Test
@@ -274,7 +274,7 @@ class MaixiangAnomalyScannerTest {
// ======================== 构造辅助 ========================
private BatchTaskItem batchTask(String taskId, String type, String uid, int status, LocalDateTime updateTime) {
return new BatchTaskItem(taskId, type, uid, status, updateTime, updateTime);
return new BatchTaskItem(taskId, type, uid, status, updateTime, updateTime, "", null);
}
private SingleTaskItem singleTask(String taskId, String type, int status, LocalDateTime updateTime) {
@@ -0,0 +1,150 @@
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 org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Set;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.when;
/**
* 变体采集页签的 Java 侧口径:可见用户 → uid 集合(逗号拼接、排序稳定)、
* 分页归一化、uid → 账号名映射、麦象不可达/未配置时返回空页。
*/
@ExtendWith(MockitoExtension.class)
class TaskCenterVariantServiceTest {
@Mock private MaixiangConsoleClient consoleClient;
@Mock private TaskCenterQueryMapper queryMapper;
@InjectMocks private TaskCenterVariantService service;
private static TaskCenterScopeService.ScopeContext superScope() {
return new TaskCenterScopeService.ScopeContext(true, Set.of());
}
private static TaskCenterScopeService.ScopeContext scoped(Long... userIds) {
return new TaskCenterScopeService.ScopeContext(false, Set.of(userIds));
}
private static BatchTaskItem item(String taskId, String uid, int status, String resMes) {
return new BatchTaskItem(taskId, "variant-collection", uid, status,
LocalDateTime.of(2026, 9, 15, 10, 0, 0), LocalDateTime.of(2026, 9, 15, 10, 5, 0),
resMes, "{\"file_url\": \"https://oss.aishufu.top/a.xlsx\"}");
}
private static TaskCenterUserRow userRow(Long id, String username) {
TaskCenterUserRow row = new TaskCenterUserRow();
row.setUserId(id);
row.setUsername(username);
return row;
}
@Test
void pagePassesVisibleUidsCsvAndFiltersToMaixiang() {
when(consoleClient.configured()).thenReturn(true);
when(consoleClient.batchTasksPage("5,11", 1, "variant-collection", 2, 15))
.thenReturn(new BatchTaskPage(2, List.of(
item("t-1", "5", 1, "最新采集到 B0XXXXXXX 数据,已采集 12 条"),
item("t-2", "11", 2, "已完成,共 30 条"))));
when(queryMapper.selectUsernames(List.of(5L, 11L)))
.thenReturn(List.of(userRow(5L, "ali"), userRow(11L, "bob")));
TaskCenterVariantPageVo page = service.variantTasks(scoped(11L, 5L), 1, null, 2, 15);
assertEquals(2, page.getTotal());
assertEquals(2, page.getPage());
assertEquals(15, page.getPageSize());
assertEquals(2, page.getItems().size());
assertEquals("t-1", page.getItems().get(0).getTaskId());
assertEquals("ali", page.getItems().get(0).getUsername());
assertEquals(1, page.getItems().get(0).getStatus());
assertEquals("处理中", page.getItems().get(0).getStatusLabel());
assertEquals("最新采集到 B0XXXXXXX 数据,已采集 12 条", page.getItems().get(0).getResMes());
assertEquals("已完成", page.getItems().get(1).getStatusLabel());
assertEquals("bob", page.getItems().get(1).getUsername());
}
@Test
void pageReturnsEmptyForNonAdminWithNoVisibleUsersWithoutCallingMaixiang() {
TaskCenterVariantPageVo page = service.variantTasks(scoped(), null, null, 1, 20);
assertEquals(0, page.getItems().size());
assertEquals(0, page.getTotal());
verifyNoInteractions(consoleClient);
verifyNoInteractions(queryMapper);
}
@Test
void pageReturnsEmptyWhenMaixiangNotConfigured() {
when(consoleClient.configured()).thenReturn(false);
TaskCenterVariantPageVo page = service.variantTasks(superScope(), null, null, null, null);
assertEquals(0, page.getItems().size());
verify(consoleClient, never()).batchTasksPage(any(), any(), any(), anyInt(), anyInt());
verifyNoInteractions(queryMapper);
}
@Test
void superAdminPassesNoUidFilterAndDefaultPaging() {
when(consoleClient.configured()).thenReturn(true);
when(consoleClient.batchTasksPage(isNull(), isNull(), eq("variant-collection"), eq(1), eq(20)))
.thenReturn(BatchTaskPage.EMPTY);
TaskCenterVariantPageVo page = service.variantTasks(superScope(), null, null, null, null);
assertEquals(0, page.getItems().size());
assertEquals(1, page.getPage());
assertEquals(20, page.getPageSize());
verify(queryMapper, never()).selectUsernames(any());
}
@Test
void pageSizeCappedAt100AndTaskTypeOverridable() {
when(consoleClient.configured()).thenReturn(true);
when(consoleClient.batchTasksPage(isNull(), eq(3), eq("search-collection"), eq(1), eq(100)))
.thenReturn(BatchTaskPage.EMPTY);
service.variantTasks(superScope(), 3, "search-collection", null, 500);
verify(consoleClient).batchTasksPage(isNull(), eq(3), eq("search-collection"), eq(1), eq(100));
}
@Test
void nonNumericUidAndUnknownStatusDegradeGracefully() {
when(consoleClient.configured()).thenReturn(true);
when(consoleClient.batchTasksPage("5", null, "variant-collection", 1, 20))
.thenReturn(new BatchTaskPage(3, List.of(
item("t-1", "collect-27475", 0, "已添加至任务队列,等待执行"),
item("t-2", "5", 9, ""))));
when(queryMapper.selectUsernames(List.of(5L))).thenReturn(List.of(userRow(5L, "ali")));
TaskCenterVariantPageVo page = service.variantTasks(scoped(5L), null, null, 1, 20);
assertNull(page.getItems().get(0).getUsername(), "非数字 uid 不参与账号名映射");
assertEquals("collect-27475", page.getItems().get(0).getUid());
assertEquals("等待执行", page.getItems().get(0).getStatusLabel());
assertEquals("ali", page.getItems().get(1).getUsername());
assertEquals("未知", page.getItems().get(1).getStatusLabel(), "未识别的麦象状态码不冒充成功");
}
}