refactor(db)!: finalize pooled WNDB v2 migration

2026-08-27 17:26:22 +08:00
parent fa188af0b1
commit b74799a39d
105 changed files with 4988 additions and 5565 deletions
@@ -1,5 +1,6 @@
-from fastapi import APIRouter, Request, Query, Path, Body
-from typing import Any, List, Dict, Union
+from typing import Any
+
+from fastapi import APIRouter, Body, Query
 from app.services.tjnetwork import (
    ChangeSet,
    VALVES_TYPE_PRV,
@@ -18,7 +19,7 @@ router = APIRouter()
    summary="获取阀门架构",
    description="获取指定水网中所有阀门的架构和字段定义",
 )
-async def fastapi_get_valve_schema(
+def fastapi_get_valve_schema(
    network: str = Query(..., description="管网名称（或数据库名称）")
 ) -> dict[str, dict[str, Any]]:
    """
@@ -34,7 +35,7 @@ async def fastapi_get_valve_schema(
    summary="添加阀门",
    description="在指定的水网中添加新的阀门",
 )
-async def fastapi_add_valve(
+def fastapi_add_valve(
    network: str = Query(..., description="管网名称（或数据库名称）"),
    valve: str = Query(..., description="阀门ID"),
    node1: str = Query(..., description="起点节点ID"),
@@ -67,7 +68,7 @@ async def fastapi_add_valve(
    summary="删除阀门",
    description="从指定的水网中删除指定的阀门",
 )
-async def fastapi_delete_valve(
+def fastapi_delete_valve(
    network: str = Query(..., description="管网名称（或数据库名称）"),
    valve: str = Query(..., description="阀门ID"),
 ) -> ChangeSet:
@@ -84,7 +85,7 @@ async def fastapi_delete_valve(
    summary="获取阀门起点节点",
    description="获取指定阀门连接的起点节点ID",
 )
-async def fastapi_get_valve_node1(
+def fastapi_get_valve_node1(
    network: str = Query(..., description="管网名称（或数据库名称）"),
    valve: str = Query(..., description="阀门ID"),
 ) -> str | None:
@@ -101,7 +102,7 @@ async def fastapi_get_valve_node1(
    summary="获取阀门终点节点",
    description="获取指定阀门连接的终点节点ID",
 )
-async def fastapi_get_valve_node2(
+def fastapi_get_valve_node2(
    network: str = Query(..., description="管网名称（或数据库名称）"),
    valve: str = Query(..., description="阀门ID"),
 ) -> str | None:
@@ -118,7 +119,7 @@ async def fastapi_get_valve_node2(
    summary="获取阀门直径",
    description="获取指定阀门的直径",
 )
-async def fastapi_get_valve_diameter(
+def fastapi_get_valve_diameter(
    network: str = Query(..., description="管网名称（或数据库名称）"),
    valve: str = Query(..., description="阀门ID"),
 ) -> float | None:
@@ -135,7 +136,7 @@ async def fastapi_get_valve_diameter(
    summary="获取阀门类型",
    description="获取指定阀门的类型",
 )
-async def fastapi_get_valve_type(
+def fastapi_get_valve_type(
    network: str = Query(..., description="管网名称（或数据库名称）"),
    valve: str = Query(..., description="阀门ID"),
 ) -> str | None:
@@ -152,7 +153,7 @@ async def fastapi_get_valve_type(
    summary="获取阀门开度",
    description="获取指定阀门的开度/设置值",
 )
-async def fastapi_get_valve_setting(
+def fastapi_get_valve_setting(
    network: str = Query(..., description="管网名称（或数据库名称）"),
    valve: str = Query(..., description="阀门ID"),
 ) -> float | None:
@@ -169,7 +170,7 @@ async def fastapi_get_valve_setting(
    summary="获取阀门损失系数",
    description="获取指定阀门的损失系数",
 )
-async def fastapi_get_valve_minor_loss(
+def fastapi_get_valve_minor_loss(
    network: str = Query(..., description="管网名称（或数据库名称）"),
    valve: str = Query(..., description="阀门ID"),
 ) -> float | None:
@@ -187,7 +188,7 @@ async def fastapi_get_valve_minor_loss(
    summary="设置阀门起点节点",
    description="设置指定阀门的起点节点",
 )
-async def fastapi_set_valve_node1(
+def fastapi_set_valve_node1(
    network: str = Query(..., description="管网名称（或数据库名称）"),
    valve: str = Query(..., description="阀门ID"),
    node1: str = Query(..., description="新的起点节点ID"),
@@ -206,7 +207,7 @@ async def fastapi_set_valve_node1(
    summary="设置阀门终点节点",
    description="设置指定阀门的终点节点",
 )
-async def fastapi_set_valve_node2(
+def fastapi_set_valve_node2(
    network: str = Query(..., description="管网名称（或数据库名称）"),
    valve: str = Query(..., description="阀门ID"),
    node2: str = Query(..., description="新的终点节点ID"),
@@ -225,7 +226,7 @@ async def fastapi_set_valve_node2(
    summary="设置阀门直径",
    description="设置指定阀门的直径",
 )
-async def fastapi_set_valve_diameter(
+def fastapi_set_valve_diameter(
    network: str = Query(..., description="管网名称（或数据库名称）"),
    valve: str = Query(..., description="阀门ID"),
    diameter: float = Query(..., description="新的直径值（mm）"),
@@ -244,7 +245,7 @@ async def fastapi_set_valve_diameter(
    summary="设置阀门类型",
    description="设置指定阀门的类型",
 )
-async def fastapi_set_valve_type(
+def fastapi_set_valve_type(
    network: str = Query(..., description="管网名称（或数据库名称）"),
    valve: str = Query(..., description="阀门ID"),
    type: str = Query(..., description="新的阀门类型"),
@@ -263,7 +264,7 @@ async def fastapi_set_valve_type(
    summary="设置阀门开度",
    description="设置指定阀门的开度/设置值",
 )
-async def fastapi_set_valve_setting(
+def fastapi_set_valve_setting(
    network: str = Query(..., description="管网名称（或数据库名称）"),
    valve: str = Query(..., description="阀门ID"),
    setting: float = Query(..., description="新的开度值"),
@@ -281,7 +282,7 @@ async def fastapi_set_valve_setting(
    summary="获取阀门所有属性",
    description="获取指定阀门的所有属性",
 )
-async def fastapi_get_valve_properties(
+def fastapi_get_valve_properties(
    network: str = Query(..., description="管网名称（或数据库名称）"),
    valve: str = Query(..., description="阀门ID"),
 ) -> dict[str, Any]:
@@ -297,7 +298,7 @@ async def fastapi_get_valve_properties(
    summary="获取所有阀门属性",
    description="获取指定水网中所有阀门的属性",
 )
-async def fastapi_get_all_valve_properties(
+def fastapi_get_all_valve_properties(
    network: str = Query(..., description="管网名称（或数据库名称）")
 ) -> list[dict[str, Any]]:
    """
@@ -315,16 +316,16 @@ async def fastapi_get_all_valve_properties(
    summary="批量设置阀门属性",
    description="批量设置指定阀门的多个属性",
 )
-async def fastapi_set_valve_properties(
+def fastapi_set_valve_properties(
    network: str = Query(..., description="管网名称（或数据库名称）"),
    valve: str = Query(..., description="阀门ID"),
-    req: Request = None,
+    payload: dict[str, Any] = Body(...),
 ) -> ChangeSet:
    """
    批量设置阀门的属性。
    
    更新指定阀门的一个或多个属性，通过JSON请求体传递要更新的属性。
    """
-    props = await req.json()
+    props = payload
    ps = {"id": valve} | props
    return set_valve(network, ChangeSet(ps))