Fix issues

Author: wu-clan

backend/app/admin/api/v1/sys/data_rule.py

@@ -4,7 +4,12 @@
 
 from fastapi import APIRouter, Depends, Path, Query
 
-from backend.app.admin.schema.data_rule import CreateDataRuleParam, GetDataRuleDetail, UpdateDataRuleParam
+from backend.app.admin.schema.data_rule import (
+    CreateDataRuleParam,
+    GetDataRuleColumnDetail,
+    GetDataRuleDetail,
+    UpdateDataRuleParam,
+)
 from backend.app.admin.service.data_rule_service import data_rule_service
 from backend.common.pagination import DependsPagination, PageData, paging_data
 from backend.common.response.response_schema import ResponseModel, ResponseSchemaModel, response_base
@@ -25,7 +30,7 @@ async def get_data_rule_models() -> ResponseSchemaModel[list[str]]:
 @router.get('/model/{model}/columns', summary='获取数据规则可用模型列', dependencies=[DependsJwtAuth])
 async def get_data_rule_model_columns(
     model: Annotated[str, Path(description='模型名称')],
-) -> ResponseSchemaModel[list[dict[str, str]]]:
+) -> ResponseSchemaModel[list[GetDataRuleColumnDetail]]:
     models = await data_rule_service.get_columns(model=model)
     return response_base.success(data=models)
 

backend/app/admin/api/v1/sys/data_scope.py

@@ -91,6 +91,7 @@ async def update_data_scope(
     summary='更新数据范围规则',
     dependencies=[
         Depends(RequestPermission('data:scope:rule:edit')),
+        DependsRBAC,
     ],
 )
 async def update_data_scope_rules(

backend/app/admin/schema/data_rule.py

@@ -35,3 +35,10 @@ class GetDataRuleDetail(DataRuleSchemaBase):
     id: int = Field(description='规则 ID')
     created_time: datetime = Field(description='创建时间')
     updated_time: datetime | None = Field(None, description='更新时间')
+
+
+class GetDataRuleColumnDetail(SchemaBase):
+    """数据规则可用模型字段详情"""
+
+    key: str = Field(description='字段名')
+    comment: str = Field(description='字段评论')

backend/app/admin/service/data_rule_service.py

@@ -6,7 +6,7 @@
 
 from backend.app.admin.crud.crud_data_rule import data_rule_dao
 from backend.app.admin.model import DataRule
-from backend.app.admin.schema.data_rule import CreateDataRuleParam, UpdateDataRuleParam
+from backend.app.admin.schema.data_rule import CreateDataRuleParam, GetDataRuleColumnDetail, UpdateDataRuleParam
 from backend.common.exception import errors
 from backend.core.conf import settings
 from backend.database.db import async_db_session
@@ -36,7 +36,7 @@ async def get_models() -> list[str]:
         return list(settings.DATA_PERMISSION_MODELS.keys())
 
     @staticmethod
-    async def get_columns(model: str) -> list[dict[str, str]]:
+    async def get_columns(model: str) -> list[GetDataRuleColumnDetail]:
         """
         获取数据规则可用模型的字段列表
 
@@ -48,7 +48,7 @@ async def get_columns(model: str) -> list[dict[str, str]]:
         model_ins = dynamic_import_data_model(settings.DATA_PERMISSION_MODELS[model])
 
         model_columns = [
-            {column.key: column.comment}
+            GetDataRuleColumnDetail(key=column.key, comment=column.comment)
             for column in model_ins.__table__.columns
             if column.key not in settings.DATA_PERMISSION_COLUMN_EXCLUDE
         ]

backend/common/security/permission.py

@@ -68,19 +68,27 @@ async def filter_data_permission(db: AsyncSession, request: Request) -> ColumnEl
                 data_scopes.append(scope)
 
     # 超级管理员和无规则用户不做过滤
-    # if request.user.is_superuser or not data_scopes:
-    #     return or_(1 == 1)
+    if request.user.is_superuser or not data_scopes:
+        return or_(1 == 1)
 
     # 获取数据范围规则
     data_rule_list: list[DataRule] = []
     for data_scope in data_scopes:
         data_scope_with_relation = await data_scope_dao.get_with_relation(db, data_scope.id)
         data_rule_list.extend(data_scope_with_relation.rules)
 
+    # 去重
+    seen_data_rule_ids = set()
+    new_data_rule_list = []
+    for rule in data_rule_list:
+        if rule.id not in seen_data_rule_ids:
+            seen_data_rule_ids.add(rule.id)
+            new_data_rule_list.append(rule)
+
     where_and_list = []
     where_or_list = []
 
-    for data_rule in data_rule_list:
+    for data_rule in new_data_rule_list:
         # 验证规则模型
         rule_model = data_rule.model
         if rule_model not in settings.DATA_PERMISSION_MODELS:

backend/utils/health_check.py

@@ -1,11 +1,17 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
+import asyncio
+import functools
+import time
+
 from math import ceil
+from typing import Any, Callable
 
 from fastapi import FastAPI, Request, Response
 from fastapi.routing import APIRoute
 
 from backend.common.exception import errors
+from backend.common.log import log
 
 
 def ensure_unique_route_names(app: FastAPI) -> None:
@@ -34,3 +40,34 @@ async def http_limit_callback(request: Request, response: Response, expire: int)
     """
     expires = ceil(expire / 1000)
     raise errors.HTTPError(code=429, msg='请求过于频繁，请稍后重试', headers={'Retry-After': str(expires)})
+
+
+def timer(func) -> Callable:
+    """函数耗时计时装饰器"""
+
+    @functools.wraps(func)
+    async def async_wrapper(*args, **kwargs) -> Any:
+        start_time = time.perf_counter()
+        result = await func(*args, **kwargs)
+        elapsed_seconds = time.perf_counter() - start_time
+        _log_time(func, elapsed_seconds)
+        return result
+
+    @functools.wraps(func)
+    def sync_wrapper(*args, **kwargs) -> Any:
+        start_time = time.perf_counter()
+        result = func(*args, **kwargs)
+        elapsed_seconds = time.perf_counter() - start_time
+        _log_time(func, elapsed_seconds)
+        return result
+
+    def _log_time(func, elapsed: float):
+        # 智能选择单位（秒、毫秒、微秒、纳秒）
+        if elapsed >= 1:
+            unit, factor = 's', 1
+        else:
+            unit, factor = 'ms', 1e3
+
+        log.info(f'{func.__module__}.{func.__name__} | {elapsed * factor:.3f} {unit}')
+
+    return async_wrapper if asyncio.iscoroutinefunction(func) else sync_wrapper