feat: restore source parity and harden agent runtime

2026-06-22 11:17:26 +08:00
parent e33f08277b
commit 0793eb82d6
596 changed files with 168879 additions and 290 deletions
@@ -0,0 +1,229 @@
+from typing import Optional
+from fastapi import APIRouter, Depends, HTTPException, Query, UploadFile, File
+from fastapi.responses import StreamingResponse
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.database import get_db
+from app.config import settings
+from app.base_schema import PaginatedResponse, ResponseModel
+from zq_demo.schema import DemoCreate, DemoUpdate, DemoResponse
+from zq_demo.service import DemoService
+from zq_demo.model import Demo
+
+router = APIRouter(prefix="/demos", tags=["Demo管理"])
+
+
+@router.post("", response_model=DemoResponse, summary="创建Demo")
+async def create_demo(demo: DemoCreate, db: AsyncSession = Depends(get_db)):
+    """
+    创建新Demo（自动记录创建人和部门）
+    - **title**: 标题
+    - **content**: 内容（可选）
+    - **status**: 状态（0=草稿，1=发布，2=归档）
+    - **priority**: 优先级（0=低，1=中，2=高）
+    - **is_active**: 是否激活（默认true）
+    """
+    # 检查标题唯一性
+    if not await DemoService.check_unique(db, field="title", value=demo.title):
+        raise HTTPException(status_code=400, detail="标题已存在")
+    
+    return await DemoService.create(db=db, data=demo)
+
+
+@router.get("", response_model=PaginatedResponse[DemoResponse], summary="获取Demo列表")
+async def get_demos(
+    page: int = Query(default=1, ge=1, description="页码"),
+    page_size: int = Query(default=settings.PAGE_SIZE, ge=1, le=settings.PAGE_MAX_SIZE, alias="pageSize", description="每页数量"),
+    title: Optional[str] = Query(None, description="标题（模糊搜索）"),
+    status: Optional[int] = Query(None, description="状态筛选"),
+    priority: Optional[int] = Query(None, description="优先级筛选"),
+    db: AsyncSession = Depends(get_db)
+):
+    """
+    获取Demo列表（分页，自动应用数据权限和字段权限）
+    
+    数据权限：根据用户角色自动过滤数据
+    - 超级管理员：查看所有数据
+    - 普通用户：根据角色配置的数据范围查看（本人/本部门/本部门及下级/全部）
+    
+    字段权限：根据角色配置隐藏/脱敏字段
+    - 必填字段（id、title、status）不会被隐藏
+    - 可选字段（content、priority等）可以根据配置隐藏
+    """
+    # 构建过滤条件
+    filters = []
+    if title:
+        filters.append(Demo.title.ilike(f"%{title}%"))
+    if status is not None:
+        filters.append(Demo.status == status)
+    if priority is not None:
+        filters.append(Demo.priority == priority)
+    
+    # 应用行权限（数据权限）- 自动根据用户角色过滤数据
+    items, total = await DemoService.get_list_with_data_scope(
+        db=db,
+        page=page,
+        page_size=page_size,
+        filters=filters
+    )
+    
+    # 转换为响应格式
+    response_items = [DemoResponse.model_validate(item) for item in items]
+    
+    # 应用列权限（字段权限）- 自动从上下文获取角色并过滤字段
+    response_dicts = [item.model_dump() for item in response_items]
+    filtered_items = await DemoService.apply_field_permissions_auto(
+        data=response_dicts,
+        db=db
+    )
+    
+    return PaginatedResponse(items=filtered_items, total=total)
+
+
+@router.get("/export/excel", summary="导出Excel")
+async def export_excel(db: AsyncSession = Depends(get_db)):
+    """
+    导出Demo数据到Excel（自动应用数据权限）
+    
+    只导出当前用户有权限查看的数据
+    """
+    output = await DemoService.export_to_excel_with_data_scope(
+        db=db,
+        data_converter=DemoService._export_converter
+    )
+    return StreamingResponse(
+        output,
+        media_type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+        headers={"Content-Disposition": "attachment; filename=demo_export.xlsx"}
+    )
+
+
+@router.get("/import/template", summary="下载导入模板")
+async def download_template():
+    """
+    下载Excel导入模板
+    """
+    output = DemoService.get_import_template()
+    return StreamingResponse(
+        output,
+        media_type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+        headers={"Content-Disposition": "attachment; filename=demo_template.xlsx"}
+    )
+
+
+@router.post("/import/excel", response_model=ResponseModel, summary="导入Excel")
+async def import_excel(
+    file: UploadFile = File(..., description="Excel文件(.xlsx)"),
+    db: AsyncSession = Depends(get_db)
+):
+    """
+    从Excel导入Demo数据
+    """
+    if not file.filename.endswith(".xlsx"):
+        raise HTTPException(status_code=400, detail="只支持.xlsx格式的Excel文件")
+    
+    content = await file.read()
+    success_count, fail_count = await DemoService.import_from_excel(db, content)
+    
+    return ResponseModel(
+        message=f"导入完成，成功{success_count}条，失败{fail_count}条",
+        data={"success": success_count, "fail": fail_count}
+    )
+
+
+@router.get("/check/unique", response_model=ResponseModel, summary="检查字段唯一性")
+async def check_unique(
+    field: str = Query(..., description="字段名，如title"),
+    value: str = Query(..., description="字段值"),
+    exclude_id: str = Query(default=None, alias="excludeId", description="排除的记录ID（更新时使用）"),
+    db: AsyncSession = Depends(get_db)
+):
+    """
+    检查字段值是否唯一
+    - **field**: 字段名（如 title）
+    - **value**: 要检查的值
+    - **excludeId**: 更新时排除自身的ID
+    
+    返回: {"unique": true/false}
+    """
+    # 限制可检查的字段，防止恶意查询
+    allowed_fields = ["title"]
+    if field not in allowed_fields:
+        raise HTTPException(status_code=400, detail=f"不支持检查字段: {field}，允许的字段: {allowed_fields}")
+    
+    is_unique = await DemoService.check_unique(db, field=field, value=value, exclude_id=exclude_id)
+    return ResponseModel(
+        message="字段值可用" if is_unique else "字段值已存在",
+        data={"unique": is_unique}
+    )
+
+
+@router.get("/{demo_id}", response_model=DemoResponse, summary="获取单个Demo")
+async def get_demo(demo_id: str, db: AsyncSession = Depends(get_db)):
+    """
+    根据Demo ID获取Demo详情（应用字段权限）
+    
+    字段权限：根据角色配置隐藏/脱敏字段
+    """
+    db_demo = await DemoService.get_by_id(db, record_id=demo_id)
+    if db_demo is None:
+        raise HTTPException(status_code=404, detail="Demo不存在")
+    
+    # 转换为响应格式
+    response = DemoResponse.model_validate(db_demo)
+    
+    # 应用列权限（字段权限）
+    response_dict = response.model_dump()
+    filtered_data = await DemoService.apply_field_permissions_auto(
+        data=response_dict,
+        db=db
+    )
+    
+    return filtered_data
+
+
+@router.put("/{demo_id}", response_model=DemoResponse, summary="全量更新Demo")
+async def update_demo(demo_id: str, demo: DemoUpdate, db: AsyncSession = Depends(get_db)):
+    """
+    全量更新Demo信息
+    """
+    # 检查标题唯一性（排除自身）
+    if demo.title and not await DemoService.check_unique(db, field="title", value=demo.title, exclude_id=demo_id):
+        raise HTTPException(status_code=400, detail="标题已存在")
+    
+    db_demo = await DemoService.update(db, record_id=demo_id, data=demo)
+    if db_demo is None:
+        raise HTTPException(status_code=404, detail="Demo不存在")
+    return db_demo
+
+
+@router.patch("/{demo_id}", response_model=DemoResponse, summary="部分更新Demo")
+async def patch_demo(demo_id: str, demo: DemoUpdate, db: AsyncSession = Depends(get_db)):
+    """
+    部分更新Demo信息（只更新传入的字段）
+    """
+    # 检查标题唯一性（排除自身）
+    if demo.title and not await DemoService.check_unique(db, field="title", value=demo.title, exclude_id=demo_id):
+        raise HTTPException(status_code=400, detail="标题已存在")
+    
+    db_demo = await DemoService.update(db, record_id=demo_id, data=demo)
+    if db_demo is None:
+        raise HTTPException(status_code=404, detail="Demo不存在")
+    return db_demo
+
+
+@router.delete("/{demo_id}", response_model=ResponseModel, summary="删除Demo")
+async def delete_demo(
+    demo_id: str,
+    hard: bool = Query(default=False, description="是否物理删除，False为逻辑删除，True为物理删除"),
+    db: AsyncSession = Depends(get_db)
+):
+    """
+    删除Demo
+    - **hard=false**: 逻辑删除（默认）
+    - **hard=true**: 物理删除
+    """
+    success = await DemoService.delete(db, record_id=demo_id, hard=hard)
+    if not success:
+        raise HTTPException(status_code=404, detail="Demo不存在")
+    return ResponseModel(message="删除成功")
@@ -0,0 +1,27 @@
+from sqlalchemy import Column, String, Text, Boolean, Integer
+
+from app.base_model import BaseModel
+
+
+class Demo(BaseModel):
+    """
+    Demo模型 - 演示数据权限和字段权限
+    
+    数据权限字段：
+    - sys_creator_id: 创建人ID（继承自BaseModel）
+    - sys_dept_id: 部门ID（继承自BaseModel）
+    
+    业务字段：
+    - title: 标题（必填，不可隐藏）
+    - content: 内容（可选，可隐藏）
+    - status: 状态（必填，不可隐藏）
+    - priority: 优先级（可选，可隐藏）
+    - is_active: 是否激活（可选，可隐藏）
+    """
+    __tablename__ = "demos"
+
+    title = Column(String(100), nullable=False, comment="标题")
+    content = Column(Text, nullable=True, comment="内容")
+    status = Column(Integer, default=1, comment="状态：0=草稿，1=发布，2=归档")
+    priority = Column(Integer, default=0, comment="优先级：0=低，1=中，2=高")
+    is_active = Column(Boolean, default=True, comment="是否激活")
@@ -0,0 +1,11 @@
+"""
+zq_demo模块统一路由
+"""
+from fastapi import APIRouter
+
+from zq_demo.api import router as demo_router
+
+router = APIRouter()
+
+# 注册子模块路由
+router.include_router(demo_router, prefix="", tags=["Demo"])
@@ -0,0 +1,100 @@
+from datetime import datetime
+from typing import Optional
+
+from pydantic import BaseModel, ConfigDict, field_validator
+
+from app.base_schema import CSTDatetime
+
+
+class DemoBase(BaseModel):
+    """Demo基础Schema"""
+    title: str
+    content: Optional[str] = None
+    status: int = 1
+    priority: int = 0
+    is_active: bool = True
+    
+    @field_validator("status")
+    @classmethod
+    def validate_status(cls, v):
+        """验证状态"""
+        if v not in [0, 1, 2]:
+            raise ValueError("状态必须为 0(草稿)、1(发布) 或 2(归档)")
+        return v
+    
+    @field_validator("priority")
+    @classmethod
+    def validate_priority(cls, v):
+        """验证优先级"""
+        if v not in [0, 1, 2]:
+            raise ValueError("优先级必须为 0(低)、1(中) 或 2(高)")
+        return v
+
+
+class DemoCreate(DemoBase):
+    """创建Demo的Schema"""
+    pass
+
+
+class DemoUpdate(BaseModel):
+    """更新Demo的Schema - 所有字段可选"""
+    title: Optional[str] = None
+    content: Optional[str] = None
+    status: Optional[int] = None
+    priority: Optional[int] = None
+    is_active: Optional[bool] = None
+    
+    @field_validator("status")
+    @classmethod
+    def validate_status(cls, v):
+        """验证状态"""
+        if v is not None and v not in [0, 1, 2]:
+            raise ValueError("状态必须为 0(草稿)、1(发布) 或 2(归档)")
+        return v
+    
+    @field_validator("priority")
+    @classmethod
+    def validate_priority(cls, v):
+        """验证优先级"""
+        if v is not None and v not in [0, 1, 2]:
+            raise ValueError("优先级必须为 0(低)、1(中) 或 2(高)")
+        return v
+
+
+class DemoResponse(BaseModel):
+    """
+    Demo响应Schema - 演示字段权限
+    
+    必填字段（不可隐藏）：
+    - id: 记录ID
+    - title: 标题
+    - status: 状态
+    
+    可选字段（可隐藏）：
+    - content: 内容
+    - priority: 优先级
+    - is_active: 是否激活
+    - sort: 排序
+    - is_deleted: 是否删除
+    - sys_create_datetime: 创建时间
+    - sys_update_datetime: 更新时间
+    - sys_creator_id: 创建人ID
+    - sys_dept_id: 部门ID
+    """
+    # 必填字段 - 前端不可隐藏
+    id: str
+    status: int
+    
+    # 可选字段 - 前端可以隐藏
+    title: Optional[str] = None
+    content: Optional[str] = None
+    priority: int = 0
+    is_active: bool = True
+    sort: Optional[int] = 0
+    is_deleted: Optional[bool] = False
+    sys_create_datetime: Optional[CSTDatetime] = None
+    sys_update_datetime: Optional[CSTDatetime] = None
+    sys_creator_id: Optional[str] = None
+    sys_dept_id: Optional[str] = None
+
+    model_config = ConfigDict(from_attributes=True)
@@ -0,0 +1,109 @@
+from io import BytesIO
+from typing import Tuple, Dict, Any, Optional
+
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.base_service import BaseService
+from app.field_metadata_generator import generate_field_metadata_from_schema
+from zq_demo.model import Demo
+from zq_demo.schema import DemoCreate, DemoUpdate, DemoResponse
+
+
+class DemoService(BaseService[Demo, DemoCreate, DemoUpdate]):
+    """
+    Demo服务层 - 演示数据权限和字段权限
+    
+    功能：
+    1. 数据权限（行权限）：根据用户角色过滤数据
+       - 使用 get_list_with_data_scope() 自动应用数据权限
+       - 支持本人、本部门、本部门及下级、全部等数据范围
+    
+    2. 字段权限（列权限）：根据角色配置隐藏/脱敏字段
+       - 使用 apply_field_permissions_auto() 自动应用字段权限
+       - 必填字段（id、title、status）不可隐藏
+       - 可选字段（content、priority等）可以隐藏
+    
+    3. Excel导入导出：支持带数据权限的导出
+       - 使用 export_to_excel_with_data_scope() 导出
+    """
+    
+    model = Demo
+    
+    # 资源显示名称（用于前端显示）
+    RESOURCE_DISPLAY_NAME = "Demo示例"
+    
+    # 从 Response Schema 生成字段元数据
+    # 必填字段会被标记为 required=True，前端禁止隐藏
+    FIELD_METADATA = generate_field_metadata_from_schema(DemoResponse, Demo)
+    
+    # Excel导入导出配置
+    excel_columns = {
+        "title": "标题",
+        "content": "内容",
+        "status": "状态",
+        "priority": "优先级",
+        "is_active": "是否激活",
+    }
+    excel_sheet_name = "Demo列表"
+    
+    @classmethod
+    def _export_converter(cls, item: Any) -> Dict[str, Any]:
+        """导出数据转换器"""
+        status_map = {0: "草稿", 1: "发布", 2: "归档"}
+        priority_map = {0: "低", 1: "中", 2: "高"}
+        
+        return {
+            "title": item.title,
+            "content": item.content or "",
+            "status": status_map.get(item.status, "未知"),
+            "priority": priority_map.get(item.priority, "未知"),
+            "is_active": "是" if item.is_active else "否",
+        }
+    
+    @classmethod
+    def _import_processor(cls, row: Dict[str, Any]) -> Optional[Demo]:
+        """导入数据处理器"""
+        title = row.get("title")
+        if not title:
+            return None
+        
+        # 状态转换
+        status_str = row.get("status", "发布")
+        status_map = {"草稿": 0, "发布": 1, "归档": 2}
+        status = status_map.get(status_str, 1)
+        
+        # 优先级转换
+        priority_str = row.get("priority", "低")
+        priority_map = {"低": 0, "中": 1, "高": 2}
+        priority = priority_map.get(priority_str, 0)
+        
+        # 是否激活转换
+        is_active_str = row.get("is_active", "是")
+        is_active = is_active_str in ("是", "true", "True", "1", True)
+        
+        return Demo(
+            title=str(title),
+            content=str(row.get("content") or ""),
+            status=status,
+            priority=priority,
+            is_active=is_active
+        )
+    
+    @classmethod
+    async def export_to_excel(
+        cls,
+        db: AsyncSession,
+        data_converter: Any = None
+    ) -> BytesIO:
+        """导出所有Demo到Excel"""
+        return await super().export_to_excel(db, cls._export_converter)
+    
+    @classmethod
+    async def import_from_excel(
+        cls,
+        db: AsyncSession,
+        file_content: bytes,
+        row_processor: Any = None
+    ) -> Tuple[int, int]:
+        """从Excel导入Demo"""
+        return await super().import_from_excel(db, file_content, cls._import_processor)