refactor: 重构查询参数处理逻辑,统一搜索参数处理

- 移除各模块查询schema中的自定义model_validator,统一通过search_to_dict处理搜索参数
- 为需要的字段添加json_schema_extra标记查询操作类型
- 重构base_crud的条件解析逻辑,支持直接处理普通字符串、数字类型参数
- 重构base_schema中的公共查询参数校验逻辑,简化时间范围和创建更新人参数处理
- 修复菜单查询的异步懒加载问题,添加多级预加载
- 调整日志打印配置,关闭uvicorn.access重复日志
- 修复前端路由跳转路径错误
- 调整弹窗宽度适配内容
- 修复测试环境限流器未注册问题
- 清理无用的导入和废弃函数
This commit is contained in:
zhangtao
2026-07-16 01:19:03 +08:00
parent 3f7d5aa4b9
commit f74b5f277e
63 changed files with 217 additions and 490 deletions
@@ -26,7 +26,7 @@ async def get_obj_list_controller(
auth: Annotated[AuthSchema, Security(AuthPermission(["module_system:position:query"]))],
db: Annotated[AsyncSession, Depends(db_getter)],
page: Annotated[PaginationQueryParam, Depends()],
search: Annotated[PositionQueryParam, Query(description="岗位查询参数")],
search: Annotated[PositionQueryParam, Query()],
) -> JSONResponse:
result_dict = await PositionService(auth, db).page(
page_no=page.page_no,
@@ -105,7 +105,7 @@ async def get_position_options_controller(
async def export_obj_list_controller(
auth: Annotated[AuthSchema, Security(AuthPermission(["module_system:position:export"]))],
db: Annotated[AsyncSession, Depends(db_getter)],
search: Annotated[PositionQueryParam, Query(description="岗位查询参数")],
search: Annotated[PositionQueryParam, Query()],
) -> StreamingResponse:
position_query_result = await PositionService(auth, db).get_list(search=search)
position_export_result = PositionService.export_list(position_list=[item.model_dump() for item in position_query_result])
@@ -1,6 +1,5 @@
from pydantic import BaseModel, ConfigDict, Field, field_validator, model_validator
from pydantic import BaseModel, ConfigDict, Field, field_validator
from app.common.enums import QueueEnum
from app.core.base_schema import BaseQueryParam, BaseSchema, TenantByQueryParam, TenantBySchema, UserByQueryParam, UserBySchema
@@ -50,13 +49,5 @@ class PositionOutSchema(PositionCreateSchema, BaseSchema, UserBySchema, TenantBy
class PositionQueryParam(BaseQueryParam, UserByQueryParam, TenantByQueryParam):
"""岗位管理查询参数"""
name: str | tuple[str, str] | None = Field(None, description="岗位名称")
status: int | tuple[str, int] | None = Field(None, ge=0, le=1, description="状态(0:启动 1:停用)")
@model_validator(mode="after")
def validate_query_params(self) -> "PositionQueryParam":
if isinstance(self.name, str):
self.name = (QueueEnum.like.value, self.name)
if isinstance(self.status, int):
self.status = (QueueEnum.eq.value, self.status)
return self
name: str | None = Field(None, description="岗位名称")
status: int | None = Field(None, ge=0, le=1, description="状态(0:启动 1:停用)")