From 1846250acfb0dff207bd2fc6a665438e42365153 Mon Sep 17 00:00:00 2001 From: "mula.liu" Date: Thu, 8 Oct 2026 07:46:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E8=A7=82=E9=A2=84=E7=BD=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E6=8C=89=20code=20=E7=8B=AC=E7=AB=8B=E7=99=BB?= =?UTF-8?q?=E8=AE=B0=EF=BC=8C=E8=A1=A5=E9=BD=90=E8=81=94=E7=9B=9F2?= =?UTF-8?q?=E4=B8=8E=E9=98=BF=E4=B8=BD=E4=BA=9A=E5=A8=9C6=E6=9E=84?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 外观构型从型号定义里拆出为 ROCKET_APPEARANCES,用户手工登记的型号也能覆盖 - 联盟2:4 个侧级各 1 台、直径比 0.75;阿丽亚娜6(A62):2 个 P120 各 1 台、直径比 0.56 - 猎鹰9、长征五号仍留空走启发式(推断结果本就正确) --- backend/app/services/rocket_preset_service.py | 99 +++++++++++-------- 1 file changed, 56 insertions(+), 43 deletions(-) diff --git a/backend/app/services/rocket_preset_service.py b/backend/app/services/rocket_preset_service.py index 00c35a9..580f37c 100644 --- a/backend/app/services/rocket_preset_service.py +++ b/backend/app/services/rocket_preset_service.py @@ -57,11 +57,6 @@ HIGH_FREQUENCY_ROCKETS: list[dict[str, Any]] = [ "engine_count": 6, "length_ratio": 0.42, }, - "appearance": { - "booster_count": 0, - "grid_fins": True, - "fairing": False, - }, }, { "code": "electron", @@ -101,10 +96,6 @@ HIGH_FREQUENCY_ROCKETS: list[dict[str, Any]] = [ "engine_count": 1, "length_ratio": 0.34, }, - "appearance": { - "booster_count": 0, - "grid_fins": False, - }, }, { "code": "long-march-2f", @@ -144,12 +135,6 @@ HIGH_FREQUENCY_ROCKETS: list[dict[str, Any]] = [ "engine_count": 1, "length_ratio": 0.4, }, - "appearance": { - "booster_count": 4, - "engines_per_booster": 1, - "booster_diameter_ratio": 0.67, - "grid_fins": False, - }, }, { "code": "long-march-7", @@ -189,12 +174,6 @@ HIGH_FREQUENCY_ROCKETS: list[dict[str, Any]] = [ "engine_count": 2, "length_ratio": 0.38, }, - "appearance": { - "booster_count": 4, - "engines_per_booster": 2, - "booster_diameter_ratio": 0.67, - "grid_fins": False, - }, }, { "code": "long-march-6a", @@ -234,12 +213,6 @@ HIGH_FREQUENCY_ROCKETS: list[dict[str, Any]] = [ "engine_count": 2, "length_ratio": 0.4, }, - "appearance": { - "booster_count": 4, - "engines_per_booster": 2, - "booster_diameter_ratio": 0.79, - "grid_fins": False, - }, }, { "code": "long-march-8", @@ -279,12 +252,6 @@ HIGH_FREQUENCY_ROCKETS: list[dict[str, Any]] = [ "engine_count": 2, "length_ratio": 0.4, }, - "appearance": { - "booster_count": 2, - "engines_per_booster": 2, - "booster_diameter_ratio": 0.67, - "grid_fins": False, - }, }, { "code": "falcon-heavy", @@ -324,23 +291,69 @@ HIGH_FREQUENCY_ROCKETS: list[dict[str, Any]] = [ "engine_count": 1, "length_ratio": 0.35, }, - "appearance": { - "booster_count": 2, - "engines_per_booster": 9, - "booster_diameter_ratio": 1.0, - "grid_fins": True, - }, }, ] -async def ensure_rocket_appearance(db: AsyncSession) -> list[str]: - """为已存在的预置型号补写外观构型。 +# 外观构型预置:按 code 登记,与型号参数定义分开,因此用户手工登记的型号 +# (联盟 2、阿丽亚娜 6)也能在这里补齐构型。仅在库里 appearance 仍为空时写入, +# 管理端填过的值不会被动。联盟 2 = 4 个侧级各 1 台 + 芯级 1 台; +# 阿丽亚娜 6(A62)= 2 个 P120 固体助推各 1 台 + 芯级 2 台。 +ROCKET_APPEARANCES: dict[str, dict[str, Any]] = { + "starship": {"booster_count": 0, "grid_fins": True, "fairing": False}, + "electron": {"booster_count": 0, "grid_fins": False}, + "falcon-heavy": { + "booster_count": 2, + "engines_per_booster": 9, + "booster_diameter_ratio": 1.0, + "grid_fins": True, + }, + "long-march-2f": { + "booster_count": 4, + "engines_per_booster": 1, + "booster_diameter_ratio": 0.67, + "grid_fins": False, + }, + "long-march-7": { + "booster_count": 4, + "engines_per_booster": 2, + "booster_diameter_ratio": 0.67, + "grid_fins": False, + }, + "long-march-6a": { + "booster_count": 4, + "engines_per_booster": 2, + "booster_diameter_ratio": 0.79, + "grid_fins": False, + }, + "long-march-8": { + "booster_count": 2, + "engines_per_booster": 2, + "booster_diameter_ratio": 0.67, + "grid_fins": False, + }, + "soyuz-2": { + "booster_count": 4, + "engines_per_booster": 1, + "booster_diameter_ratio": 0.75, + "grid_fins": False, + }, + "ariane-6": { + "booster_count": 2, + "engines_per_booster": 1, + "booster_diameter_ratio": 0.56, + "grid_fins": False, + }, +} - 预置逻辑只补插缺失的型号,早已入库的型号不会带上 appearance,因此这里做一次 + +async def ensure_rocket_appearance(db: AsyncSession) -> list[str]: + """按 ROCKET_APPEARANCES 补写外观构型。 + + 型号预置只补插缺失的型号,早已入库的型号不会带上 appearance,因此这里做一次 幂等回填:仅处理库里 appearance 仍为空的行,管理端填过的值一律不动。 """ - presets = {p["code"]: p["appearance"] for p in HIGH_FREQUENCY_ROCKETS if p.get("appearance")} + presets = ROCKET_APPEARANCES # 部署时 up -d 早于 upgrade_db.py,列可能还没加上;这里跳过而不是让服务起不来 column = await db.execute( text("SELECT 1 FROM information_schema.columns "