fix(采集数据): 提交即启动+历史「等待中」单可重启——33462 挂 20 小时的入口缺失
线上 33462(uid=1245)建单后 status 一直 PENDING、updated_at 与 created_at 逐字相同、 receivedRows=0。取证:当天 15:46:06 的 parse 请求确实到达服务端,同批相邻的 33463/33464 都在几分钟内被 activate,唯独 33462 全天零次;ONLINE 通道的 PENDING 服务端没有任何兜底 (StaleTaskRepairService 明确跳过 PENDING、finalizeStaleTasks 只扫 RUNNING、 TaskResumeService 只处理 FAILED),而把这一单翻成 RUNNING 的唯一动作是前端发 activate, 它当时绑死在「本次会话刚 parse 的 lastTaskId」上——用户点完提交不点启动,界面就再无入口。 - submitCollect 成功后自动走启动链(两步并一步) - 历史行对 PENDING 单出「启动任务」,filters 取服务端从 request_json 回传的那份, 不取界面当前值,否则「重新启动」会悄悄改掉这一单的采集范围 - 三条启动路收敛为单一出口 useCollectDataDispatch(共用前置校验与入队失败回滚) - 缺桌面壳不再静默 return;回滚失败并进同一句报错,消掉搬文件带来的新增静默 catch 判据 tests/collect-data-提交即启动.test.ts(4 格,反向验过:改回旧形状 3 红) 组件 861→842 行(可读棘轮按对象点名只许减,未动基线)
This commit is contained in:
@@ -93,10 +93,10 @@
|
||||
:disabled="pushing || !lastTaskId"
|
||||
@click="pushToPythonQueue"
|
||||
>
|
||||
{{ pushing ? '启动中...' : '启动任务' }}
|
||||
{{ pushing ? '启动中...' : '重新启动' }}
|
||||
</button>
|
||||
</div>
|
||||
<p class="loading-msg">提交后自动识别 Excel 内容,再点「启动任务」即开始采集,进度和结果在右侧查看。</p>
|
||||
<p class="loading-msg">提交后自动识别 Excel 内容并直接开始采集,进度和结果在右侧查看。若自动启动失败(例如不在桌面客户端内),单子保持「等待中」,可在右侧历史列表点「启动任务」。</p>
|
||||
|
||||
<div v-if="queuePushResult" class="queue-debug-card">
|
||||
<div class="section-title queue-debug-title">启动结果</div>
|
||||
@@ -125,6 +125,8 @@
|
||||
<button type="button" class="btn-delete" @click="deleteTaskRecord(itemSource(item))">删除</button>
|
||||
</template>
|
||||
<template #history-item-actions="{ item }">
|
||||
<button v-if="canStartTask(itemSource(item))" type="button" class="btn-run"
|
||||
@click="startPendingTask(itemSource(item))">启动任务</button>
|
||||
<button v-if="canDownload(itemSource(item))" type="button" class="download"
|
||||
@click="downloadResult(itemSource(item))">下载</button>
|
||||
<button v-if="canRetryTask(itemSource(item))" type="button" class="btn-retry"
|
||||
@@ -149,19 +151,15 @@ import FileUploadZone from '@/shared/components/FileUploadZone.vue'
|
||||
import ModuleTemplateDownload from '@/shared/components/ModuleTemplateDownload.vue'
|
||||
import TaskCenterPanel from '@/shared/components/tasks/TaskCenterPanel.vue'
|
||||
import type { TaskItemView, TaskStatCard } from '@/shared/components/tasks/types'
|
||||
import { getPywebviewApi } from '@/shared/bridges/pywebview'
|
||||
import { useExcelFileUpload } from '@/shared/composables/useExcelFileUpload'
|
||||
import { useTaskProgressLoop } from '@/shared/composables/useTaskProgressLoop'
|
||||
import { createCategorizedTimers } from '@/shared/utils/categorized-timers'
|
||||
import { saveUrlWithProgress } from '@/shared/utils/download-progress'
|
||||
import {
|
||||
checkParseResult,
|
||||
checkQueuePayload,
|
||||
} from '@/shared/dispatch-guard'
|
||||
import { checkParseResult } from '@/shared/dispatch-guard'
|
||||
import { useCollectDataDispatch } from '@/shared/composables/useCollectDataDispatch'
|
||||
import { passGuard } from '@/shared/dispatch-guard-ui'
|
||||
import {
|
||||
parseCollectData,
|
||||
activateCollectDataTask,
|
||||
getCollectDataDashboard,
|
||||
getCollectDataHistory,
|
||||
getCollectDataCountryPreference,
|
||||
@@ -169,7 +167,6 @@ import {
|
||||
getCollectDataTaskProgressBatch,
|
||||
deleteCollectDataTask,
|
||||
deleteCollectDataHistory,
|
||||
failCollectDataTask,
|
||||
type CollectDataDashboardVo,
|
||||
type CollectDataHistoryItem,
|
||||
type CollectDataParseVo,
|
||||
@@ -428,6 +425,14 @@ async function submitCollect() {
|
||||
return
|
||||
}
|
||||
ElMessage.success(`提交成功:任务 ${vo.taskNo || vo.taskId},识别 ${vo.acceptedRows ?? 0} 行有效数据`)
|
||||
// 提交即启动:这里曾只做到「建单落库」就结束,启动是第二个按钮。用户点完提交就离开,
|
||||
// 单子会永远停在等待中——ONLINE 通道服务端没有任何 PENDING 兜底会把它推起来(线上 33462 挂 20 小时)。
|
||||
if (lastTaskId.value) {
|
||||
await dispatchCollectDataTask(lastTaskId.value, {
|
||||
taskNo: vo.taskNo, totalRows: vo.acceptedRows ?? 0, pageSize: vo.pageSize,
|
||||
filters: buildFiltersPayload(),
|
||||
})
|
||||
}
|
||||
await Promise.all([loadDashboard(), loadHistory()])
|
||||
} catch (error) {
|
||||
ElMessage.error(error instanceof Error ? error.message : '提交失败')
|
||||
@@ -436,64 +441,41 @@ async function submitCollect() {
|
||||
}
|
||||
}
|
||||
|
||||
// 启动链本体在 useCollectDataDispatch(提交即启动、当前单重试、历史「等待中」单重启三条路共用同一出口)
|
||||
const { dispatch: dispatchCollectDataTask, isStarting } = useCollectDataDispatch({
|
||||
notify: (kind, text) => ElMessage[kind](text),
|
||||
onBusyChange: (busy) => { pushing.value = busy },
|
||||
onDispatched: (payload, queueSize) => {
|
||||
queuePushResult.value = `已启动任务(排队中的任务数:${queueSize})`
|
||||
queuePayloadText.value = JSON.stringify(payload, null, 2)
|
||||
},
|
||||
onStarted: (taskId) => progressLoop.add(taskId),
|
||||
})
|
||||
|
||||
async function pushToPythonQueue() {
|
||||
if (!lastTaskId.value) {
|
||||
ElMessage.warning('请先提交采集任务')
|
||||
return
|
||||
}
|
||||
const api = getPywebviewApi()
|
||||
if (!api?.enqueue_json) {
|
||||
ElMessage.warning('当前环境未提供任务队列能力')
|
||||
return
|
||||
}
|
||||
pushing.value = true
|
||||
let activated = false
|
||||
try {
|
||||
const payload = {
|
||||
type: 'collect-data-run',
|
||||
ts: Date.now(),
|
||||
data: {
|
||||
taskId: lastTaskId.value,
|
||||
taskNo: lastParseVo.value?.taskNo,
|
||||
taskType: 'collect-data',
|
||||
totalRows: lastParseVo.value?.acceptedRows ?? 0,
|
||||
pageSize: lastParseVo.value?.pageSize ?? 50,
|
||||
filters: buildFiltersPayload(),
|
||||
},
|
||||
}
|
||||
// 先校验再激活:拦下来时任务还是 PENDING,不需要回滚成 FAILED
|
||||
const guard = checkQueuePayload(payload, {
|
||||
expectedType: 'collect-data-run',
|
||||
requiredDataKeys: ['taskId', 'pageSize'],
|
||||
nonEmptyObjectKeys: ['filters'],
|
||||
})
|
||||
if (!(await passGuard(guard))) return
|
||||
await activateCollectDataTask(lastTaskId.value)
|
||||
activated = true
|
||||
const result = await api.enqueue_json(payload)
|
||||
if (!result?.success) {
|
||||
throw new Error(result?.error || '启动失败')
|
||||
}
|
||||
queuePushResult.value = `已启动任务(排队中的任务数:${result.queue_size ?? '-'})`
|
||||
queuePayloadText.value = JSON.stringify(payload, null, 2)
|
||||
if (lastTaskId.value) {
|
||||
progressLoop.add(lastTaskId.value)
|
||||
}
|
||||
ElMessage.success('已启动任务')
|
||||
await loadDashboard()
|
||||
} catch (error) {
|
||||
if (activated && lastTaskId.value) {
|
||||
try {
|
||||
await failCollectDataTask(lastTaskId.value, error instanceof Error ? error.message : 'Python queue dispatch failed')
|
||||
} catch {
|
||||
/* 保留原始入队错误 */
|
||||
}
|
||||
}
|
||||
ElMessage.error(error instanceof Error ? error.message : '启动失败')
|
||||
await Promise.all([loadDashboard(), loadHistory()])
|
||||
} finally {
|
||||
pushing.value = false
|
||||
}
|
||||
const vo = lastParseVo.value
|
||||
if (await dispatchCollectDataTask(lastTaskId.value, {
|
||||
taskNo: vo?.taskNo, totalRows: vo?.acceptedRows ?? 0, pageSize: vo?.pageSize,
|
||||
filters: buildFiltersPayload(),
|
||||
})) await Promise.all([loadDashboard(), loadHistory()])
|
||||
}
|
||||
|
||||
// filters 取服务端从 request_json 回传的那份、不取界面当前值,否则「重新启动」会悄悄改掉这一单的采集范围;
|
||||
// pageSize 历史 VO 里没有(它是 parse 的返回字段),走出厂 50:它只决定采集端每次拉多少行明细,不改采集范围。
|
||||
async function startPendingTask(item: CollectDataHistoryItem) {
|
||||
if (!item.taskId) return
|
||||
if (await dispatchCollectDataTask(item.taskId, {
|
||||
taskNo: item.taskNo, totalRows: item.totalRows ?? 0, filters: item.filters,
|
||||
})) await Promise.all([loadDashboard(), loadHistory()])
|
||||
}
|
||||
|
||||
function canStartTask(item: CollectDataHistoryItem | null | undefined): boolean {
|
||||
return Boolean(item?.taskId) && normalizeTaskStatus(item as CollectDataHistoryItem) === 'PENDING'
|
||||
&& !isStarting(item?.taskId as number)
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -624,7 +606,7 @@ async function loadHistory() {
|
||||
const s = (it.taskStatus || '').toUpperCase()
|
||||
return s === 'SUCCESS' || s === 'FAILED'
|
||||
})
|
||||
// 仅轮询已入 Python 队列的 RUNNING 任务;PENDING 任务等待用户主动推送。
|
||||
// 仅轮询已入 Python 队列的 RUNNING 任务;PENDING 单由提交即启动接手,启动失败时在历史行出「启动任务」。
|
||||
const seenTaskIds = new Set<number>()
|
||||
for (const item of running) {
|
||||
if (item.taskId) {
|
||||
|
||||
Reference in New Issue
Block a user