From 7d8562ae387a10703d566a66766d6ce1b1d0daa5 Mon Sep 17 00:00:00 2001 From: DingZQ Date: Sun, 23 Feb 2025 00:24:49 +0800 Subject: [PATCH] Refine --- api/s38_scada_info.py | 9 ++++++--- main.py | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/api/s38_scada_info.py b/api/s38_scada_info.py index e650772..041fff5 100644 --- a/api/s38_scada_info.py +++ b/api/s38_scada_info.py @@ -1,6 +1,4 @@ from .database import * -from .s0_base import * -from .s24_coordinates import * def get_scada_info_schema(name: str) -> dict[str, dict[str, Any]]: @@ -34,6 +32,11 @@ def get_all_scada_info(name: str) -> list[dict[str, Any]]: d = [] for si in sis: - d.append({ 'id': str(si['id']), 'type': str(si['type']), 'x': float(si['x']), 'y': float(si['y']), 'api_query_id': str(si['api_query_id']), 'associated_element_id': str(si['associated_element_id']) }) + d.append({ 'id': str(si['id']), + 'type': str(si['type']), + 'x': float(si['x']), + 'y': float(si['y']), + 'api_query_id': str(si['api_query_id']), + 'associated_element_id': str(si['associated_element_id']) }) return d \ No newline at end of file diff --git a/main.py b/main.py index 9884f4a..4c15dcc 100644 --- a/main.py +++ b/main.py @@ -2016,7 +2016,8 @@ 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 api.get_scada_info_schema(network) + return {} @app.get('/getscadainfo/') async def fastapi_get_scada_info(network: str, id: str) -> dict[str, float]: