refactor(api): unify scheme query endpoints

app/services/burst_location.py

@@ -476,7 +476,7 @@ def _get_simulation_scheme_burst_ids(
 ) -> list[str]:
     if not scheme_name:
         return []
-    rows = query_scheme_list(network) or []
+    rows = query_scheme_list(network, scheme_type=scheme_type) or []
     for row in rows:
         if len(row) < 7:
             continue

app/services/scheme_management.py

@@ -154,10 +154,16 @@ def delete_scheme_info(name: str, scheme_name: str) -> None:
 
 
 # 2025/03/23
-def query_scheme_list(name: str) -> list:
+def query_scheme_list(
+    name: str,
+    scheme_type: str | None = None,
+    query_date: date | None = None,
+) -> list:
     """
     查询pg数据库中的scheme_list，按照 create_time 降序排列，离现在时间最近的记录排在最前面
     :param name: 项目名称（数据库名称）
+    :param scheme_type: 方案类型；为空时返回全部类型
+    :param query_date: 查询日期；为空时不按日期过滤
     :return: 返回查询结果的所有行
     """
     try:
@@ -166,8 +172,38 @@ def query_scheme_list(name: str) -> list:
         # 连接到 PostgreSQL 数据库（这里是数据库 "bb"）
         with psycopg.connect(conn_string) as conn:
             with conn.cursor() as cur:
-                # 按 create_time 降序排列
-                cur.execute("SELECT * FROM scheme_list ORDER BY create_time DESC")
+                if scheme_type and query_date is not None:
+                    cur.execute(
+                        """
+                        SELECT *
+                        FROM scheme_list
+                        WHERE scheme_type = %s AND DATE(create_time) = %s
+                        ORDER BY create_time DESC
+                        """,
+                        (scheme_type, query_date),
+                    )
+                elif scheme_type:
+                    cur.execute(
+                        """
+                        SELECT *
+                        FROM scheme_list
+                        WHERE scheme_type = %s
+                        ORDER BY create_time DESC
+                        """,
+                        (scheme_type,),
+                    )
+                elif query_date is not None:
+                    cur.execute(
+                        """
+                        SELECT *
+                        FROM scheme_list
+                        WHERE DATE(create_time) = %s
+                        ORDER BY create_time DESC
+                        """,
+                        (query_date,),
+                    )
+                else:
+                    cur.execute("SELECT * FROM scheme_list ORDER BY create_time DESC")
                 rows = cur.fetchall()
                 return rows
 
@@ -175,6 +211,85 @@ def query_scheme_list(name: str) -> list:
         print(f"查询错误：{e}")
 
 
+def _filter_scheme_detail_scope(
+    result: dict,
+    name: str,
+    scheme_type: str | None = None,
+) -> dict:
+    if not result:
+        return {}
+    if scheme_type and result.get("scheme_type") != scheme_type:
+        return {}
+    network = result.get("network")
+    if network not in (None, name):
+        return {}
+    return result
+
+
+def query_scheme_detail(
+    name: str,
+    scheme_name: str,
+    scheme_type: str | None = None,
+) -> dict:
+    if scheme_type == "dma_leak_identification":
+        return _filter_scheme_detail_scope(
+            query_leakage_identify_scheme_detail(name, scheme_name),
+            name,
+            scheme_type,
+        )
+    if scheme_type == "burst_detection":
+        return _filter_scheme_detail_scope(
+            query_burst_detection_scheme_detail(name, scheme_name),
+            name,
+            scheme_type,
+        )
+    if scheme_type == "burst_location":
+        return _filter_scheme_detail_scope(
+            query_burst_location_scheme_detail(name, scheme_name),
+            name,
+            scheme_type,
+        )
+
+    conn_string = get_pgconn_string(db_name=name)
+    with psycopg.connect(conn_string) as conn:
+        with conn.cursor() as cur:
+            if scheme_type:
+                cur.execute(
+                    """
+                    SELECT scheme_id, scheme_name, scheme_type, username, create_time, scheme_start_time, scheme_detail
+                    FROM public.scheme_list
+                    WHERE scheme_name = %s AND scheme_type = %s
+                    LIMIT 1
+                    """,
+                    (scheme_name, scheme_type),
+                )
+            else:
+                cur.execute(
+                    """
+                    SELECT scheme_id, scheme_name, scheme_type, username, create_time, scheme_start_time, scheme_detail
+                    FROM public.scheme_list
+                    WHERE scheme_name = %s
+                    LIMIT 1
+                    """,
+                    (scheme_name,),
+                )
+            row = cur.fetchone()
+    if row is None:
+        return {}
+    detail = row[6] if isinstance(row[6], dict) else {}
+    return _filter_scheme_detail_scope({
+        "scheme_id": row[0],
+        "scheme_name": row[1],
+        "scheme_type": row[2],
+        "username": row[3],
+        "create_time": row[4],
+        "scheme_start_time": row[5],
+        "scheme_detail": detail,
+        "network": detail.get("network"),
+        "result_payload": detail.get("result_payload", {}),
+    }, name, scheme_type)
+
+
 def store_leakage_identify_result(
     name: str,
     scheme_name: str,

app/services/tjnetwork.py

@@ -1312,8 +1312,34 @@ def get_scheme_schema(name: str) -> dict[str, dict[str, Any]]:
 def get_scheme(name: str, schema_name: str) -> dict[str, Any]:
     return api.get_scheme(name, schema_name)
 
-def get_all_schemes(name: str) -> list[dict[str, Any]]:
-    return api.get_all_schemes(name)
+def get_all_schemes(
+    name: str,
+    scheme_type: str | None = None,
+    query_date: Any | None = None,
+) -> list[dict[str, Any]]:
+    if scheme_type is None and query_date is None:
+        return api.get_all_schemes(name)
+
+    from app.services.scheme_management import query_scheme_list
+
+    rows = query_scheme_list(name, scheme_type=scheme_type, query_date=query_date) or []
+    columns = [
+        "scheme_id",
+        "scheme_name",
+        "scheme_type",
+        "username",
+        "create_time",
+        "scheme_start_time",
+        "scheme_detail",
+    ]
+    result = []
+    for row in rows:
+        item = dict(zip(columns, row, strict=False))
+        detail = item.get("scheme_detail")
+        if isinstance(detail, dict) and detail.get("network") not in (None, name):
+            continue
+        result.append(item)
+    return result
 
 ############################################################
 # pipe_risk_probability 41
@@ -1345,5 +1371,3 @@ def get_all_sensor_placements(name: str) -> list[dict[Any, Any]]:
 def get_all_burst_locate_results(name: str) -> list[dict[Any, Any]]:
     return api.get_all_burst_locate_results(name)
 
-
-