task-116: 后台管理新增/导入表单弹窗化 + 分组管理独立菜单与UI优化 + 轻量进度端点
- 后台管理页(admin)所有面板的新增/导入表单改为弹窗操作,原有字段 ID 全部保留、提交逻辑不变;导入删除入口不再触发二次确认拦截 - 分组管理升级为独立菜单(V102 + schema initializer),移除 5 个面板内的管理分组按钮;分组列表改为蓝白主题、增加权限分组横幅 - Python 侧 group-manage 权限守卫(_ensure_backend_menu_access 补充 group-manage) - 引入 V101(biz_task_file_job 复合索引)+ 新增 TaskProgressLight/TaskFileJob 轻量端点与进度聚合作 - 前端 progress-light / page-separated-loads / dispatch-guard 共享模块及单元测试
This commit is contained in:
+11
@@ -24,6 +24,8 @@ import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import com.nanri.aiimage.modules.task.model.dto.TaskProgressLightRequest;
|
||||
import com.nanri.aiimage.modules.task.model.vo.TaskProgressLightBatchVo;
|
||||
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
@@ -104,6 +106,15 @@ public class PublishController {
|
||||
return ApiResponse.success(publishTaskService.getTaskProgress(request.getUserId(), request.getTaskIds()));
|
||||
}
|
||||
|
||||
@PostMapping("/tasks/progress/light")
|
||||
@Operation(summary = "批量查询任务轻量进度(前端轮询专用)",
|
||||
description = "与 progress/batch 同输入,只返回轻量字段(taskId/status/statusCode/fileStatus/fileError/fileReady/updatedAt),"
|
||||
+ "不查明细/result 行,响应体更小;旧 progress/batch 端点保留不动。user_id 可省略,传入时仅返回该用户的任务。")
|
||||
public ApiResponse<TaskProgressLightBatchVo> progressLight(
|
||||
@Valid @RequestBody TaskProgressLightRequest request) {
|
||||
return ApiResponse.success(publishTaskService.progressLight(request.getUserId(), request.getTaskIds()));
|
||||
}
|
||||
|
||||
@PostMapping("/tasks/{taskId}/result")
|
||||
@Operation(
|
||||
summary = "Python 按文件分片回传上架结果",
|
||||
|
||||
+32
-11
@@ -4,6 +4,7 @@ import cn.hutool.core.io.FileUtil;
|
||||
import cn.hutool.core.util.IdUtil;
|
||||
import cn.hutool.crypto.digest.DigestUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import com.fasterxml.jackson.core.type.TypeReference;
|
||||
import com.fasterxml.jackson.databind.JsonNode;
|
||||
@@ -70,6 +71,8 @@ import java.util.Set;
|
||||
import java.util.function.Function;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Collectors;
|
||||
import com.nanri.aiimage.modules.task.model.vo.TaskProgressLightBatchVo;
|
||||
import com.nanri.aiimage.modules.task.service.TaskProgressLightAssembler;
|
||||
|
||||
@Slf4j
|
||||
@Service
|
||||
@@ -77,6 +80,10 @@ import java.util.stream.Collectors;
|
||||
public class PublishTaskService {
|
||||
|
||||
public static final String MODULE_TYPE = "PUBLISH";
|
||||
|
||||
public TaskProgressLightBatchVo progressLight(Long userId, List<Long> taskIds) {
|
||||
return taskProgressLightAssembler.assemble(MODULE_TYPE, userId, taskIds);
|
||||
}
|
||||
public static final int DEFAULT_PAGE_SIZE = 50;
|
||||
private static final int MAX_PAGE_SIZE = 200;
|
||||
private static final int INSERT_BATCH_SIZE = 500;
|
||||
@@ -102,6 +109,7 @@ public class PublishTaskService {
|
||||
private final ObjectMapper objectMapper;
|
||||
private final TransactionTemplate transactionTemplate;
|
||||
private final InstanceMetadata instanceMetadata;
|
||||
private final TaskProgressLightAssembler taskProgressLightAssembler;
|
||||
|
||||
@Value("${aiimage.publish.stale-timeout-minutes:30}")
|
||||
private int staleTimeoutMinutes;
|
||||
@@ -340,10 +348,30 @@ public class PublishTaskService {
|
||||
public PublishDashboardVo dashboard(Long userId) {
|
||||
validateUserId(userId);
|
||||
PublishDashboardVo response = new PublishDashboardVo();
|
||||
response.setPendingCount(countTasks(userId, STATUS_PENDING));
|
||||
response.setRunningCount(countTasks(userId, STATUS_RUNNING));
|
||||
response.setSuccessCount(countTasks(userId, STATUS_SUCCESS));
|
||||
response.setFailedCount(countTasks(userId, STATUS_FAILED));
|
||||
response.setPendingCount(0L);
|
||||
response.setRunningCount(0L);
|
||||
response.setSuccessCount(0L);
|
||||
response.setFailedCount(0L);
|
||||
for (Map<String, Object> row : fileTaskMapper.selectMaps(new QueryWrapper<FileTaskEntity>()
|
||||
.select("status", "count(*) AS cnt")
|
||||
.eq("module_type", MODULE_TYPE)
|
||||
.eq("user_id", userId)
|
||||
.groupBy("status"))) {
|
||||
Object status = row.get("status");
|
||||
Object count = row.get("cnt");
|
||||
if (status == null || count == null) {
|
||||
continue;
|
||||
}
|
||||
long n = ((Number) count).longValue();
|
||||
switch (status.toString()) {
|
||||
case STATUS_PENDING -> response.setPendingCount(n);
|
||||
case STATUS_RUNNING -> response.setRunningCount(n);
|
||||
case STATUS_SUCCESS -> response.setSuccessCount(n);
|
||||
case STATUS_FAILED -> response.setFailedCount(n);
|
||||
default -> {
|
||||
}
|
||||
}
|
||||
}
|
||||
response.setRecent(history(userId, 10).getItems());
|
||||
return response;
|
||||
}
|
||||
@@ -1741,13 +1769,6 @@ public class PublishTaskService {
|
||||
return STATUS_SUCCESS.equals(status) || STATUS_FAILED.equals(status);
|
||||
}
|
||||
|
||||
private long countTasks(Long userId, String status) {
|
||||
return Objects.requireNonNullElse(fileTaskMapper.selectCount(new LambdaQueryWrapper<FileTaskEntity>()
|
||||
.eq(FileTaskEntity::getModuleType, MODULE_TYPE)
|
||||
.eq(FileTaskEntity::getUserId, userId)
|
||||
.eq(FileTaskEntity::getStatus, status)), 0L);
|
||||
}
|
||||
|
||||
private List<Long> normalizeTaskIds(List<Long> taskIds) {
|
||||
if (taskIds == null) {
|
||||
return List.of();
|
||||
|
||||
Reference in New Issue
Block a user