From ab99d9a81c9622857058c6012f73f74391a64b35 Mon Sep 17 00:00:00 2001 From: DingZQ Date: Thu, 17 Apr 2025 23:09:15 +0800 Subject: [PATCH] 'Add --- api/__init__.py | 2 +- api/s0_base.py | 13 ------------- api/s41_pipe_risk_probability.py | 30 +++++++++++++++++++++++++++++- main.py | 4 ++++ tjnetwork.py | 3 +++ 5 files changed, 37 insertions(+), 15 deletions(-) diff --git a/api/__init__.py b/api/__init__.py index 7d7affe..b547e26 100644 --- a/api/__init__.py +++ b/api/__init__.py @@ -168,4 +168,4 @@ from .s39_user import get_user_schema, get_user, get_all_users from .s40_schema import get_scheme_schema, get_scheme, get_all_schemes -from .s41_pipe_risk_probability import get_pipe_risk_probability_now, get_pipe_risk_probability, get_network_pipe_risk_probability_now +from .s41_pipe_risk_probability import get_pipe_risk_probability_now, get_pipe_risk_probability, get_network_pipe_risk_probability_now, get_pipes_risk_probability diff --git a/api/s0_base.py b/api/s0_base.py index e9e111f..65882ab 100644 --- a/api/s0_base.py +++ b/api/s0_base.py @@ -259,17 +259,4 @@ def get_region_type(name: str, id: str)->str: return type -def get_network_pipe_risk_probability_now(name: str) -> list[dict[str, Any]]: - pipe_risk_probability_list = [] - with conn[name].cursor(row_factory=dict_row) as cur: - cur.execute(f"select * from pipe_risk_probability") - for record in cur: - #pipe_risk_probability_list.append(record) - t = {} - t['pipeid'] = record['pipeid'] - t['pipeage'] = record['pipeage'] - t['risk_probability_now'] = record['risk_probability_now'] - pipe_risk_probability_list.append(t) - - return pipe_risk_probability_list diff --git a/api/s41_pipe_risk_probability.py b/api/s41_pipe_risk_probability.py index 15291fc..f1857d0 100644 --- a/api/s41_pipe_risk_probability.py +++ b/api/s41_pipe_risk_probability.py @@ -23,4 +23,32 @@ def get_pipe_risk_probability(name: str, pipe_id: str) -> dict[str, Any]: d['x'] = t['x'] d['y'] = t['y'] - return d \ No newline at end of file + return d + +def get_network_pipe_risk_probability_now(name: str) -> list[dict[str, Any]]: + pipe_risk_probability_list = [] + with conn[name].cursor(row_factory=dict_row) as cur: + cur.execute(f"select * from pipe_risk_probability") + for record in cur: + #pipe_risk_probability_list.append(record) + t = {} + t['pipeid'] = record['pipeid'] + t['pipeage'] = record['pipeage'] + t['risk_probability_now'] = record['risk_probability_now'] + pipe_risk_probability_list.append(t) + + return pipe_risk_probability_list + +def get_pipes_risk_probability(name: str, pipe_ids: list[str]) -> list[dict[str, Any]]: + pipe_risk_probability_list = [] + with conn[name].cursor(row_factory=dict_row) as cur: + cur.execute(f"select * from pipe_risk_probability where pipeid in ({','.join(pipe_ids)})") + for record in cur: + #pipe_risk_probability_list.append(record) + t = {} + t['pipeid'] = record['pipeid'] + t['x'] = record['y'] + t['y'] = record['y'] + pipe_risk_probability_list.append(t) + + return pipe_risk_probability_list \ No newline at end of file diff --git a/main.py b/main.py index 7bb8506..0ecf2a2 100644 --- a/main.py +++ b/main.py @@ -2210,6 +2210,10 @@ async def fastapi_get_pipe_risk_probability_now(network: str, pipe_id: str) -> d async def fastapi_get_pipe_risk_probability(network: str, pipe_id: str) -> dict[str, Any]: return get_pipe_risk_probability(network, pipe_id) +@app.get('/getpipesriskprobability/') +async def fastapi_get_pipes_risk_probability(network: str, pipe_ids: list[str]) -> list[dict[str, Any]]: + return get_pipes_risk_probability(network, pipe_ids) + @app.get('/getnetworkpiperiskprobabilitynow/') async def fastapi_get_network_pipe_risk_probability_now(network: str) -> list[dict[str, Any]]: return get_network_pipe_risk_probability_now(network) diff --git a/tjnetwork.py b/tjnetwork.py index 3e3dd34..49893f6 100644 --- a/tjnetwork.py +++ b/tjnetwork.py @@ -1323,6 +1323,9 @@ def get_pipe_risk_probability_now(name: str, pipe_id: str) -> dict[str, Any]: def get_pipe_risk_probability(name: str, pipe_id: str) -> dict[str, Any]: return api.get_pipe_risk_probability(name, pipe_id) +def get_pipes_risk_probability(name: str, pipe_ids: list[str]) -> list[dict[str, Any]]: + return api.get_pipes_risk_probability(name, pipe_ids) + def get_network_pipe_risk_probability_now(name: str) -> list[dict[str, Any]]: return api.get_network_pipe_risk_probability_now(name)