重构数据库连接管理，添加元数据支持

app/api/v1/endpoints/audit.py

@@ -4,33 +4,38 @@
 仅管理员可访问
 """
 from typing import List, Optional
+from uuid import UUID
 from datetime import datetime
-from fastapi import APIRouter, Depends, Query, Request
-from app.domain.schemas.audit import AuditLogResponse, AuditLogQuery
-from app.domain.schemas.user import UserInDB
+from fastapi import APIRouter, Depends, Query
+from app.domain.schemas.audit import AuditLogResponse
 from app.infra.repositories.audit_repository import AuditRepository
-from app.auth.dependencies import get_user_repository, get_db
-from app.auth.permissions import get_current_admin
-from app.infra.db.postgresql.database import Database
+from app.auth.metadata_dependencies import (
+    get_current_metadata_admin,
+    get_current_metadata_user,
+)
+from app.infra.db.metadata.database import get_metadata_session
+from sqlalchemy.ext.asyncio import AsyncSession
 
 router = APIRouter()
 
-async def get_audit_repository(db: Database = Depends(get_db)) -> AuditRepository:
+async def get_audit_repository(
+    session: AsyncSession = Depends(get_metadata_session),
+) -> AuditRepository:
     """获取审计日志仓储"""
-    return AuditRepository(db)
+    return AuditRepository(session)
 
 @router.get("/logs", response_model=List[AuditLogResponse])
 async def get_audit_logs(
-    user_id: Optional[int] = Query(None, description="按用户ID过滤"),
-    username: Optional[str] = Query(None, description="按用户名过滤"),
+    user_id: Optional[UUID] = Query(None, description="按用户ID过滤"),
+    project_id: Optional[UUID] = Query(None, description="按项目ID过滤"),
     action: Optional[str] = Query(None, description="按操作类型过滤"),
     resource_type: Optional[str] = Query(None, description="按资源类型过滤"),
     start_time: Optional[datetime] = Query(None, description="开始时间"),
     end_time: Optional[datetime] = Query(None, description="结束时间"),
     skip: int = Query(0, ge=0, description="跳过记录数"),
     limit: int = Query(100, ge=1, le=1000, description="限制记录数"),
-    current_user: UserInDB = Depends(get_current_admin),
-    audit_repo: AuditRepository = Depends(get_audit_repository)
+    current_user=Depends(get_current_metadata_admin),
+    audit_repo: AuditRepository = Depends(get_audit_repository),
 ) -> List[AuditLogResponse]:
     """
     查询审计日志（仅管理员）
@@ -39,7 +44,7 @@ async def get_audit_logs(
     """
     logs = await audit_repo.get_logs(
         user_id=user_id,
-        username=username,
+        project_id=project_id,
         action=action,
         resource_type=resource_type,
         start_time=start_time,
@@ -51,21 +56,21 @@ async def get_audit_logs(
 
 @router.get("/logs/count")
 async def get_audit_logs_count(
-    user_id: Optional[int] = Query(None, description="按用户ID过滤"),
-    username: Optional[str] = Query(None, description="按用户名过滤"),
+    user_id: Optional[UUID] = Query(None, description="按用户ID过滤"),
+    project_id: Optional[UUID] = Query(None, description="按项目ID过滤"),
     action: Optional[str] = Query(None, description="按操作类型过滤"),
     resource_type: Optional[str] = Query(None, description="按资源类型过滤"),
     start_time: Optional[datetime] = Query(None, description="开始时间"),
     end_time: Optional[datetime] = Query(None, description="结束时间"),
-    current_user: UserInDB = Depends(get_current_admin),
-    audit_repo: AuditRepository = Depends(get_audit_repository)
+    current_user=Depends(get_current_metadata_admin),
+    audit_repo: AuditRepository = Depends(get_audit_repository),
 ) -> dict:
     """
     获取审计日志总数（仅管理员）
     """
     count = await audit_repo.get_log_count(
         user_id=user_id,
-        username=username,
+        project_id=project_id,
         action=action,
         resource_type=resource_type,
         start_time=start_time,
@@ -80,8 +85,8 @@ async def get_my_audit_logs(
     end_time: Optional[datetime] = Query(None, description="结束时间"),
     skip: int = Query(0, ge=0),
     limit: int = Query(100, ge=1, le=1000),
-    current_user: UserInDB = Depends(get_current_admin),
-    audit_repo: AuditRepository = Depends(get_audit_repository)
+    current_user=Depends(get_current_metadata_user),
+    audit_repo: AuditRepository = Depends(get_audit_repository),
 ) -> List[AuditLogResponse]:
     """
     查询当前用户的审计日志

app/api/v1/endpoints/meta.py

@@ -0,0 +1,90 @@
+from fastapi import APIRouter, Depends, HTTPException, status
+from psycopg import AsyncConnection
+from sqlalchemy import text
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.auth.project_dependencies import (
+    ProjectContext,
+    get_project_context,
+    get_project_pg_session,
+    get_project_timescale_connection,
+    get_metadata_repository,
+)
+from app.auth.metadata_dependencies import get_current_metadata_user
+from app.core.config import settings
+from app.domain.schemas.metadata import (
+    GeoServerConfigResponse,
+    ProjectMetaResponse,
+    ProjectSummaryResponse,
+)
+from app.infra.repositories.metadata_repository import MetadataRepository
+
+router = APIRouter()
+
+
+@router.get("/meta/project", response_model=ProjectMetaResponse)
+async def get_project_metadata(
+    ctx: ProjectContext = Depends(get_project_context),
+    metadata_repo: MetadataRepository = Depends(get_metadata_repository),
+):
+    project = await metadata_repo.get_project_by_id(ctx.project_id)
+    if not project:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND, detail="Project not found"
+        )
+    geoserver = await metadata_repo.get_geoserver_config(ctx.project_id)
+    geoserver_payload = (
+        GeoServerConfigResponse(
+            gs_base_url=geoserver.gs_base_url,
+            gs_admin_user=geoserver.gs_admin_user,
+            gs_datastore_name=geoserver.gs_datastore_name,
+            default_extent=geoserver.default_extent,
+            srid=geoserver.srid,
+        )
+        if geoserver
+        else None
+    )
+    return ProjectMetaResponse(
+        project_id=project.id,
+        name=project.name,
+        code=project.code,
+        description=project.description,
+        gs_workspace=project.gs_workspace,
+        status=project.status,
+        project_role=ctx.project_role,
+        geoserver=geoserver_payload,
+    )
+
+
+@router.get("/meta/projects", response_model=list[ProjectSummaryResponse])
+async def list_user_projects(
+    current_user=Depends(get_current_metadata_user),
+    metadata_repo: MetadataRepository = Depends(get_metadata_repository),
+):
+    if settings.AUTH_DISABLED:
+        projects = await metadata_repo.list_all_projects()
+    else:
+        projects = await metadata_repo.list_projects_for_user(current_user.id)
+    return [
+        ProjectSummaryResponse(
+            project_id=project.project_id,
+            name=project.name,
+            code=project.code,
+            description=project.description,
+            gs_workspace=project.gs_workspace,
+            status=project.status,
+            project_role=project.project_role,
+        )
+        for project in projects
+    ]
+
+
+@router.get("/meta/db/health")
+async def project_db_health(
+    pg_session: AsyncSession = Depends(get_project_pg_session),
+    ts_conn: AsyncConnection = Depends(get_project_timescale_connection),
+):
+    await pg_session.execute(text("SELECT 1"))
+    async with ts_conn.cursor() as cur:
+        await cur.execute("SELECT 1")
+    return {"postgres": "ok", "timescale": "ok"}

app/api/v1/router.py

@@ -14,6 +14,7 @@ from app.api.v1.endpoints import (
     cache,
     user_management,  # 新增：用户管理
     audit,  # 新增：审计日志
+    meta,
 )
 from app.api.v1.endpoints.network import (
     general,
@@ -46,6 +47,7 @@ api_router = APIRouter()
 api_router.include_router(auth.router, prefix="/auth", tags=["Auth"])
 api_router.include_router(user_management.router, prefix="/users", tags=["User Management"])  # 新增
 api_router.include_router(audit.router, prefix="/audit", tags=["Audit Logs"])  # 新增
+api_router.include_router(meta.router, tags=["Metadata"])
 api_router.include_router(project.router, tags=["Project"])
 
 # Network Elements (Node/Link Types)