From 8cce40ffdb54b2a28dcf3bbeb3ba536b7de43d98 Mon Sep 17 00:00:00 2001 From: DingZQ Date: Sun, 23 Feb 2025 00:31:05 +0800 Subject: [PATCH] Refine --- main.py | 7 +++---- tjnetwork.py | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/main.py b/main.py index 4c15dcc..2542982 100644 --- a/main.py +++ b/main.py @@ -2016,16 +2016,15 @@ async def fastapi_calculate_demand_to_network(network: str, demand: float) -> di ############################################################ @app.get('/getscadainfoschema/') async def fastapi_get_scada_info_schema(network: str) -> dict[str, dict[str, Any]]: - #return api.get_scada_info_schema(network) - return {} + return get_scada_info(network) @app.get('/getscadainfo/') async def fastapi_get_scada_info(network: str, id: str) -> dict[str, float]: - return api.get_scada_info(network, id) + return get_scada_info(network, id) @app.get('/getallscadainfo/') async def fastapi_get_all_scada_info(network: str) -> list[dict[str, float]]: - return api.get_all_scada_info(network) + return get_all_scada_info(network) # inp file diff --git a/tjnetwork.py b/tjnetwork.py index 77426a5..72dcd74 100644 --- a/tjnetwork.py +++ b/tjnetwork.py @@ -1246,3 +1246,18 @@ def calculate_demand_to_region(name: str, demand: float, region: str) -> dict[st def calculate_demand_to_network(name: str, demand: float) -> dict[str, float]: return api.calculate_demand_to_network(name, demand) + + +############################################################ +# scada_info 38 | WMH +############################################################ + +def get_scada_info_schema(name: str) -> dict[str, dict[str, Any]]: + return api.get_scada_info_schema(name) + +def get_scada_info(name: str, id: str) -> dict[str, Any]: + return api.get_scada_info(name, id) + + +def get_all_scada_info(name: str) -> list[dict[str, Any]]: + return api.get_all_scada_info(name)