删除旧文件；更新数据库查询方法

timescaledb/router.py

@@ -1,40 +1,65 @@
 from fastapi import APIRouter, Depends, HTTPException, Query
-from typing import List, Any, Dict
+from typing import List, Optional
 from datetime import datetime
 from psycopg import AsyncConnection
 
-from .database import get_db_connection
+from .database import get_database_instance
 from .schemas.realtime import RealtimeRepository
 from .schemas.scheme import SchemeRepository
 from .schemas.scada import ScadaRepository
 
 router = APIRouter(prefix="/timescaledb", tags=["TimescaleDB"])
 
+
+# 创建支持数据库选择的连接依赖函数
+async def get_database_connection(
+    db_name: Optional[str] = Query(
+        None, description="指定要连接的数据库名称，为空时使用默认数据库"
+    )
+):
+    """获取数据库连接，支持通过查询参数指定数据库名称"""
+    instance = await get_database_instance(db_name)
+    async with instance.get_connection() as conn:
+        yield conn
+
+
 # --- Realtime Endpoints ---
 
+
 @router.post("/realtime/links/batch", status_code=201)
 async def insert_realtime_links(
-    data: List[dict],
-    conn: AsyncConnection = Depends(get_db_connection)
+    data: List[dict], conn: AsyncConnection = Depends(get_database_connection)
 ):
     await RealtimeRepository.insert_links_batch(conn, data)
     return {"message": f"Inserted {len(data)} records"}
 
+
 @router.get("/realtime/links")
 async def get_realtime_links(
     start_time: datetime,
     end_time: datetime,
-    conn: AsyncConnection = Depends(get_db_connection)
+    conn: AsyncConnection = Depends(get_database_connection),
 ):
     return await RealtimeRepository.get_links_by_time(conn, start_time, end_time)
 
+
+@router.delete("/realtime/links")
+async def delete_realtime_links(
+    start_time: datetime,
+    end_time: datetime,
+    conn: AsyncConnection = Depends(get_database_connection),
+):
+    await RealtimeRepository.delete_links_by_time(conn, start_time, end_time)
+    return {"message": "Deleted successfully"}
+
+
 @router.patch("/realtime/links/{link_id}/field")
 async def update_realtime_link_field(
     link_id: str,
     time: datetime,
     field: str,
-    value: float, # Assuming float for now, could be Any but FastAPI needs type
-    conn: AsyncConnection = Depends(get_db_connection)
+    value: float,  # Assuming float for now, could be Any but FastAPI needs type
+    conn: AsyncConnection = Depends(get_database_connection),
 ):
     try:
         await RealtimeRepository.update_link_field(conn, time, link_id, field, value)
