From 387e1f5989a29e285a821cbd56977eb67f52046e Mon Sep 17 00:00:00 2001 From: DingZQ Date: Sat, 19 Apr 2025 11:41:35 +0800 Subject: [PATCH] Add API getpiperiskprobabilitygeometries --- api/s41_pipe_risk_probability.py | 13 ++++++++++++- main.py | 4 ++++ tjnetwork.py | 2 ++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/api/s41_pipe_risk_probability.py b/api/s41_pipe_risk_probability.py index 2806bf0..bb4fdb1 100644 --- a/api/s41_pipe_risk_probability.py +++ b/api/s41_pipe_risk_probability.py @@ -51,4 +51,15 @@ def get_pipes_risk_probability(name: str, pipe_ids: list[str]) -> list[dict[str, t['y'] = record['y'] pipe_risk_probability_list.append(t) - return pipe_risk_probability_list \ No newline at end of file + return pipe_risk_probability_list + +# node : {}, link : {} +def get_pipe_risk_probability_geometries(name: str) -> dict[str, Any]: + pipe_risk_probability_geometries = {} + + with conn[name].cursor(row_factory=dict_row) as cur: + cur.execute(f"select * from GIS_pipe") + for record in cur: + print(record['geometry']) + + return pipe_risk_probability_geometries diff --git a/main.py b/main.py index 7c66a0d..d84ea8b 100644 --- a/main.py +++ b/main.py @@ -2219,6 +2219,10 @@ async def fastapi_get_pipes_risk_probability(network: str, pipe_ids: str) -> lis async def fastapi_get_network_pipe_risk_probability_now(network: str) -> list[dict[str, Any]]: return get_network_pipe_risk_probability_now(network) +@app.get('/getpiperiskprobabilitygeometries/') +async def fastapi_get_pipe_risk_probability_geometries(network: str) -> dict[str, Any]: + return get_pipe_risk_probability_geometries(network) + diff --git a/tjnetwork.py b/tjnetwork.py index 49893f6..006f7f4 100644 --- a/tjnetwork.py +++ b/tjnetwork.py @@ -1329,3 +1329,5 @@ def get_pipes_risk_probability(name: str, pipe_ids: list[str]) -> list[dict[str, def get_network_pipe_risk_probability_now(name: str) -> list[dict[str, Any]]: return api.get_network_pipe_risk_probability_now(name) +def get_pipe_risk_probability_geometries(name: str) -> dict[str, Any]: + return api.get_pipe_risk_probability_geometries(name)