feat(phase-4): 京东商品上架用户端页(v1.5 蓝图 docs/ITERATION_PLAN.md §4 Phase 4)——JdPublishTab(分类 jdCollect.groups 唯一源→选品分页 owner 过滤→跨页勾选→改价三档→建单 queuePayload 直推→useLiveTaskBoard 行级面板+credential-fatal 同形接入)+tool-catalog 占位卡转正式+router 注册;后端面板读侧 JdCollectController 同形五端点(products/dashboard/history/progressBatch/delete)+JdPublishBoardService(无 scope_state,进度真源=明细行级四档)+JdProductQueryService.pageForUser(归属表两步下推不夹原生 SQL);激活 Phase 0 预置 5 支 Pending 契约;判据:JdPublishBoardServiceTest 5+JdProductQueryServiceUserPageTest 4+outlet 分母 138/72(写+2 读+3 随面板端点)、endpoints 冻结快照+progress/batch 清单+1、终态窄集合台账+JdPublishTab 1、catch 块 319→324 全非静默、占位 mount 锁翻转两条断言;vue-tsc rc0、用户端 node --test 1078/1078+vitest mount 90/90、后端点名 6 类 41 例 BUILD SUCCESS、快检四面格(后端 9.5/客户端 10.0/用户端 9.6)绿,唯一红格=后管 mount 组件挂载格,甄别=他窗在飞 admin 件输出含 failed 子串触发 ruler vfail 脆弱判据(实跑 cmd /c npx vitest run RC=0、188/188 全过,本笔零后管文件)
This commit is contained in:
@@ -226,6 +226,25 @@ export const API_ENDPOINTS = {
|
||||
/** 删除任务(连带清理京东数据库该任务的商品/图片/SKU 行与断点游标) */
|
||||
deleteTask: '/api/jd-collect/tasks/{taskId}',
|
||||
},
|
||||
/** 京东商品上架(v1.5 Phase 4):用户端建单/激活/选品/面板;派发载荷 type=jd-product-publish-run 由服务端下发 */
|
||||
jdPublish: {
|
||||
/** 建单(请求体 categoryId+productIds+priceRule,响应带 queuePayload 页面直推) */
|
||||
create: '/api/jd-publish/tasks',
|
||||
/** 激活(PENDING→RUNNING):推客户端队列之前必须调用(2026-11-14 采集链真机实录同因) */
|
||||
activate: '/api/jd-publish/tasks/{taskId}/activate',
|
||||
/** 用户端选品分页(AC-9 owner 过滤:只回归属当前用户的京东数据库商品行) */
|
||||
products: '/api/jd-publish/products',
|
||||
/** 任务面板总览(运行中/成功/失败计数统计卡) */
|
||||
dashboard: '/api/jd-publish/dashboard',
|
||||
/** 任务历史(活跃任务排前,含行级四档计数与建单载荷带回) */
|
||||
history: '/api/jd-publish/history',
|
||||
/** 批量任务进度(面板轮询专用,归属先经公共出口过滤) */
|
||||
progressBatch: '/api/jd-publish/tasks/progress/batch',
|
||||
/** 单任务行级进度(行级四档计数;面板批量口覆盖不到的兜底) */
|
||||
progress: '/api/jd-publish/tasks/{taskId}/progress',
|
||||
/** 删除任务(连带清理该任务的发布明细快照行) */
|
||||
deleteTask: '/api/jd-publish/tasks/{taskId}',
|
||||
},
|
||||
userSecret: {
|
||||
bundle: '/api/user-secrets',
|
||||
save: '/api/user-secrets/{moduleKey}',
|
||||
|
||||
@@ -0,0 +1,283 @@
|
||||
import { get, post, del, type JavaApiResponse, unwrapJavaResponse } from '../../http.ts'
|
||||
import { buildJavaUrl, JAVA_API_PREFIX } from '../../url.ts'
|
||||
import { getCurrentUserId } from '../../user.ts'
|
||||
import { API_ENDPOINTS } from '../../endpoints.ts'
|
||||
import { getTaskProgressCacheTtlMs, getTaskProgressTimeoutMs } from '../../../task-progress-config.ts'
|
||||
import { createTaskProgressRequestCache } from '../../../task-progress-request-cache.ts'
|
||||
|
||||
/**
|
||||
* 京东商品上架(v1.5 蓝图 docs/ITERATION_PLAN.md §3/§4 Phase 4):用户端「京东工具台 →
|
||||
* 商品上架」选自定义分类 → 勾选归属自己的商品(AC-9 owner 过滤)→ 可选统一改价规则 →
|
||||
* 建单(服务端落 PENDING、执行通道显式 LOCAL)→ 建单响应 queuePayload 原样投
|
||||
* api.enqueue_json 推本机客户端(铁律 32 第三件,type 与 SPI QUEUE_TYPE 同值)。
|
||||
*
|
||||
* 面板三件(dashboard/history/progressBatch)与删除/中断照 jd-collect 同族形状;
|
||||
* 分类读取唯一来源仍是 jdCollect.groups 既有出口(B113-01,AC-9 源码绊线钉死)。
|
||||
*/
|
||||
|
||||
/** 建单回执:任务落 PENDING;queuePayload 页面直推本机队列(服务端组装,页面不拼载荷)。 */
|
||||
export interface JdPublishTaskVo {
|
||||
taskId: number;
|
||||
taskNo?: string;
|
||||
collectChannel?: string;
|
||||
/** {type:'jd-product-publish-run', data:{taskId, priceRule}}(铁律 32 第三件) */
|
||||
queuePayload?: Record<string, unknown>;
|
||||
}
|
||||
|
||||
/** 建单统一改价规则:none 原价 / percent 加价百分比(value=百分数) / fixed 固定加价(value=金额)。 */
|
||||
export interface JdPublishPriceRule {
|
||||
mode: 'none' | 'percent' | 'fixed';
|
||||
value?: number;
|
||||
}
|
||||
|
||||
/**
|
||||
* 建单(AC-1/AC-8/AC-9):categoryId=所选自定义分类;productIds=勾选的商品行 id 集
|
||||
* (服务端按 owner 校验,选了他人商品/超配额当场业务码拒绝并点名文案)。
|
||||
* 请求体是 JSON(@RequestBody + JdPublishTaskCreateRequest),字段名 camelCase 与采集建单同口径。
|
||||
*/
|
||||
export function createJdPublishTask(
|
||||
categoryId: number | null,
|
||||
productIds: number[],
|
||||
priceRule: JdPublishPriceRule,
|
||||
) {
|
||||
return unwrapJavaResponse(post<JavaApiResponse<JdPublishTaskVo>, Record<string, unknown>>(
|
||||
buildJavaUrl(API_ENDPOINTS.jdPublish.create),
|
||||
{
|
||||
userId: getCurrentUserId(),
|
||||
categoryId,
|
||||
productIds,
|
||||
// mode=none 时不带 value(后端 normalizePriceRule 对 none 忽略 value)
|
||||
priceRule: priceRule.mode === 'none' ? { mode: 'none' } : priceRule,
|
||||
},
|
||||
))
|
||||
}
|
||||
|
||||
/** 激活任务(PENDING→RUNNING):推客户端队列之前必须调用(漏掉=分片全被拒,采集链真机实录同因)。 */
|
||||
export function activateJdPublishTask(taskId: number) {
|
||||
const path = buildJavaUrl(API_ENDPOINTS.jdPublish.activate.replace('{taskId}', String(taskId)))
|
||||
const query = `?user_id=${encodeURIComponent(String(getCurrentUserId()))}`
|
||||
return unwrapJavaResponse(post<JavaApiResponse<null>, Record<string, unknown>>(path + query, {}))
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// 选品分页(AC-9 owner 过滤):服务端只回归属当前用户的京东数据库商品行。
|
||||
// 形状照后管京东数据库列表行裁剪(选品面板只需要主字段,attr/detail 不下发)。
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
export interface JdPublishProductVo {
|
||||
id: number;
|
||||
shopName?: string;
|
||||
productCode?: string;
|
||||
skuCount?: number;
|
||||
title?: string;
|
||||
categoryPath?: string;
|
||||
priceMin?: number;
|
||||
priceMax?: number;
|
||||
stockTotal?: number;
|
||||
saleStatus?: string;
|
||||
mainImageUrl?: string;
|
||||
imageCount?: number;
|
||||
syncedAt?: string;
|
||||
}
|
||||
|
||||
export interface JdPublishProductPageVo {
|
||||
items: JdPublishProductVo[];
|
||||
total: number;
|
||||
page: number;
|
||||
pageSize: number;
|
||||
}
|
||||
|
||||
/** 选品分页:categoryId 缺省=全部归属商品(分类下拉唯一来源是 jdCollect.groups 既有出口,AC-9)。 */
|
||||
export function fetchJdPublishProducts(categoryId: number | null, page: number, pageSize: number) {
|
||||
const params: Record<string, unknown> = {
|
||||
user_id: getCurrentUserId(),
|
||||
page,
|
||||
page_size: pageSize,
|
||||
}
|
||||
if (categoryId != null && categoryId > 0) {
|
||||
params.category_id = categoryId
|
||||
}
|
||||
return unwrapJavaResponse(
|
||||
get<JavaApiResponse<JdPublishProductPageVo>>(
|
||||
buildJavaUrl(API_ENDPOINTS.jdPublish.products),
|
||||
{ params },
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// 任务面板(v1.5 Phase 4):总览统计卡 / 历史层(行级四档计数)/ 活跃任务批量进度 / 删除。
|
||||
// 形状照 jd-collect 同族;京东发布没有结果文件,没有 downloadUrl / fileStatus 那一层。
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
/** 任务面板总览(运行中/已结束/成功/失败任务数)。 */
|
||||
export interface JdPublishDashboardVo {
|
||||
pendingTaskCount: number;
|
||||
processedTaskCount: number;
|
||||
successTaskCount: number;
|
||||
failedTaskCount: number;
|
||||
}
|
||||
|
||||
/** 历史行(任务卡片数据源)。行级四档计数来自发布明细表聚合(服务端真源,不编造分母)。 */
|
||||
export interface JdPublishHistoryItemVo {
|
||||
taskId?: number;
|
||||
taskNo?: string;
|
||||
/** biz_file_task.status 原值:PENDING/RUNNING/SUCCESS/FAILED */
|
||||
taskStatus?: string;
|
||||
success?: boolean;
|
||||
errorMessage?: string;
|
||||
/** 建单所选自定义分类 id;重试重建推送载荷时同源带回 */
|
||||
categoryId?: number;
|
||||
/** 建单统一改价规则(原样带回;重试重建推送载荷与建单响应 queuePayload 同键) */
|
||||
priceRule?: { mode?: string; value?: number };
|
||||
/** 商品明细总行数 */
|
||||
productTotal?: number;
|
||||
pendingCount?: number;
|
||||
publishingCount?: number;
|
||||
successCount?: number;
|
||||
failedCount?: number;
|
||||
createdAt?: string;
|
||||
finishedAt?: string;
|
||||
updatedAt?: string;
|
||||
}
|
||||
|
||||
export interface JdPublishHistoryVo {
|
||||
items: JdPublishHistoryItemVo[];
|
||||
}
|
||||
|
||||
/** 批量进度条目:任务头 + 单元素进度行(与 jd-collect TaskDetailVo 同形)。 */
|
||||
export interface JdPublishTaskDetailVo {
|
||||
task?: {
|
||||
id?: number;
|
||||
taskNo?: string;
|
||||
status?: string;
|
||||
errorMessage?: string;
|
||||
updatedAt?: string;
|
||||
};
|
||||
items?: JdPublishHistoryItemVo[];
|
||||
}
|
||||
|
||||
export interface JdPublishTaskBatchVo {
|
||||
items: JdPublishTaskDetailVo[];
|
||||
missingTaskIds: number[];
|
||||
}
|
||||
|
||||
export function fetchJdPublishDashboard() {
|
||||
return unwrapJavaResponse(
|
||||
get<JavaApiResponse<JdPublishDashboardVo>>(
|
||||
buildJavaUrl(API_ENDPOINTS.jdPublish.dashboard),
|
||||
{ params: { user_id: getCurrentUserId() } },
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
export function fetchJdPublishHistory() {
|
||||
return unwrapJavaResponse(
|
||||
get<JavaApiResponse<JdPublishHistoryVo>>(
|
||||
buildJavaUrl(API_ENDPOINTS.jdPublish.history),
|
||||
{ params: { user_id: getCurrentUserId(), limit: 50 } },
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
interface JdProgressBatchOptions {
|
||||
force?: boolean;
|
||||
}
|
||||
|
||||
const taskProgressResponseCache = createTaskProgressRequestCache<unknown>({
|
||||
ttlMs: () => getTaskProgressCacheTtlMs(),
|
||||
maxEntries: 100,
|
||||
maxInflight: 16,
|
||||
});
|
||||
|
||||
function normalizeTaskIds(taskIds: number[]) {
|
||||
return Array.from(
|
||||
new Set(
|
||||
(taskIds || [])
|
||||
.map((taskId) => Number(taskId))
|
||||
.filter((taskId) => Number.isFinite(taskId) && taskId > 0),
|
||||
),
|
||||
).sort((left, right) => left - right);
|
||||
}
|
||||
|
||||
function buildTaskProgressRequestKey(path: string, taskIds: number[]) {
|
||||
return `${path}::${taskIds.join(',')}`;
|
||||
}
|
||||
|
||||
/** 批量进度请求缓存(与 jd-collect 同一形状:TTL 缓存 + 在飞合并 + force 旁路)。 */
|
||||
async function postTaskProgressBatch<T>(
|
||||
path: string,
|
||||
taskIds: number[],
|
||||
options: JdProgressBatchOptions = {},
|
||||
) {
|
||||
const normalizedTaskIds = normalizeTaskIds(taskIds);
|
||||
if (!normalizedTaskIds.length) {
|
||||
return { items: [], missingTaskIds: [] } as T;
|
||||
}
|
||||
|
||||
const cacheKey = buildTaskProgressRequestKey(path, normalizedTaskIds);
|
||||
const cached = taskProgressResponseCache.get(cacheKey);
|
||||
if (!options.force && cached !== undefined) {
|
||||
return cached as T;
|
||||
}
|
||||
|
||||
const inflight = taskProgressResponseCache.getInflight(cacheKey);
|
||||
if (!options.force && inflight) {
|
||||
return (await inflight) as T;
|
||||
}
|
||||
|
||||
const requestPromise = unwrapJavaResponse(
|
||||
post<JavaApiResponse<T>, { taskIds: number[]; userId?: number }>(path, {
|
||||
taskIds: normalizedTaskIds,
|
||||
userId: Number(window.localStorage.getItem('uid')) || undefined,
|
||||
}, {
|
||||
timeout: getTaskProgressTimeoutMs(),
|
||||
}),
|
||||
)
|
||||
.then((data) => {
|
||||
taskProgressResponseCache.set(cacheKey, data);
|
||||
return data;
|
||||
})
|
||||
.finally(() => {
|
||||
taskProgressResponseCache.endInflight(cacheKey);
|
||||
});
|
||||
|
||||
taskProgressResponseCache.startInflight(cacheKey, requestPromise);
|
||||
return await requestPromise;
|
||||
}
|
||||
|
||||
export function fetchJdPublishTaskProgressBatch(
|
||||
taskIds: number[],
|
||||
options: JdProgressBatchOptions = {},
|
||||
) {
|
||||
return postTaskProgressBatch<JdPublishTaskBatchVo>(
|
||||
buildJavaUrl(API_ENDPOINTS.jdPublish.progressBatch),
|
||||
taskIds,
|
||||
options,
|
||||
);
|
||||
}
|
||||
|
||||
/** 删除任务:服务端连带清理该任务的发布明细快照行。 */
|
||||
export function deleteJdPublishTask(taskId: number) {
|
||||
return unwrapJavaResponse(
|
||||
del<JavaApiResponse<null>>(
|
||||
buildJavaUrl(API_ENDPOINTS.jdPublish.deleteTask.replace('{taskId}', String(taskId))),
|
||||
{ params: { user_id: getCurrentUserId() } },
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* 用户中断任务:在跑/待跑的任务落 CANCELLED——客户端心跳拿到 notAlive 后协作停止,
|
||||
* 已发布的行保留在发布明细里,之后可「继续」接着跑(断点游标服务端按 PENDING 行下发)。
|
||||
* 通用任务中断端点(TaskHeartbeatController),与采集中断同形。
|
||||
*/
|
||||
export function interruptJdPublishTask(taskId: number) {
|
||||
return unwrapJavaResponse(
|
||||
post<JavaApiResponse<null>>(
|
||||
`${JAVA_API_PREFIX}/tasks/${taskId}/interrupt`,
|
||||
undefined,
|
||||
{ params: { user_id: getCurrentUserId() } },
|
||||
),
|
||||
);
|
||||
}
|
||||
Reference in New Issue
Block a user