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
@@ -127,7 +127,7 @@ def run_simulation_manually_by_date(

 # 必须用这个PlainTextResponse，不然每个key都有引号
@router.post("/project-runs", response_class=PlainTextResponse, summary="运行项目模拟", description="基于指定的管网项目运行标准水力模拟，返回纯文本格式的模拟报告。")
-async def run_project_endpoint(network: str = Query(..., description="管网名称（或数据库名称）")) -> str:
+def run_project_endpoint(network: str = Query(..., description="管网名称（或数据库名称）")) -> str:
    """
    运行项目模拟
    
@@ -143,7 +143,7 @@ async def run_project_endpoint(network: str = Query(..., description="管网名
 # output 是 json
 # report 是 text
@router.post("/project-return-dict-runs", summary="运行项目模拟（返回字典）", description="基于指定的管网项目运行标准水力模拟，返回JSON格式的字典，包含输出数据和报告文本。")
-async def run_project_return_dict_endpoint(network: str = Query(..., description="管网名称（或数据库名称）")) -> dict[str, Any]:
+def run_project_return_dict_endpoint(network: str = Query(..., description="管网名称（或数据库名称）")) -> dict[str, Any]:
    """
    运行项目模拟（返回字典）
    
@@ -160,7 +160,7 @@ async def run_project_return_dict_endpoint(network: str = Query(..., description

 # put in inp folder, name without extension
@router.post("/inp-runs", summary="运行INP文件", description="运行指定INP文件格式的管网模型进行水力模拟。INP文件应该放在inp文件夹中，参数为文件名不含扩展名。")
-async def run_inp_endpoint(network: str = Query(..., description="inp文件名（不含扩展名）")) -> str:
+def run_inp_endpoint(network: str = Query(..., description="inp文件名（不含扩展名）")) -> str:
    """
    运行INP文件
    
@@ -173,7 +173,7 @@ async def run_inp_endpoint(network: str = Query(..., description="inp文件名

 # path is absolute path
@router.get("/outputs", summary="导出模拟输出", description="导出指定路径的模拟输出文件内容。参数应为绝对路径。")
-async def dump_output_endpoint(output: str = Query(..., description="模拟输出文件的绝对路径")) -> str:
+def dump_output_endpoint(output: str = Query(..., description="模拟输出文件的绝对路径")) -> str:
    """
    导出模拟输出
    
@@ -186,7 +186,7 @@ async def dump_output_endpoint(output: str = Query(..., description="模拟输

 # Analysis Endpoints
@router.post("/burst-analyses", summary="爆管分析（高级）", description="高级版本的爆管分析，支持在指定时间点修改泵控制模式和阀门开度，以分析这些改变对爆管影响的作用。支持固定泵和变速泵的独立控制。")
-async def fastapi_burst_analysis(
+def fastapi_burst_analysis(
    network: str = Query(..., description="管网名称（或数据库名称）"),
    modify_pattern_start_time: str = Query(..., description="模式修改开始时间（ISO 8601格式）"),
    burst_ID: list[str] = Query(..., description="爆管节点/管段ID列表"),
@@ -220,7 +220,7 @@ async def fastapi_burst_analysis(


@router.post("/valve-closure-analyses", response_class=PlainTextResponse, summary="阀门关闭分析（高级）", description="高级版本的阀门关闭分析，支持同时关闭多个阀门，并在指定持续时间内进行模拟。返回纯文本格式的分析结果。")
-async def fastapi_valve_close_analysis(
+def fastapi_valve_close_analysis(
    network: str = Query(..., description="管网名称（或数据库名称）"),
    start_time: str = Query(..., description="阀门关闭开始时间（ISO 8601格式）"),
    valves: List[str] = Query(..., description="要关闭的阀门ID列表"),
@@ -249,7 +249,7 @@ async def fastapi_valve_close_analysis(


@router.post("/valve-isolation-analyses", summary="阀门隔离分析", description="分析当发生突发事件时，通过关闭指定阀门进行隔离，确定哪些阀门必须关闭、哪些可选关闭，以及隔离的可行性。")
-async def valve_isolation_endpoint(
+def valve_isolation_endpoint(
    network: str = Query(..., description="管网名称（或数据库名称）"),
    accident_element: List[str] = Query(..., description="发生事故的管段/节点ID列表"),
    disabled_valves: List[str] = Query(None, description="已故障的阀门ID列表（可选）"),
@@ -290,7 +290,7 @@ async def valve_isolation_endpoint(


@router.post("/flushing-analyses", response_class=PlainTextResponse, summary="冲洗分析（高级）", description="高级版本的冲洗分析，支持按状态和设置值控制多个可选阀门，指定排污节点，并设置固定的冲洗流量。返回纯文本格式的分析结果。")
-async def fastapi_flushing_analysis(
+def fastapi_flushing_analysis(
    network: str = Query(..., description="管网名称（或数据库名称）"),
    start_time: str = Query(..., description="冲洗开始时间（ISO 8601格式）"),
    valves: List[str] | None = Query(None, description="参与控制的阀门ID列表（可选）"),
@@ -403,7 +403,7 @@ async def fastapi_flushing_analysis(


@router.post("/contaminant-simulations", response_class=PlainTextResponse, summary="污染物模拟", description="对管网中的污染物扩散进行模拟，评估污染源对管网的影响范围和浓度分布。支持指定污染源位置、污染浓度和扩散模式。")
-async def fastapi_contaminant_simulation(
+def fastapi_contaminant_simulation(
    network: str = Query(..., description="管网名称（或数据库名称）"),
    start_time: str = Query(..., description="污染开始时间（ISO 8601格式）"),
    source: str = Query(..., description="污染源节点ID"),
@@ -440,7 +440,7 @@ async def fastapi_contaminant_simulation(


@router.post("/water-age-analyses", response_class=PlainTextResponse, summary="水龄分析（高级）", description="高级版本的水龄分析，在指定时间点进行分析，支持自定义模拟持续时间。返回纯文本格式的分析结果。")
-async def fastapi_age_analysis(
+def fastapi_age_analysis(
    network: str = Query(..., description="管网名称（或数据库名称）"),
    start_time: str = Query(..., description="分析开始时间（ISO 8601格式）"),
    duration: int = Query(..., description="模拟持续时间（秒）"),
@@ -464,7 +464,7 @@ async def fastapi_age_analysis(


@router.post("/pressure-regulation-calculations", summary="压力调节（基础）", description="对管网的压力进行调节分析，通过控制泵的运行来维持目标节点的目标压力。此为基础版本。")
-async def pressure_regulation_endpoint(
+def pressure_regulation_endpoint(
    network: str = Query(..., description="管网名称（或数据库名称）"),
    target_node: str = Query(..., description="目标节点ID"),
    target_pressure: float = Query(..., description="目标压力值（kPa）"),
@@ -482,7 +482,7 @@ async def pressure_regulation_endpoint(


@router.post("/pressure-regulation-analyses", summary="压力调节（高级）", description="高级版本的压力调节分析，通过JSON请求体提供详细的控制参数，包括固定泵和变速泵的独立控制、水箱初始水位等。")
-async def fastapi_pressure_regulation(data: PressureRegulation = Body(..., description="压力调节控制参数")) -> str:
+def fastapi_pressure_regulation(data: PressureRegulation = Body(..., description="压力调节控制参数")) -> str:
    """
    压力调节（高级版本）
    
@@ -496,7 +496,7 @@ async def fastapi_pressure_regulation(data: PressureRegulation = Body(..., descr
    
    支持固定泵和变速泵的独立控制。
    """
-    item = data.dict()
+    item = data.model_dump()
    simulation.query_corresponding_element_id_and_query_id(item["network"])
    fixed_pumps = set(globals.fixed_pumps_id.keys())
    variable_pumps = set(globals.variable_pumps_id.keys())
@@ -520,7 +520,7 @@ async def fastapi_pressure_regulation(data: PressureRegulation = Body(..., descr


@router.post("/project-managements", summary="项目管理（高级）", description="高级版本的项目管理，通过JSON请求体提供详细的控制参数，包括泵控制策略、水箱初始水位和区域需水量控制。")
-async def fastapi_project_management(data: ProjectManagement = Body(..., description="项目管理控制参数")) -> str:
+def fastapi_project_management(data: ProjectManagement = Body(..., description="项目管理控制参数")) -> str:
    """
    项目管理（高级版本）
    
@@ -533,7 +533,7 @@ async def fastapi_project_management(data: ProjectManagement = Body(..., descrip
    
    支持多维度的项目管理。
    """
-    item = data.dict()
+    item = data.model_dump()
    return project_management(
        prj_name=item["network"],
        start_datetime=item["start_time"],
@@ -549,7 +549,7 @@ async def fastapi_project_management(data: ProjectManagement = Body(..., descrip


@router.post("/scheduling-analyses", summary="排程分析", description="对管网的供水排程进行分析，优化泵的运行时间和出水流量，平衡水厂出水、水箱进出水，满足用户需求。")
-async def fastapi_scheduling_analysis(data: SchedulingAnalysis = Body(..., description="排程分析参数")) -> str:
+def fastapi_scheduling_analysis(data: SchedulingAnalysis = Body(..., description="排程分析参数")) -> str:
    """
    排程分析
    
@@ -563,7 +563,7 @@ async def fastapi_scheduling_analysis(data: SchedulingAnalysis = Body(..., descr
    
    用于优化供水排程。
    """
-    item = data.dict()
+    item = data.model_dump()
    return scheduling_simulation(
        item["network"],
        item["start_time"],
@@ -575,7 +575,7 @@ async def fastapi_scheduling_analysis(data: SchedulingAnalysis = Body(..., descr


@router.post("/daily-scheduling-analyses", summary="日排程分析", description="对管网的每日供水排程进行分析，优化水库、水厂、水箱和用户需求的协调，制定合理的每日排程方案。")
-async def fastapi_daily_scheduling_analysis(data: DailySchedulingAnalysis = Body(..., description="日排程分析参数")) -> str:
+def fastapi_daily_scheduling_analysis(data: DailySchedulingAnalysis = Body(..., description="日排程分析参数")) -> str:
    """
    日排程分析
    
@@ -590,7 +590,7 @@ async def fastapi_daily_scheduling_analysis(data: DailySchedulingAnalysis = Body
    
    用于制定每日供水排程方案。
    """
-    item = data.dict()
+    item = data.model_dump()
    return daily_scheduling_simulation(
        item["network"],
        item["start_time"],
@@ -607,7 +607,7 @@ async def fastapi_daily_scheduling_analysis(data: DailySchedulingAnalysis = Body


@router.post("/pump-failure-events", summary="泵故障管理", description="记录和管理泵的故障状态，包括故障发生时间和受影响的泵列表。系统将记录故障日志并更新泵状态。")
-async def fastapi_pump_failure(data: PumpFailureState = Body(..., description="泵故障状态信息")) -> str:
+def fastapi_pump_failure(data: PumpFailureState = Body(..., description="泵故障状态信息")) -> str:
    """
    泵故障管理
    
@@ -617,7 +617,7 @@ async def fastapi_pump_failure(data: PumpFailureState = Body(..., description="
    
    系统将验证泵信息的有效性并更新故障状态文件。
    """
-    item = data.dict()
+    item = data.model_dump()
    with open("./pump_failure_message.txt", "a", encoding="utf-8-sig") as f1:
        f1.write("[{}] {}\n".format(datetime.now().strftime("%Y-%m-%d %H:%M:%S"), item))
    with open("./pump_failure_status.txt", "r", encoding="utf-8-sig") as f2:
@@ -651,7 +651,7 @@ async def fastapi_pump_failure(data: PumpFailureState = Body(..., description="


@router.post("/simulation-runs", summary="手动运行日期指定模拟", description="根据指定的开始时间和持续时间，手动运行水力模拟。开始时间必须是显式带时区的 ISO 8601 / RFC3339 时间。")
-async def fastapi_run_simulation_manually_by_date(
+def fastapi_run_simulation_manually_by_date(
    data: RunSimulationManuallyByDate = Body(..., description="模拟运行参数"),
 ) -> dict[str, str]:
    """