fix(phase-6.1): CR 六项修复——派发链三件套/登记顺序/判死口凭据化/脏时间可读/UPDATE 段摘死列
This commit is contained in:
@@ -1,11 +1,14 @@
|
||||
<script setup lang="ts">
|
||||
import { reactive, ref } from 'vue'
|
||||
import { createJdCollectTask, type JdListTab } from '../../shared/api/types/modules/jd-collect.ts'
|
||||
import { getPywebviewApi } from '../../shared/bridges/pywebview.ts'
|
||||
|
||||
/** 京东店铺商品采集建单页(v1.4 AC-1,蓝图 §3.2)。
|
||||
*
|
||||
* 页面只做建单:任务落 PENDING、执行通道固定 LOCAL,由本机客户端在已登录京麦的
|
||||
* 窗口内领取执行;进度与结果到客户端任务列表(或后台「京东数据库」)查看。
|
||||
* 建单后把 `jd-shop-collect-run` 载荷推进本机客户端队列(v1.4 Phase 6.1 修 P0-1:
|
||||
* 只建单不推送会让任务永久停在 PENDING——兜底拉取是补救不是主链)。data 键集与
|
||||
* 客户端 jd_base.process_task 读取契约同键;推送失败不回滚建单,任务可由服务端
|
||||
* 兜底拉取(TaskClientPullService 白名单含 JD_SHOP_COLLECT)认领。
|
||||
*/
|
||||
|
||||
const form = reactive({
|
||||
@@ -26,6 +29,29 @@ function buildListTabs(): JdListTab[] {
|
||||
return tabs
|
||||
}
|
||||
|
||||
/** 建单成功后推送本机队列;返回 null 表示环境无队列能力(浏览器预览),返回 string 表示失败原因。 */
|
||||
async function pushToClientQueue(
|
||||
taskId: number,
|
||||
shopName: string,
|
||||
tabs: JdListTab[],
|
||||
maxProducts: number,
|
||||
): Promise<string | null> {
|
||||
const api = getPywebviewApi()
|
||||
if (!api?.enqueue_json) {
|
||||
return '当前环境未启用任务队列能力(浏览器预览环境不会启动),请在本机客户端中打开本页'
|
||||
}
|
||||
const payload = {
|
||||
type: 'jd-shop-collect-run',
|
||||
ts: Date.now(),
|
||||
data: { taskId, shopName, listTabs: tabs, maxProducts },
|
||||
}
|
||||
const pushResult = await api.enqueue_json(payload)
|
||||
if (pushResult?.success) {
|
||||
return null
|
||||
}
|
||||
return pushResult?.error || '推送本机队列失败,任务将由客户端兜底拉取认领'
|
||||
}
|
||||
|
||||
async function submit() {
|
||||
errorMessage.value = ''
|
||||
successMessage.value = ''
|
||||
@@ -41,9 +67,20 @@ async function submit() {
|
||||
submitting.value = true
|
||||
try {
|
||||
const vo = await createJdCollectTask(form.shopName.trim(), tabs, form.maxProducts)
|
||||
let pushNote = ''
|
||||
try {
|
||||
const pushError = await pushToClientQueue(
|
||||
vo.taskId, form.shopName.trim(), tabs, form.maxProducts)
|
||||
if (pushError) {
|
||||
pushNote = ` ${pushError}`
|
||||
}
|
||||
} catch (pushErr) {
|
||||
// 推送自身异常不回滚建单:任务可由服务端兜底拉取认领
|
||||
pushNote = ` 推送本机队列异常(${pushErr instanceof Error ? pushErr.message : '未知错误'}),任务将由客户端兜底拉取认领`
|
||||
}
|
||||
successMessage.value = `建单成功:任务号 ${vo.taskId}${vo.taskNo ? `(${vo.taskNo})` : ''}。` +
|
||||
'任务由本机客户端执行,请保持客户端在线并已登录京麦;采集进度在客户端任务列表查看,' +
|
||||
'落库数据到后台「京东数据库」菜单查询。'
|
||||
'落库数据到后台「京东数据库」菜单查询。' + pushNote
|
||||
} catch (err) {
|
||||
errorMessage.value = err instanceof Error ? err.message : '建单失败,请稍后重试'
|
||||
} finally {
|
||||
|
||||
Reference in New Issue
Block a user