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
@@ -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(), "未识别的麦象状态码不冒充成功");
}
}