From 700f74c4a1e7809b3ead3690271f1bd4933576ea Mon Sep 17 00:00:00 2001 From: "mula.liu" Date: Fri, 9 Oct 2026 17:39:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=81=AB=E7=AE=AD=E5=8F=91?= =?UTF-8?q?=E5=B0=84=E6=A8=A1=E6=8B=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/api/rocket_event.py | 1 + backend/app/jobs/predefined.py | 23 +-- backend/app/services/rocket_event_service.py | 45 ++++- frontend/src/components/admin/DataTable.tsx | 13 +- frontend/src/pages/admin/RocketEvents.tsx | 201 +++++++++++++++---- 5 files changed, 212 insertions(+), 71 deletions(-) diff --git a/backend/app/api/rocket_event.py b/backend/app/api/rocket_event.py index 7b5947c..cb995f4 100644 --- a/backend/app/api/rocket_event.py +++ b/backend/app/api/rocket_event.py @@ -82,6 +82,7 @@ async def list_rocket_events( keyword = f"%{search.strip()}%" filters.append( RocketEvent.name.ilike(keyword) + | RocketEvent.mission_name.ilike(keyword) | RocketEvent.rocket_name.ilike(keyword) | RocketEvent.location_name.ilike(keyword) ) diff --git a/backend/app/jobs/predefined.py b/backend/app/jobs/predefined.py index 068426a..4b6d309 100644 --- a/backend/app/jobs/predefined.py +++ b/backend/app/jobs/predefined.py @@ -638,24 +638,10 @@ async def calculate_planetary_events( description="从 The Space Devs Launch Library 2 获取全球火箭发射排期与结果,写入 rocket_events 并关联本地火箭型号", category="data_sync", parameters=[ - { - "name": "max_pages", - "type": "integer", - "description": "最多翻几页(每页按发射时间升序,1 页约等于 1~2 个月的排期)", - "required": False, - "default": 2 - }, - { - "name": "page_size", - "type": "integer", - "description": "每页条数,数据源上限 100", - "required": False, - "default": 100 - }, { "name": "days_ahead", "type": "integer", - "description": "只保留发射时间在 N 天之内的记录", + "description": "保留发射时间在 N 天之内的记录;抓取会自动翻页到覆盖这个时间范围,无需再配页数与每页条数", "required": False, "default": 90 } @@ -667,15 +653,12 @@ async def sync_rocket_launch_events( params: Dict[str, Any] ) -> Dict[str, Any]: """Sync global rocket launch events and link them to rocket_configs.""" - max_pages = int(params.get("max_pages", 2)) - page_size = int(params.get("page_size", 100)) days_ahead = int(params.get("days_ahead", 90)) - logger.info(f"Starting rocket launch event sync: max_pages={max_pages}, " - f"page_size={page_size}, days_ahead={days_ahead}") + logger.info(f"Starting rocket launch event sync: days_ahead={days_ahead}") try: return await rocket_event_service.sync_launch_events( - db, max_pages=max_pages, page_size=page_size, days_ahead=days_ahead, log=logger + db, days_ahead=days_ahead, log=logger ) except rocket_event_service.LaunchSourceThrottled as e: logger.warning(f"Rocket launch event sync throttled: {e}") diff --git a/backend/app/services/rocket_event_service.py b/backend/app/services/rocket_event_service.py index 40c9748..c1ca968 100644 --- a/backend/app/services/rocket_event_service.py +++ b/backend/app/services/rocket_event_service.py @@ -31,6 +31,11 @@ USER_AGENT = "cosmo-backend/1.0 (+https://cosmo.unisspace.com)" DEFAULT_CRON = "20 */6 * * *" # 每 6 小时一次 DEFAULT_JOB_NAME = "同步全球火箭发射事件" +# 抓取的分页是数据源的传输细节,不暴露给定时任务:只按「提前天数」自动翻页, +# 这两个常量是内部实现(PAGE_SIZE 取数据源上限,MAX_PAGES 兜底防止停不下来)。 +PAGE_SIZE = 100 +MAX_PAGES = 10 + # 数据源型号名(小写、空格分隔)→ 本地 rocket_configs.code。 # 源里同一型号有大量变体(Falcon 9 Block 5 / Long March 5B / Soyuz 2.1b ...), # 先试完整型号名,再退化到主干名,最后靠 code/name 直接匹配。 @@ -189,8 +194,13 @@ async def _get_page(client: httpx.AsyncClient, base: str, params: dict) -> dict: return response.json() -async def fetch_launches(max_pages: int, page_size: int) -> list[dict]: - """拉取未来排期(含刚飞完的),按发射时间升序。""" +async def fetch_launches( + until: datetime, + *, + page_size: int = PAGE_SIZE, + max_pages: int = MAX_PAGES, +) -> list[dict]: + """拉取排期(含刚飞完的),按发射时间升序,翻到覆盖 until 为止。""" headers = {"User-Agent": USER_AGENT, "accept": "application/json"} if settings.launch_library_token: headers["Authorization"] = f"Token {settings.launch_library_token}" @@ -211,6 +221,14 @@ async def fetch_launches(max_pages: int, page_size: int) -> list[dict]: items.extend(results) if len(results) < page_size or not payload.get("next"): break + # 源按发射时间升序返回:本页最后一条已经晚于时间窗,再翻页只是白翻 + last_net = None + for record in reversed(results): + last_net = _parse_net(record.get("net")) + if last_net: + break + if last_net and last_net > until: + break await asyncio.sleep(1.5) # 别连续压同一个匿名 IP return items @@ -218,16 +236,18 @@ async def fetch_launches(max_pages: int, page_size: int) -> list[dict]: async def sync_launch_events( db: AsyncSession, *, - max_pages: int = 2, - page_size: int = 100, days_ahead: int = 90, log: logging.Logger | None = None, ) -> dict[str, Any]: - """同步发射事件并按型号关联 rocket_configs,返回本次统计。""" + """同步发射事件并按型号关联 rocket_configs,返回本次统计。 + + 重复抓取不会产生重复记录:写入走 (source, source_id) 的 ON CONFLICT DO UPDATE, + 同一次发射只会更新原有那一行(状态、NET、型号关联随之刷新)。 + """ log = log or logger horizon = datetime.now(timezone.utc).replace(tzinfo=None) + timedelta(days=days_ahead) - items = await fetch_launches(min(max_pages, 5), min(page_size, 100)) + items = await fetch_launches(horizon) lookup = await build_rocket_lookup(db) rows = [] @@ -285,17 +305,22 @@ async def sync_launch_events( async def ensure_launch_event_job(db: AsyncSession) -> bool: """保证默认同步任务存在;已存在则不动管理端改过的频率与参数。""" - existing = (await db.execute( - select(ScheduledJob.id).where(ScheduledJob.predefined_function == "sync_rocket_launch_events") + job = (await db.execute( + select(ScheduledJob).where(ScheduledJob.predefined_function == "sync_rocket_launch_events") )).scalar_one_or_none() - if existing: + if job: + # 抓取页数改成按「提前天数」自动翻页之后,旧的页数参数已作废,清掉免得误导 + stale = [key for key in ("max_pages", "page_size") if key in (job.function_params or {})] + if stale: + job.function_params = {k: v for k, v in job.function_params.items() if k not in stale} + logger.info("已清理定时任务「%s」的作废参数:%s", job.name, ", ".join(stale)) return False db.add(ScheduledJob( name=DEFAULT_JOB_NAME, job_type=JobType.PREDEFINED, predefined_function="sync_rocket_launch_events", - function_params={"max_pages": 2, "page_size": 100, "days_ahead": 90}, + function_params={"days_ahead": 90}, cron_expression=DEFAULT_CRON, is_active=True, description="从 The Space Devs Launch Library 2 获取全球火箭发射排期与结果,并关联本地火箭型号", diff --git a/frontend/src/components/admin/DataTable.tsx b/frontend/src/components/admin/DataTable.tsx index 6966351..e3498b6 100644 --- a/frontend/src/components/admin/DataTable.tsx +++ b/frontend/src/components/admin/DataTable.tsx @@ -42,6 +42,13 @@ interface DataTableProps { /** 工具栏中、搜索框右侧的额外控件 */ toolbar?: ReactNode; scroll?: TableProps['scroll']; + /** + * antd Table 的 onChange(排序 / 列筛选)。 + * + * 服务端分页的列表要按列筛选时,客户端 onFilter 只能过滤当前页, + * 所以列上只声明 filters + filteredValue,由页面拿这里的 filteredInfo 去请求后端。 + */ + onTableChange?: TableProps['onChange']; } export function DataTable({ @@ -71,6 +78,7 @@ export function DataTable({ customActions, toolbar, scroll = { x: 'max-content' }, + onTableChange, }: DataTableProps) { const { t } = useAdminPrefs(); // 分页大小由外部(系统参数 page_size)驱动,同时允许用户在分页器里临时调整 @@ -97,9 +105,7 @@ export function DataTable({ dataIndex: statusField as string, key: 'status', width: 100, - // 和右侧固定的「操作」列钉在一起:列多的表(火箭管理)横向要滚动, - // 不固定的话启用/停用开关会被滚出可视区,看起来像这个列表没有状态列 - fixed: 'right', + // 状态开关是列表的一列,跟着表格一起横向滚动,不钉进右侧固定的操作区 render: (value: boolean, record: T) => ( onStatusChange(record, checked)} size="small" /> @@ -192,6 +198,7 @@ export function DataTable({ dataSource={dataSource} loading={loading} rowKey={rowKey} + onChange={onTableChange} locale={{ emptyText: ( ('upcoming'); const [search, setSearch] = useState(''); const [stats, setStats] = useState(null); + const [rocketCode, setRocketCode] = useState(null); + const [rocketFilters, setRocketFilters] = useState<{ text: string; value: string }[]>([]); + const [detail, setDetail] = useState(null); const toast = useToast(); + // 系统参数加载完成后同步分页大小 + useEffect(() => { + setPageSize(systemPageSize); + setPage(1); + }, [systemPageSize]); + + // 型号筛选只列启用的型号(/rockets 返回的就是 is_active 的型号,按排序号排列) + useEffect(() => { + void (async () => { + try { + const { data } = await request.get('/rockets'); + setRocketFilters((data as RocketConfig[]).map((item) => ({ + text: item.name_zh || item.name, + value: item.code, + }))); + } catch { + // 筛选项拉不到不影响浏览列表,保持空筛选即可 + } + })(); + }, []); + + /** 型号详情留在本页展示;走管理端接口,停用的型号也查得到 */ + const openRocketDetail = useCallback(async (code: string) => { + try { + const { data } = await request.get('/rockets/admin', { params: { search: code, limit: 100 } }); + const match: RocketConfig | undefined = data.rockets.find((item: RocketConfig) => item.code === code); + if (match) setDetail(match); + else toast.error(`未找到火箭型号 ${code}`); + } catch { + toast.error('加载火箭型号信息失败'); + } + }, [toast]); + const load = useCallback(async () => { setLoading(true); try { const params = { - limit: systemPageSize, - offset: (page - 1) * systemPageSize, + limit: pageSize, + offset: (page - 1) * pageSize, upcoming: range === 'all' ? undefined : range === 'upcoming', search: search.trim() || undefined, + rocket_code: rocketCode || undefined, }; const [{ data: pageData }, { data: statsData }] = await Promise.all([ request.get('/rocket-events', { params }), @@ -85,39 +126,60 @@ export function RocketEvents() { } finally { setLoading(false); } - }, [page, range, search, systemPageSize, toast]); + }, [page, range, search, rocketCode, pageSize, toast]); useEffect(() => { void load(); }, [load]); const columns: ColumnsType = [ + { title: 'ID', dataIndex: 'id', width: 70 }, { title: '发射时间', dataIndex: 'net', - width: 130, - render: (value: string) => formatNet(value), + width: 160, + render: (value: string) => formatDateTime(value), }, { title: '任务', dataIndex: 'mission_name', - width: 240, - ellipsis: true, - render: (value: string | null, record) => value || record.name, + width: 260, + render: (value: string | null, record) => ( +
+
{value || record.name}
+ {value ?
{record.name}
: null} +
+ ), }, { title: '型号', dataIndex: 'rocket_name', - width: 200, - ellipsis: true, - render: (value: string | null, record) => ( - - {value || '-'}{record.rocket ? 已关联 : null} - - ), + key: 'rocket_name', + width: 220, + // 筛选交给后端(rocket_code 参数):这页是服务端分页,客户端 onFilter 只会排当前页。 + // 副行保留数据源登记的变体名(Falcon 9 Block 5 之类),信息不丢 + filters: rocketFilters, + filterMultiple: false, + filteredValue: rocketCode ? [rocketCode] : null, + render: (value: string | null, record) => { + const rocket = record.rocket; + if (!rocket) return value || '-'; + return ( +
+ + void openRocketDetail(rocket.code)}> + {rocket.name_zh || rocket.name} + + + {value && value !== (rocket.name_zh || rocket.name) ? ( +
{value}
+ ) : null} +
+ ); + }, }, { title: '发射服务商', dataIndex: 'provider', - width: 130, + width: 160, render: (value: string | null) => value || '-', }, { @@ -131,11 +193,11 @@ export function RocketEvents() { title: '发射场', dataIndex: 'launch_site_name', width: 220, - ellipsis: true, render: (value: string | null, record) => ( - - {value || record.location_name || '-'} - +
+
{value || '-'}
+ {record.location_name ?
{record.location_name}
: null} +
), }, { @@ -144,16 +206,6 @@ export function RocketEvents() { width: 150, render: (value: string) => {value || '-'}, }, - { - title: '详情', - dataIndex: 'source_url', - width: 90, - render: (value: string | null) => ( - value - ? Launch Library - : '-' - ), - }, ]; return ( @@ -165,7 +217,7 @@ export function RocketEvents() { <> - + } > @@ -175,8 +227,8 @@ export function RocketEvents() { loading={loading} total={total} currentPage={page} - pageSize={systemPageSize} - onPageChange={(next) => setPage(next)} + pageSize={pageSize} + onPageChange={(nextPage, nextSize) => { setPage(nextPage); setPageSize(nextSize); }} onRefresh={() => void load()} onSearch={(value) => { setSearch(value); setPage(1); }} searchPlaceholder="搜索任务名 / 型号 / 发射场" @@ -187,14 +239,87 @@ export function RocketEvents() { onChange={(value) => { setRange(value as RangeKey); setPage(1); }} /> } + onTableChange={(_, filters) => { + const next = (filters.rocket_name?.[0] as string | undefined) ?? null; + if (next === rocketCode) return; // 翻页也会触发 onChange,别把页码重置掉 + setRocketCode(next); + setPage(1); + }} rowKey="id" showAdd={false} showEdit={false} + customActions={(record) => record.source_url ? ( + + } + width={760} + destroyOnHidden + > + {detail ? : null} + ); } +const MN = (value: number) => `${(value / 1_000_000).toFixed(2)} MN`; + +/** 只读展示型号参数,口径与火箭数据管理的表单一致:一级只含芯级,助推器单列。 */ +function RocketDetail({ rocket }: { rocket: RocketConfig }) { + const core = rocket.stage_1; + const boosters = rocket.boosters; + return ( + + {rocket.code} + + {rocket.is_active ? '启用' : '停用'} + + {rocket.manufacturer || '-'} + {rocket.country || '-'} + {rocket.height_m} m × {rocket.diameter_m} m + {rocket.payload_mass_kg} kg + + {rocket.launch_site_name} · {rocket.launch_latitude_deg.toFixed(4)}, {rocket.launch_longitude_deg.toFixed(4)} + + + {core.engine_count} 台 · {MN(core.max_thrust_n)} · 比冲 {core.specific_impulse_s} s · + 干重 {core.dry_mass_kg} kg / 推进剂 {core.fuel_mass_kg} kg + {core.recoverable ? 可回收 : null} + + + {boosters ? ( + <> + {boosters.count} × {boosters.engine_count} 台 · 直径比 {boosters.diameter_ratio ?? 0.45} + {boosters.thrust_n + ? ` · 合计 ${MN(boosters.thrust_n)} · 比冲 ${boosters.specific_impulse_s} s` + : ' · 仅登记构型(不参与物理)'} + {boosters.recoverable ? 可回收 : null} + + ) : '无'} + + + {rocket.stage_2.engine_count} 台 · {MN(rocket.stage_2.max_thrust_n)} · 比冲 {rocket.stage_2.specific_impulse_s} s + + {rocket.target_orbit_km} km + {rocket.target_velocity_mps} m/s + + {rocket.appearance?.fairing === false ? '无(二级自带头锥)' : '有'} + + + {MN(rocket.stage_1.max_thrust_n + (boosters?.thrust_n ?? 0))} + + {rocket.description ? {rocket.description} : null} + + ); +} + function statusColor(status: string) { const lower = status.toLowerCase(); if (lower.includes('success')) return 'success';