'Add

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

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
 

api/s41_pipe_risk_probability.py

@@ -24,3 +24,31 @@ def get_pipe_risk_probability(name: str, pipe_id: str) -> dict[str, Any]:
     d['y'] = t['y']
 
     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

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)

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)