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,
    delete_junction,
@@ -48,7 +49,7 @@ router = APIRouter()
    summary="检查节点有效性",
    description="检查指定ID是否为水网中的有效节点"
 )
-async def fastapi_is_node(
+def fastapi_is_node(
    network: str = Query(..., description="管网名称（或数据库名称）"),
    node: str = Query(..., description="节点ID")
 ) -> bool:
@@ -60,7 +61,7 @@ async def fastapi_is_node(
    summary="检查是否为接点",
    description="检查指定ID是否为水网中的接点(需求点)"
 )
-async def fastapi_is_junction(
+def fastapi_is_junction(
    network: str = Query(..., description="管网名称（或数据库名称）"),
    node: str = Query(..., description="节点ID")
 ) -> bool:
@@ -72,7 +73,7 @@ async def fastapi_is_junction(
    summary="检查是否为水源",
    description="检查指定ID是否为水网中的水源(水库/河流)"
 )
-async def fastapi_is_reservoir(
+def fastapi_is_reservoir(
    network: str = Query(..., description="管网名称（或数据库名称）"),
    node: str = Query(..., description="节点ID")
 ) -> bool:
@@ -84,7 +85,7 @@ async def fastapi_is_reservoir(
    summary="检查是否为蓄水池",
    description="检查指定ID是否为水网中的蓄水池"
 )
-async def fastapi_is_tank(
+def fastapi_is_tank(
    network: str = Query(..., description="管网名称（或数据库名称）"),
    node: str = Query(..., description="节点ID")
 ) -> bool:
@@ -96,7 +97,7 @@ async def fastapi_is_tank(
    summary="检查管线有效性",
    description="检查指定ID是否为水网中的有效管线"
 )
-async def fastapi_is_link(
+def fastapi_is_link(
    network: str = Query(..., description="管网名称（或数据库名称）"),
    link: str = Query(..., description="管线ID")
 ) -> bool:
@@ -108,7 +109,7 @@ async def fastapi_is_link(
    summary="检查是否为管道",
    description="检查指定ID是否为水网中的管道"
 )
-async def fastapi_is_pipe(
+def fastapi_is_pipe(
    network: str = Query(..., description="管网名称（或数据库名称）"),
    link: str = Query(..., description="管线ID")
 ) -> bool:
@@ -120,7 +121,7 @@ async def fastapi_is_pipe(
    summary="检查是否为泵",
    description="检查指定ID是否为水网中的泵"
 )
-async def fastapi_is_pump(
+def fastapi_is_pump(
    network: str = Query(..., description="管网名称（或数据库名称）"),
    link: str = Query(..., description="管线ID")
 ) -> bool:
@@ -132,7 +133,7 @@ async def fastapi_is_pump(
    summary="检查是否为阀门",
    description="检查指定ID是否为水网中的阀门"
 )
-async def fastapi_is_valve(
+def fastapi_is_valve(
    network: str = Query(..., description="管网名称（或数据库名称）"),
    link: str = Query(..., description="管线ID")
 ) -> bool:
@@ -144,7 +145,7 @@ async def fastapi_is_valve(
    summary="获取节点类型",
    description="获取指定节点的类型(接点/水源/蓄水池)"
 )
-async def fastapi_get_node_type(
+def fastapi_get_node_type(
    network: str = Query(..., description="管网名称（或数据库名称）"),
    node: str = Query(..., description="节点ID")
 ) -> str:
@@ -156,7 +157,7 @@ async def fastapi_get_node_type(
    summary="获取管线类型",
    description="获取指定管线的类型(管道/泵/阀门)"
 )
-async def fastapi_get_link_type(
+def fastapi_get_link_type(
    network: str = Query(..., description="管网名称（或数据库名称）"),
    link: str = Query(..., description="管线ID")
 ) -> str:
@@ -168,7 +169,7 @@ async def fastapi_get_link_type(
    summary="获取元素类型",
    description="获取指定元素的类型(节点或管线)"
 )
-async def fastapi_get_element_type(
+def fastapi_get_element_type(
    network: str = Query(..., description="管网名称（或数据库名称）"),
    element: str = Query(..., description="元素ID")
 ) -> str:
@@ -180,7 +181,7 @@ async def fastapi_get_element_type(
    summary="获取元素类型值",
    description="获取指定元素的类型数值标识"
 )
-async def fastapi_get_element_type_value(
+def fastapi_get_element_type_value(
    network: str = Query(..., description="管网名称（或数据库名称）"),
    element: str = Query(..., description="元素ID")
 ) -> int:
@@ -192,7 +193,7 @@ async def fastapi_get_element_type_value(
    summary="获取所有节点",
    description="获取指定水网中的所有节点ID列表"
 )
-async def fastapi_get_nodes(network: str = Query(..., description="管网名称（或数据库名称）")) -> list[str]:
+def fastapi_get_nodes(network: str = Query(..., description="管网名称（或数据库名称）")) -> list[str]:
    """获取水网中所有节点的ID列表。"""
    return get_nodes(network)

@@ -201,7 +202,7 @@ async def fastapi_get_nodes(network: str = Query(..., description="管网名称
    summary="获取所有管线",
    description="获取指定水网中的所有管线ID列表"
 )
-async def fastapi_get_links(network: str = Query(..., description="管网名称（或数据库名称）")) -> list[str]:
+def fastapi_get_links(network: str = Query(..., description="管网名称（或数据库名称）")) -> list[str]:
    """获取水网中所有管线的ID列表。"""
    return get_links(network)

@@ -226,7 +227,7 @@ def get_node_links_endpoint(
    summary="获取节点属性",
    description="获取指定节点的所有属性信息"
 )
-async def fast_get_node_properties(
+def fast_get_node_properties(
    network: str = Query(..., description="管网名称（或数据库名称）"),
    node: str = Query(..., description="节点ID")
 ) -> dict[str, Any]:
@@ -238,7 +239,7 @@ async def fast_get_node_properties(
    summary="获取管线属性",
    description="获取指定管线的所有属性信息"
 )
-async def fast_get_link_properties(
+def fast_get_link_properties(
    network: str = Query(..., description="管网名称（或数据库名称）"),
    link: str = Query(..., description="管线ID")
 ) -> dict[str, Any]:
@@ -250,7 +251,7 @@ async def fast_get_link_properties(
    summary="获取SCADA点属性",
    description="获取指定SCADA点的属性信息"
 )
-async def fast_get_scada_properties(
+def fast_get_scada_properties(
    network: str = Query(..., description="管网名称（或数据库名称）"),
    scada: str = Query(..., description="SCADA点ID")
 ) -> dict[str, Any]:
@@ -262,7 +263,7 @@ async def fast_get_scada_properties(
    summary="获取所有SCADA点属性",
    description="获取指定水网中所有SCADA点的属性信息"
 )
-async def fast_get_all_scada_properties(
+def fast_get_all_scada_properties(
    network: str = Query(..., description="管网名称（或数据库名称）")
 ) -> list[dict[str, Any]]:
    """获取水网中所有SCADA点的属性列表。"""
@@ -273,7 +274,7 @@ async def fast_get_all_scada_properties(
    summary="获取指定类型元素属性",
    description="获取指定类型的元素属性信息"
 )
-async def fast_get_element_properties_with_type(
+def fast_get_element_properties_with_type(
    network: str = Query(..., description="管网名称（或数据库名称）"),
    elementtype: str = Query(..., description="元素类型"),
    element: str = Query(..., description="元素ID")
@@ -286,7 +287,7 @@ async def fast_get_element_properties_with_type(
    summary="获取元素属性",
    description="获取指定元素的属性信息"
 )
-async def fast_get_element_properties(
+def fast_get_element_properties(
    network: str = Query(..., description="管网名称（或数据库名称）"),
    element: str = Query(..., description="元素ID")
 ) -> dict[str, Any]:
@@ -302,7 +303,7 @@ async def fast_get_element_properties(
    summary="获取标题属性架构",
    description="获取指定水网的标题(标题)属性架构定义"
 )
-async def fast_get_title_schema(
+def fast_get_title_schema(
    network: str = Query(..., description="管网名称（或数据库名称）")
 ) -> dict[str, dict[str, Any]]:
    """获取水网标题的属性架构。"""
@@ -313,7 +314,7 @@ async def fast_get_title_schema(
    summary="获取水网标题属性",
    description="获取指定水网的标题(Title)信息"
 )
-async def fast_get_title(network: str = Query(..., description="管网名称（或数据库名称）")) -> dict[str, Any]:
+def fast_get_title(network: str = Query(..., description="管网名称（或数据库名称）")) -> dict[str, Any]:
    """获取水网的标题属性。"""
    return get_title(network)

@@ -323,12 +324,12 @@ async def fast_get_title(network: str = Query(..., description="管网名称（
    summary="设置水网标题属性",
    description="设置指定水网的标题(Title)信息"
 )
-async def fastapi_set_title(
+def fastapi_set_title(
    network: str = Query(..., description="管网名称（或数据库名称）"),
-    req: Request = None
+    payload: dict[str, Any] = Body(...)
 ) -> ChangeSet:
    """设置水网的标题属性。"""
-    props = await req.json()
+    props = payload
    return set_title(network, ChangeSet(props))

 ############################################################
@@ -340,7 +341,7 @@ async def fastapi_set_title(
    summary="获取状态属性架构",
    description="获取指定水网的状态(Status)属性架构定义"
 )
-async def fastapi_get_status_schema(
+def fastapi_get_status_schema(
    network: str = Query(..., description="管网名称（或数据库名称）")
 ) -> dict[str, dict[str, Any]]:
    """获取水网状态的属性架构。"""
@@ -351,7 +352,7 @@ async def fastapi_get_status_schema(
    summary="获取管线状态",
    description="获取指定管线的状态信息"
 )
-async def fastapi_get_status(
+def fastapi_get_status(
    network: str = Query(..., description="管网名称（或数据库名称）"),
    link: str = Query(..., description="管线ID")
 ) -> dict[str, Any]:
@@ -364,13 +365,13 @@ async def fastapi_get_status(
    summary="设置管线状态",
    description="设置指定管线的状态信息"
 )
-async def fastapi_set_status_properties(
+def fastapi_set_status_properties(
    network: str = Query(..., description="管网名称（或数据库名称）"),
    link: str = Query(..., description="管线ID"),
-    req: Request = None
+    payload: dict[str, Any] = Body(...)
 ) -> ChangeSet:
    """设置管线的状态属性。"""
-    props = await req.json()
+    props = payload
    ps = {"link": link} | props
    return set_status(network, ChangeSet(ps))

@@ -384,7 +385,7 @@ async def fastapi_set_status_properties(
    summary="删除节点",
    description="删除指定的节点(接点/水源/蓄水池)"
 )
-async def fastapi_delete_node(
+def fastapi_delete_node(
    network: str = Query(..., description="管网名称（或数据库名称）"),
    node: str = Query(..., description="节点ID")
 ) -> ChangeSet:
@@ -404,7 +405,7 @@ async def fastapi_delete_node(
    summary="删除管线",
    description="删除指定的管线(管道/泵/阀门)"
 )
-async def fastapi_delete_link(
+def fastapi_delete_link(
    network: str = Query(..., description="管网名称（或数据库名称）"),
    link: str = Query(..., description="管线ID")
 ) -> ChangeSet: