feat: 采集任务状态跟踪 ingest_jobs
新增 ingest_jobs 表(UUID/task/params/status/result/error/时间戳),
POST /ingest/bzzoiro 启动前插入 job(pending)→ 后台 running → success/failed,
响应新增 job_id(兼容原 message)。
Admin GET /admin/ingest/jobs/{id} 与 /admin/ingest/jobs?limit= 只读查询;
Collection 页提交后轮询 job 至终态,展示真实 result/error 汇总。
迁移 0019_ingest_jobs + 分批 get_uow/BzzoiroSource/IngestFailure 不变。
全量测试 270 通过。
This commit is contained in:
@@ -11,9 +11,9 @@
|
||||
*/
|
||||
|
||||
import { useEffect, useState, useCallback, useRef } from 'react'
|
||||
import { triggerCollection, fetchLeagues, fetchIngestStatus } from '../dal'
|
||||
import type { IngestSourceStatus } from '../types'
|
||||
import type { CollectionRequest, League } from '../types'
|
||||
import { triggerCollection, fetchLeagues, fetchIngestJob } from '../dal'
|
||||
import type { IngestJob, League } from '../types'
|
||||
import type { CollectionRequest } from '../types'
|
||||
import { Card, CardBody, CardHeader, Badge, SectionHeader, Alert, Spinner } from '../components'
|
||||
|
||||
const TASKS = [
|
||||
@@ -23,7 +23,9 @@ const TASKS = [
|
||||
{ value: 'all', label: '全量采集', desc: '依次采集比赛 + 积分榜 + 统计回填', icon: '⏵⏵' },
|
||||
] as const
|
||||
|
||||
type TaskStatus = 'idle' | 'running' | 'done' | 'error'
|
||||
type TaskUIStatus = 'idle' | 'running' | 'done' | 'error'
|
||||
|
||||
const TERMINAL_STATUSES: ReadonlySet<string> = new Set(['success', 'failed'])
|
||||
|
||||
export default function CollectionPage() {
|
||||
const [leagues, setLeagues] = useState<League[]>([])
|
||||
@@ -49,13 +51,13 @@ export default function CollectionPage() {
|
||||
const [limit, setLimit] = useState(100)
|
||||
const [loading, setLoading] = useState(false)
|
||||
const [error, setError] = useState<string | null>(null)
|
||||
const [result, setResult] = useState<{ title: string; detail: string } | null>(null)
|
||||
|
||||
// 任务进度反馈
|
||||
const [taskStatus, setTaskStatus] = useState<TaskStatus>('idle')
|
||||
// 任务进度反馈:跟踪真实 ingest_job 状态
|
||||
const [taskStatus, setTaskStatus] = useState<TaskUIStatus>('idle')
|
||||
const [jobId, setJobId] = useState<string | null>(null)
|
||||
const [jobInfo, setJobInfo] = useState<IngestJob | null>(null)
|
||||
const [taskStartedAt, setTaskStartedAt] = useState<number | null>(null)
|
||||
const pollRef = useRef<ReturnType<typeof setInterval> | null>(null)
|
||||
const [ingestSnap, setIngestSnap] = useState<IngestSourceStatus | null>(null)
|
||||
|
||||
const loadLeagues = useCallback(async () => {
|
||||
const lg = await fetchLeagues()
|
||||
@@ -64,30 +66,65 @@ export default function CollectionPage() {
|
||||
|
||||
useEffect(() => { loadLeagues() }, [loadLeagues])
|
||||
|
||||
// 轮询采集状态(任务启动后)
|
||||
const startPolling = useCallback(() => {
|
||||
if (pollRef.current) clearInterval(pollRef.current)
|
||||
pollRef.current = setInterval(async () => {
|
||||
try {
|
||||
const { sources } = await fetchIngestStatus()
|
||||
const bz = sources.find(s => s.name === 'bzzoiro')
|
||||
if (bz) setIngestSnap(bz)
|
||||
} catch { /* ignore */ }
|
||||
}, 5_000)
|
||||
}, [])
|
||||
|
||||
// 轮询采集 job 直到终态(success/failed)
|
||||
const stopPolling = useCallback(() => {
|
||||
if (pollRef.current) { clearInterval(pollRef.current); pollRef.current = null }
|
||||
}, [])
|
||||
|
||||
useEffect(() => () => stopPolling(), [stopPolling])
|
||||
|
||||
const startJobPolling = useCallback((id: string) => {
|
||||
stopPolling()
|
||||
const tick = async () => {
|
||||
try {
|
||||
const job = await fetchIngestJob(id)
|
||||
setJobInfo(job)
|
||||
if (TERMINAL_STATUSES.has(job.status)) {
|
||||
setTaskStatus(job.status === 'success' ? 'done' : 'error')
|
||||
stopPolling()
|
||||
}
|
||||
} catch { /* 单次轮询失败不影响后续 */ }
|
||||
}
|
||||
tick()
|
||||
pollRef.current = setInterval(tick, 3_000)
|
||||
}, [stopPolling])
|
||||
|
||||
const isEventsTask = task === 'events' || task === 'all'
|
||||
|
||||
// 友好汇总 job.result
|
||||
const jobSummary = (j: IngestJob | null): { title: string; detail: string } | null => {
|
||||
if (!j) return null
|
||||
if (j.status === 'failed') {
|
||||
return { title: '采集失败', detail: j.error || '采集任务异常终止,请到「系统日志」查看详细堆栈。' }
|
||||
}
|
||||
if (j.status !== 'success') return null
|
||||
const r = j.result as Record<string, unknown> | null
|
||||
if (!r) return { title: '采集完成', detail: '任务成功(无汇总数据)。' }
|
||||
const ev = r.events as Record<string, unknown> | undefined
|
||||
const evTotal = ev ? (ev.total_inserted as number ?? 0) + (ev.total_updated as number ?? 0) : 0
|
||||
const st = r.standings as Record<string, unknown> | undefined
|
||||
const stTotal = st ? (st.total_upserted as number ?? 0) : 0
|
||||
const stats = r.stats as Record<string, unknown> | undefined
|
||||
const statsTotal = stats ? (stats.created as number ?? 0) + (stats.updated as number ?? 0) : 0
|
||||
const evErr = (ev?.errors as string[] | undefined)?.length ?? 0
|
||||
const stErr = (st?.errors as string[] | undefined)?.length ?? 0
|
||||
const statsErr = (stats?.errors as string[] | undefined)?.length ?? 0
|
||||
const totalErr = evErr + stErr + statsErr
|
||||
const parts: string[] = []
|
||||
if (ev) parts.push(`比赛 +${evTotal}`)
|
||||
if (st) parts.push(`积分榜 +${stTotal}`)
|
||||
if (stats) parts.push(`统计 +${statsTotal}`)
|
||||
const detail = parts.length
|
||||
? `共更新: ${parts.join(' / ')}${totalErr ? `,错误 ${totalErr} 条(见日志)` : ''}`
|
||||
: '任务成功'
|
||||
return { title: '采集完成', detail }
|
||||
}
|
||||
|
||||
async function handleSubmit(e: React.FormEvent) {
|
||||
e.preventDefault()
|
||||
setError(null)
|
||||
setResult(null)
|
||||
setJobInfo(null)
|
||||
setJobId(null)
|
||||
setLoading(true)
|
||||
setTaskStatus('running')
|
||||
setTaskStartedAt(Date.now())
|
||||
@@ -103,18 +140,15 @@ export default function CollectionPage() {
|
||||
date_from: isEventsTask ? dateFrom || undefined : undefined,
|
||||
date_to: isEventsTask ? dateTo || undefined : undefined,
|
||||
}
|
||||
await triggerCollection(body)
|
||||
setResult({
|
||||
title: '采集任务已启动',
|
||||
detail: '正在后台执行(上游限速时可能需要数分钟)。完成结果与错误请到「系统日志」页查看(支持自动刷新)。',
|
||||
})
|
||||
// 启动轮询,跟踪状态
|
||||
startPolling()
|
||||
// 30 秒后自动停止轮询并标记完成
|
||||
setTimeout(() => {
|
||||
setTaskStatus('done')
|
||||
stopPolling()
|
||||
}, 30_000)
|
||||
const res = await triggerCollection(body)
|
||||
const id: string | undefined = res?.job_id
|
||||
if (id) {
|
||||
setJobId(id)
|
||||
startJobPolling(id)
|
||||
} else {
|
||||
// 后端未返回 job_id(旧版兼容):退化为原逻辑
|
||||
setTimeout(() => { setTaskStatus('done'); }, 30_000)
|
||||
}
|
||||
} catch (err: unknown) {
|
||||
setTaskStatus('error')
|
||||
setError(err instanceof Error ? err.message : '采集触发失败')
|
||||
@@ -125,6 +159,7 @@ export default function CollectionPage() {
|
||||
}
|
||||
|
||||
const elapsed = taskStartedAt ? Math.round((Date.now() - taskStartedAt) / 1000) : 0
|
||||
const summary = jobInfo ? jobSummary(jobInfo) : null
|
||||
|
||||
return (
|
||||
<div className="space-y-6">
|
||||
@@ -248,12 +283,11 @@ export default function CollectionPage() {
|
||||
|
||||
{/* 消息提示 */}
|
||||
{error && <Alert kind="error" title="采集失败" message={error} onClose={() => setError(null)} />}
|
||||
{result && (
|
||||
{summary && (
|
||||
<Alert
|
||||
kind="ok"
|
||||
title={result.title}
|
||||
message={result.detail || undefined}
|
||||
onClose={() => setResult(null)}
|
||||
kind={jobInfo?.status === 'success' ? 'ok' : 'error'}
|
||||
title={summary.title}
|
||||
message={summary.detail}
|
||||
/>
|
||||
)}
|
||||
|
||||
@@ -278,10 +312,10 @@ export default function CollectionPage() {
|
||||
<div className="space-y-3">
|
||||
<div className="flex items-center gap-2 text-xs text-ink-700">
|
||||
<Spinner />
|
||||
<span>任务执行中,已运行 {elapsed}s…</span>
|
||||
<span>任务执行中{jobId ? `(job ${jobId.slice(0, 8)}…)` : ''},已运行 {elapsed}s…</span>
|
||||
</div>
|
||||
<p className="text-2xs text-ink-400">
|
||||
后台异步执行,关闭页面不影响结果。可稍后查看「系统日志」确认完成。
|
||||
后台异步执行,关闭页面不影响结果。每 3 秒自动轮询进度。
|
||||
</p>
|
||||
</div>
|
||||
)}
|
||||
@@ -289,23 +323,25 @@ export default function CollectionPage() {
|
||||
<div className="space-y-2">
|
||||
<div className="flex items-center gap-2 text-xs text-emerald-700">
|
||||
<span className="inline-block h-2 w-2 rounded-full bg-emerald-500" />
|
||||
<span>任务已提交,后台执行中(可能尚未完成)</span>
|
||||
<span>采集完成{jobId ? `(job ${jobId.slice(0, 8)}…)` : ''}</span>
|
||||
</div>
|
||||
<p className="text-2xs text-ink-400">
|
||||
采集耗时取决于数据量。请到「系统日志」页查看最终结果。
|
||||
</p>
|
||||
{summary && <p className="text-2xs text-ink-500">{summary.detail}</p>}
|
||||
</div>
|
||||
)}
|
||||
{taskStatus === 'error' && (
|
||||
<p className="text-xs text-press">任务触发失败,请检查配置或网络。</p>
|
||||
)}
|
||||
{ingestSnap?.last_success_at && (
|
||||
<div className="mt-3 border-t border-ink-100 pt-3">
|
||||
<p className="text-2xs text-ink-400">
|
||||
bzzoiro 最近一次采集: {new Date(ingestSnap.last_success_at).toLocaleString('zh-CN', { hour12: false })}
|
||||
</p>
|
||||
<div className="space-y-1">
|
||||
<p className="text-xs text-press">采集失败{jobId ? `(job ${jobId.slice(0, 8)}…)` : ''}</p>
|
||||
{jobInfo?.error && (
|
||||
<p className="text-2xs text-ink-500">{jobInfo.error.slice(0, 200)}</p>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
{jobInfo?.created_at && (
|
||||
<p className="mt-2 text-2xs text-ink-400">
|
||||
创建于 {new Date(jobInfo.created_at).toLocaleString('zh-CN', { hour12: false })}
|
||||
{jobInfo.finished_at && ` · 完成于 ${new Date(jobInfo.finished_at).toLocaleString('zh-CN', { hour12: false })}`}
|
||||
</p>
|
||||
)}
|
||||
</CardBody>
|
||||
</Card>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user