diff --git a/backend-java/src/main/java/com/nanri/aiimage/config/ApiGuardCoverageAuditor.java b/backend-java/src/main/java/com/nanri/aiimage/config/ApiGuardCoverageAuditor.java index b7ba68816..dd5edd20e 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/config/ApiGuardCoverageAuditor.java +++ b/backend-java/src/main/java/com/nanri/aiimage/config/ApiGuardCoverageAuditor.java @@ -118,11 +118,13 @@ public class ApiGuardCoverageAuditor implements SmartInitializingSingleton { * requireOwnershipUserId(fail-closed 401),chunk 与 heartbeat 和 collect-data/delete-brand * 同形状(本机桌面执行器不带凭据,行归属以任务 owner 投影);chunk 的 error 上报已接整单 * 判死,其 owner 对撞收口随 v1.4 Phase 6.1 落,判死口凭据化后随统一批进名单 - *
形状照 {@code JdCollectDashboardVo} 同族:当前用户的运行中/成功/失败任务数, + * 已结束=成功+失败。页面进入时请求一次,不参与轮询。
+ */ +@Data +@Schema(description = "京东商品上架任务总览") +public class JdPublishDashboardVo { + + @Schema(description = "运行中任务数(含排队)") + private long pendingTaskCount; + + @Schema(description = "已结束任务数(成功+失败)") + private long processedTaskCount; + + @Schema(description = "成功任务数") + private long successTaskCount; + + @Schema(description = "失败任务数") + private long failedTaskCount; +} diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdPublishHistoryItemVo.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdPublishHistoryItemVo.java new file mode 100644 index 000000000..6c707c8c5 --- /dev/null +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/model/vo/JdPublishHistoryItemVo.java @@ -0,0 +1,67 @@ +package com.nanri.aiimage.modules.jd.model.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Map; + +/** + * 京东商品上架任务历史行(v1.5 Phase 4,任务面板历史层数据源)。 + * + *行级计数(待发布/发布中/成功/失败)来自 {@code biz_jd_publish_item} 按任务聚合; + * 建单载荷(分类 id + 改价规则)随行带回——失败任务「重试」时页面用它重建推送载荷 + * (铁律 26 原任务复位 + 铁律 32 第三件同键:重建的载荷与建单响应 queuePayload 同形状)。
+ */ +@Data +@Schema(description = "京东商品上架任务历史行") +public class JdPublishHistoryItemVo { + + @Schema(description = "任务 ID") + private Long taskId; + + @Schema(description = "任务编号") + private String taskNo; + + @Schema(description = "biz_file_task.status 原值:PENDING/RUNNING/SUCCESS/FAILED") + private String taskStatus; + + @Schema(description = "任务是否成功") + private boolean success; + + @Schema(description = "终态原因(非终态为 null)") + private String errorMessage; + + @Schema(description = "建单所选自定义分类 id(biz_jd_product_group.id)") + private Long categoryId; + + @Schema(description = "建单统一改价规则(原样带回,重试重建推送载荷用;空=原价)") + private Map形状照 {@code JdCollectBoardService} 同族裁剪:京东发布没有 + * {@code biz_task_scope_state} 游标(进度真源是 {@code biz_jd_publish_item} 的行级状态, + * {@code JdPublishTaskService#queryProgress} 同口径),历史行的「行级计数」改从明细表 + * GROUP BY 聚合;删除面只清明细行+任务主行(发布不落商品行,无京东数据库清理语义)。
+ */ +@Service +@RequiredArgsConstructor +@Slf4j +public class JdPublishBoardService { + + private static final int MAX_HISTORY_LIMIT = 100; + + private final FileTaskMapper fileTaskMapper; + private final JdPublishItemMapper jdPublishItemMapper; + private final ObjectMapper objectMapper; + + /** 查询当前用户的面板总览(运行中/成功/失败三档计数,已结束=成功+失败)。 */ + public JdPublishDashboardVo dashboard(Long userId) { + JdPublishDashboardVo vo = new JdPublishDashboardVo(); + long running = countTask(userId, TaskStatuses.FileTask.RUNNING); + long success = countTask(userId, TaskStatuses.FileTask.SUCCESS); + long failed = countTask(userId, TaskStatuses.FileTask.FAILED); + vo.setPendingTaskCount(running); + vo.setSuccessTaskCount(success); + vo.setFailedTaskCount(failed); + vo.setProcessedTaskCount(success + failed); + return vo; + } + + private long countTask(Long userId, String status) { + return fileTaskMapper.selectCount(new LambdaQueryWrapper