@@ -42,64 +67,214 @@ async def update_realtime_link_field(
     except ValueError as e:
         raise HTTPException(status_code=400, detail=str(e))
 
+
 @router.post("/realtime/nodes/batch", status_code=201)
 async def insert_realtime_nodes(
-    data: List[dict],
-    conn: AsyncConnection = Depends(get_db_connection)
+    data: List[dict], conn: AsyncConnection = Depends(get_database_connection)
 ):
     await RealtimeRepository.insert_nodes_batch(conn, data)
     return {"message": f"Inserted {len(data)} records"}
 
+
 @router.get("/realtime/nodes")
 async def get_realtime_nodes(
     start_time: datetime,
     end_time: datetime,
-    conn: AsyncConnection = Depends(get_db_connection)
+    conn: AsyncConnection = Depends(get_database_connection),
 ):
     return await RealtimeRepository.get_nodes_by_time(conn, start_time, end_time)
 
+
+@router.delete("/realtime/nodes")
+async def delete_realtime_nodes(
+    start_time: datetime,
+    end_time: datetime,
+    conn: AsyncConnection = Depends(get_database_connection),
+):
+    await RealtimeRepository.delete_nodes_by_time(conn, start_time, end_time)
+    return {"message": "Deleted successfully"}
+
+
 # --- Scheme Endpoints ---
 
+
 @router.post("/scheme/links/batch", status_code=201)
 async def insert_scheme_links(
-    data: List[dict],
-    conn: AsyncConnection = Depends(get_db_connection)
+    data: List[dict], conn: AsyncConnection = Depends(get_database_connection)
 ):
     await SchemeRepository.insert_links_batch(conn, data)
     return {"message": f"Inserted {len(data)} records"}
 
+
 @router.get("/scheme/links")
 async def get_scheme_links(
     scheme: str,
     start_time: datetime,
     end_time: datetime,
-    conn: AsyncConnection = Depends(get_db_connection)
+    conn: AsyncConnection = Depends(get_database_connection),
 ):
-    return await SchemeRepository.get_links_by_scheme_and_time(conn, scheme, start_time, end_time)
+    return await SchemeRepository.get_links_by_scheme_and_time(
+        conn, scheme, start_time, end_time
+    )
+
+
+@router.get("/scheme/links/{link_id}/field")
+async def get_scheme_link_field(
+    scheme: str,
+    link_id: str,
+    time: datetime,
+    field: str,
+    conn: AsyncConnection = Depends(get_database_connection),
+):
+    try:
+        return await SchemeRepository.get_link_field_by_scheme_and_time(
+            conn, time, scheme, link_id, field
+        )
+    except ValueError as e:
+        raise HTTPException(status_code=400, detail=str(e))
+
+
+@router.patch("/scheme/links/{link_id}/field")
+async def update_scheme_link_field(
+    scheme: str,
+    link_id: str,
+    time: datetime,
+    field: str,
+    value: float,
+    conn: AsyncConnection = Depends(get_database_connection),
+):
+    try:
+        await SchemeRepository.update_link_field(
+            conn, time, scheme, link_id, field, value
+        )
+        return {"message": "Updated successfully"}
+    except ValueError as e:
+        raise HTTPException(status_code=400, detail=str(e))
+
+
+@router.delete("/scheme/links")
+async def delete_scheme_links(
+    scheme: str,
+    start_time: datetime,
+    end_time: datetime,
+    conn: AsyncConnection = Depends(get_database_connection),
+):
+    await SchemeRepository.delete_links_by_scheme_and_time(
+        conn, scheme, start_time, end_time
+    )
+    return {"message": "Deleted successfully"}
+
 
 @router.post("/scheme/nodes/batch", status_code=201)
 async def insert_scheme_nodes(
-    data: List[dict],
-    conn: AsyncConnection = Depends(get_db_connection)
+    data: List[dict], conn: AsyncConnection = Depends(get_database_connection)
 ):
     await SchemeRepository.insert_nodes_batch(conn, data)
     return {"message": f"Inserted {len(data)} records"}
 
+
+@router.get("/scheme/nodes/{node_id}/field")
+async def get_scheme_node_field(
+    scheme: str,
+    node_id: str,
+    time: datetime,
+    field: str,
+    conn: AsyncConnection = Depends(get_database_connection),
+):
+    try:
+        return await SchemeRepository.get_node_field_by_scheme_and_time(
+            conn, time, scheme, node_id, field
+        )
+    except ValueError as e:
+        raise HTTPException(status_code=400, detail=str(e))
+
+
+@router.patch("/scheme/nodes/{node_id}/field")
+async def update_scheme_node_field(
+    scheme: str,
+    node_id: str,
+    time: datetime,
+    field: str,
+    value: float,
+    conn: AsyncConnection = Depends(get_database_connection),
+):
+    try:
+        await SchemeRepository.update_node_field(
+            conn, time, scheme, node_id, field, value
+        )
+        return {"message": "Updated successfully"}
+    except ValueError as e:
+        raise HTTPException(status_code=400, detail=str(e))
+
+
+@router.delete("/scheme/nodes")
+async def delete_scheme_nodes(
+    scheme: str,
+    start_time: datetime,
+    end_time: datetime,
+    conn: AsyncConnection = Depends(get_database_connection),
+):
+    await SchemeRepository.delete_nodes_by_scheme_and_time(
+        conn, scheme, start_time, end_time
+    )
+    return {"message": "Deleted successfully"}
+
+
 # --- SCADA Endpoints ---
 
+
 @router.post("/scada/batch", status_code=201)
 async def insert_scada_data(
-    data: List[dict],
-    conn: AsyncConnection = Depends(get_db_connection)
+    data: List[dict], conn: AsyncConnection = Depends(get_database_connection)
 ):
     await ScadaRepository.insert_batch(conn, data)
     return {"message": f"Inserted {len(data)} records"}
 
+
 @router.get("/scada")
 async def get_scada_data(
     device_id: str,
     start_time: datetime,
     end_time: datetime,
-    conn: AsyncConnection = Depends(get_db_connection)
+    conn: AsyncConnection = Depends(get_database_connection),
 ):
     return await ScadaRepository.get_data_by_time(conn, device_id, start_time, end_time)
+
+
+@router.get("/scada/{device_id}/field")
+async def get_scada_field(
+    device_id: str,
+    time: datetime,
+    field: str,
+    conn: AsyncConnection = Depends(get_database_connection),
+):
+    try:
+        return await ScadaRepository.get_field(conn, time, device_id, field)
+    except ValueError as e:
+        raise HTTPException(status_code=400, detail=str(e))
+
+
+@router.patch("/scada/{device_id}/field")
+async def update_scada_field(
+    device_id: str,
+    time: datetime,
+    field: str,
+    value: float,
+    conn: AsyncConnection = Depends(get_database_connection),
+):
+    try:
+        await ScadaRepository.update_field(conn, time, device_id, field, value)
+        return {"message": "Updated successfully"}
+    except ValueError as e:
+        raise HTTPException(status_code=400, detail=str(e))
+
+
+@router.delete("/scada")
+async def delete_scada_data(
+    device_id: str,
+    start_time: datetime,
+    end_time: datetime,
+    conn: AsyncConnection = Depends(get_database_connection),
+):
+    await ScadaRepository.delete_data_by_time(conn, device_id, start_time, end_time)
+    return {"message": "Deleted successfully"}