Refine

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
+from .s41_pipe_risk_probability import get_pipe_risk_probability_now, get_pipe_risk_probability, get_network_pipe_risk_probability_now

api/s0_base.py

@@ -256,4 +256,20 @@ def get_link_nodes(name: str, id: str) -> list[str]:
 def get_region_type(name: str, id: str)->str:
     if(is_region(name,id)):
         type = read(name, f"select type from _region where id = '{id}'")
-        return type
+        return type
+
+
+def get_network_pipe_risk_probability_now(name: str) -> 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
+

main.py

@@ -2210,6 +2210,12 @@ 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('/getnetworkpiperiskprobabilitynow/')
+async def fastapi_get_network_pipe_risk_probability_now(network: str) -> dict[str, Any]:
+    return get_network_pipe_risk_probability_now(network)
+
+
+
 
 
 

tjnetwork.py

@@ -1322,3 +1322,7 @@ 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_network_pipe_risk_probability_now(name: str) -> dict[str, Any]:
+    return api.get_network_pipe_risk_probability_now(name)
+