mirror of
https://github.com/fastapiadmin/FastapiAdmin.git
synced 2026-09-21 12:52:26 +00:00
refactor: 重构查询参数模块,将param.py合并到schema.py中
feat: 为模型添加租户配额字段和字典表关联关系 fix: 修复部门树查询未应用租户隔离的问题 perf: 优化操作日志中间件的拦截逻辑和日志记录 style: 清理无用导入和重复代码 test: 添加基础测试文件 docs: 更新模型注释和字段说明
This commit is contained in:
@@ -11,7 +11,7 @@ from app.core.base_params import PaginationQueryParam
|
||||
from app.core.router_class import OperationLogRoute
|
||||
from app.core.logger import log
|
||||
|
||||
from .param import OnlineQueryParam
|
||||
from .schema import OnlineQueryParam
|
||||
from .service import OnlineService
|
||||
|
||||
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from typing import Optional
|
||||
from fastapi import Query
|
||||
|
||||
|
||||
class OnlineQueryParam:
|
||||
"""在线用户查询参数"""
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
name: Optional[str] = Query(None, description="登录名称"),
|
||||
ipaddr: Optional[str] = Query(None, description="登陆IP地址"),
|
||||
login_location: Optional[str] = Query(None, description="登录所属地"),
|
||||
) -> None:
|
||||
|
||||
# 模糊查询字段
|
||||
self.name = ("like", f"%{name}%") if name else None
|
||||
self.login_location = ("like", f"%{login_location}%") if login_location else None
|
||||
self.ipaddr = ("like", f"%{ipaddr}%") if ipaddr else None
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
from pydantic import BaseModel, ConfigDict, Field
|
||||
from typing import Optional
|
||||
from fastapi import Query
|
||||
|
||||
from app.core.validator import DateTimeStr
|
||||
|
||||
@@ -17,9 +18,26 @@ class OnlineOutSchema(BaseModel):
|
||||
session_id: str = Field(..., description='会话编号')
|
||||
user_id: int = Field(..., description='用户ID')
|
||||
user_name: str = Field(..., description='用户名')
|
||||
tenant_name: Optional[str] = Field(default=None, description='租户名称')
|
||||
ipaddr: Optional[str] = Field(default=None, description='登陆IP地址')
|
||||
login_location: Optional[str] = Field(default=None, description='登录所属地')
|
||||
os: Optional[str] = Field(default=None, description='操作系统')
|
||||
browser: Optional[str] = Field(default=None, description='浏览器')
|
||||
login_time: Optional[DateTimeStr] = Field(default=None, description='登录时间')
|
||||
login_type: Optional[str] = Field(default=None, description='登录类型 PC端 | 移动端')
|
||||
|
||||
|
||||
class OnlineQueryParam:
|
||||
"""在线用户查询参数"""
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
name: Optional[str] = Query(None, description="登录名称"),
|
||||
ipaddr: Optional[str] = Query(None, description="登陆IP地址"),
|
||||
login_location: Optional[str] = Query(None, description="登录所属地"),
|
||||
) -> None:
|
||||
|
||||
# 模糊查询字段
|
||||
self.name = ("like", f"%{name}%") if name else None
|
||||
self.login_location = ("like", f"%{login_location}%") if login_location else None
|
||||
self.ipaddr = ("like", f"%{ipaddr}%") if ipaddr else None
|
||||
|
||||
@@ -8,7 +8,8 @@ from app.common.enums import RedisInitKeyConfig
|
||||
from app.core.redis_crud import RedisCURD
|
||||
from app.core.security import decode_access_token
|
||||
from app.core.logger import log
|
||||
from .param import OnlineQueryParam
|
||||
|
||||
from .schema import OnlineQueryParam
|
||||
|
||||
|
||||
class OnlineService:
|
||||
|
||||
Reference in New Issue
Block a user