Add diameter to getmajornodes/getmajorpipes

api/s0_base.py

@@ -108,10 +108,10 @@ def get_nodes_id_and_type(name: str) -> dict[str, str]:
     return nodes_id_and_type
 
 # DingZQ 2024-12-31
-def get_major_nodes(name: str) -> list[str]:
+def get_major_nodes(name: str, diameter: int) -> list[str]:
     major_nodes_set = set()
     with conn[name].cursor(row_factory=dict_row) as cur:
-        cur.execute(f"select node1, node2 from pipes where diameter > 0")
+        cur.execute(f"select node1, node2 from pipes where diameter > {diameter}")
         for record in cur:
             major_nodes_set.add(record['node1'])
             major_nodes_set.add(record['node2'])
@@ -154,10 +154,10 @@ def get_links_id_and_type(name: str) -> dict[str, str]:
 
 # DingZQ 2024-12-31
 # 获取直径大于800的管道
-def get_major_pipes(name: str) -> list[str]:
+def get_major_pipes(name: str, diameter: int) -> list[str]:
     major_pipe_ids: list[str] = []
     with conn[name].cursor(row_factory=dict_row) as cur:
-        cur.execute(f"select id from pipes where diameter > 0 order by id")
+        cur.execute(f"select id from pipes where diameter > {diameter} order by id")
         for record in cur:
             major_pipe_ids.append(record['id'])
     return major_pipe_ids