补全 realtime scheme 中的复合 存储、查询方法

postgresql/database.py

@@ -3,7 +3,7 @@ from contextlib import asynccontextmanager
 from typing import AsyncGenerator, Dict, Optional
 import psycopg_pool
 from psycopg.rows import dict_row
-import postgresql_info
+import api.postgresql_info as postgresql_info
 
 # Configure logging
 logger = logging.getLogger(__name__)
@@ -27,7 +27,9 @@ class Database:
                 open=False,  # Don't open immediately, wait for startup
                 kwargs={"row_factory": dict_row},  # Return rows as dictionaries
             )
-            logger.info(f"PostgreSQL connection pool initialized for database: {target_db_name or 'default'}")
+            logger.info(
+                f"PostgreSQL connection pool initialized for database: {target_db_name or 'default'}"
+            )
         except Exception as e:
             logger.error(f"Failed to initialize postgresql connection pool: {e}")
             raise
@@ -58,15 +60,17 @@ db = Database()
 # 缓存不同数据库的实例 - 避免重复创建连接池
 _database_instances: Dict[str, Database] = {}
 
+
 def create_database_instance(db_name):
     """Create a new Database instance for a specific database."""
     return Database(db_name=db_name)
 
+
 async def get_database_instance(db_name: Optional[str] = None) -> Database:
     """Get or create a database instance for the specified database name."""
     if not db_name:
         return db  # 返回默认数据库实例
-    
+
     if db_name not in _database_instances:
         # 创建新的数据库实例
         instance = create_database_instance(db_name)
@@ -74,14 +78,16 @@ async def get_database_instance(db_name: Optional[str] = None) -> Database:
         await instance.open()
         _database_instances[db_name] = instance
         logger.info(f"Created new database instance for: {db_name}")
-    
+
     return _database_instances[db_name]
 
+
 async def get_db_connection():
     """Dependency for FastAPI to get a database connection."""
     async with db.get_connection() as conn:
         yield conn
 
+
 async def get_database_connection(db_name: Optional[str] = None):
     """
     FastAPI dependency to get database connection with optional database name.
@@ -92,13 +98,14 @@ async def get_database_connection(db_name: Optional[str] = None):
     async with instance.get_connection() as conn:
         yield conn
 
+
 async def cleanup_database_instances():
     """Clean up all database instances (call this on application shutdown)."""
     for db_name, instance in _database_instances.items():
         await instance.close()
         logger.info(f"Closed database instance for: {db_name}")
     _database_instances.clear()
-    
+
     # 关闭默认数据库
     await db.close()
     logger.info("All database instances cleaned up.")

postgresql/router.py

@@ -1,10 +1,9 @@
 from fastapi import APIRouter, Depends, HTTPException, Query
-from typing import List, Optional
-from datetime import datetime
+from typing import Optional
 from psycopg import AsyncConnection
 
 from .database import get_database_instance
-from .scada_info import query_pg_scada_info
+from .scada_info import ScadaRepository
 
 router = APIRouter(prefix="/postgresql", tags=["postgresql"])
 
@@ -26,15 +25,13 @@ async def get_scada_info_with_connection(
     conn: AsyncConnection = Depends(get_database_connection),
 ):
     """
-    使用连接池查询SCADA信息
+    使用连接池查询所有SCADA信息
     """
     try:
-        # 使用连接查询SCADA信息
-        async with conn.cursor() as cur:
-            await cur.execute("SELECT * FROM scada_info")
-            scada_data = await cur.fetchall()
+        # 使用ScadaRepository查询SCADA信息
+        scada_data = await ScadaRepository.get_scadas_info(conn)
         return {"success": True, "data": scada_data, "count": len(scada_data)}
     except Exception as e:
         raise HTTPException(
             status_code=500, detail=f"查询SCADA信息时发生错误: {str(e)}"
-        )
+        )