style: 使用ruff格式化日志管理模块，优化导入

2024-07-12 10:13:34 +08:00
parent 5891ec1930
commit ccb9e2a314
5 changed files with 218 additions and 120 deletions
--- a/ruoyi-fastapi-backend/module_admin/controller/log_controller.py
+++ b/ruoyi-fastapi-backend/module_admin/controller/log_controller.py
@@ -1,30 +1,47 @@
-from fastapi import APIRouter
-from fastapi import Depends
-from config.get_db import get_db
-from module_admin.service.login_service import LoginService
-from module_admin.service.log_service import *
-from module_admin.aspect.interface_auth import CheckUserInterfaceAuth
-from module_admin.annotation.log_annotation import log_decorator
+from fastapi import APIRouter, Depends, Request
+from sqlalchemy.ext.asyncio import AsyncSession
 from config.enums import BusinessType
-from utils.response_util import *
-from utils.log_util import *
-from utils.page_util import *
+from config.get_db import get_db
+from module_admin.annotation.log_annotation import log_decorator
+from module_admin.aspect.interface_auth import CheckUserInterfaceAuth
+from module_admin.entity.vo.log_vo import (
+    DeleteLoginLogModel,
+    DeleteOperLogModel,
+    LoginLogPageQueryModel,
+    OperLogPageQueryModel,
+    UnlockUser,
+)
+from module_admin.service.log_service import LoginLogService, OperationLogService
+from module_admin.service.login_service import LoginService
 from utils.common_util import bytes2file_response
+from utils.log_util import logger
+from utils.page_util import PageResponseModel
+from utils.response_util import ResponseUtil


 logController = APIRouter(prefix='/monitor', dependencies=[Depends(LoginService.get_current_user)])


-@logController.get("/operlog/list", response_model=PageResponseModel, dependencies=[Depends(CheckUserInterfaceAuth('monitor:operlog:list'))])
-async def get_system_operation_log_list(request: Request, operation_log_page_query: OperLogPageQueryModel = Depends(OperLogPageQueryModel.as_query), query_db: AsyncSession = Depends(get_db)):
+@logController.get(
+    '/operlog/list',
+    response_model=PageResponseModel,
+    dependencies=[Depends(CheckUserInterfaceAuth('monitor:operlog:list'))],
+)
+async def get_system_operation_log_list(
+    request: Request,
+    operation_log_page_query: OperLogPageQueryModel = Depends(OperLogPageQueryModel.as_query),
+    query_db: AsyncSession = Depends(get_db),
+):
    # 获取分页数据
-    operation_log_page_query_result = await OperationLogService.get_operation_log_list_services(query_db, operation_log_page_query, is_page=True)
+    operation_log_page_query_result = await OperationLogService.get_operation_log_list_services(
+        query_db, operation_log_page_query, is_page=True
+    )
    logger.info('获取成功')

    return ResponseUtil.success(model_content=operation_log_page_query_result)


-@logController.delete("/operlog/clean", dependencies=[Depends(CheckUserInterfaceAuth('monitor:operlog:remove'))])
+@logController.delete('/operlog/clean', dependencies=[Depends(CheckUserInterfaceAuth('monitor:operlog:remove'))])
@log_decorator(title='操作日志管理', business_type=BusinessType.CLEAN)
 async def clear_system_operation_log(request: Request, query_db: AsyncSession = Depends(get_db)):
    clear_operation_log_result = await OperationLogService.clear_operation_log_services(query_db)
@@ -33,37 +50,57 @@ async def clear_system_operation_log(request: Request, query_db: AsyncSession =
    return ResponseUtil.success(msg=clear_operation_log_result.message)


-@logController.delete("/operlog/{oper_ids}", dependencies=[Depends(CheckUserInterfaceAuth('monitor:operlog:remove'))])
+@logController.delete('/operlog/{oper_ids}', dependencies=[Depends(CheckUserInterfaceAuth('monitor:operlog:remove'))])
@log_decorator(title='操作日志管理', business_type=BusinessType.DELETE)
 async def delete_system_operation_log(request: Request, oper_ids: str, query_db: AsyncSession = Depends(get_db)):
    delete_operation_log = DeleteOperLogModel(operIds=oper_ids)
-    delete_operation_log_result = await OperationLogService.delete_operation_log_services(query_db, delete_operation_log)
+    delete_operation_log_result = await OperationLogService.delete_operation_log_services(
+        query_db, delete_operation_log
+    )
    logger.info(delete_operation_log_result.message)

    return ResponseUtil.success(msg=delete_operation_log_result.message)


-@logController.post("/operlog/export", dependencies=[Depends(CheckUserInterfaceAuth('monitor:operlog:export'))])
+@logController.post('/operlog/export', dependencies=[Depends(CheckUserInterfaceAuth('monitor:operlog:export'))])
@log_decorator(title='操作日志管理', business_type=BusinessType.EXPORT)
-async def export_system_operation_log_list(request: Request, operation_log_page_query: OperLogPageQueryModel = Depends(OperLogPageQueryModel.as_form), query_db: AsyncSession = Depends(get_db)):
+async def export_system_operation_log_list(
+    request: Request,
+    operation_log_page_query: OperLogPageQueryModel = Depends(OperLogPageQueryModel.as_form),
+    query_db: AsyncSession = Depends(get_db),
+):
    # 获取全量数据
-    operation_log_query_result = await OperationLogService.get_operation_log_list_services(query_db, operation_log_page_query, is_page=False)
-    operation_log_export_result = await OperationLogService.export_operation_log_list_services(request, operation_log_query_result)
+    operation_log_query_result = await OperationLogService.get_operation_log_list_services(
+        query_db, operation_log_page_query, is_page=False
+    )
+    operation_log_export_result = await OperationLogService.export_operation_log_list_services(
+        request, operation_log_query_result
+    )
    logger.info('导出成功')

    return ResponseUtil.streaming(data=bytes2file_response(operation_log_export_result))


-@logController.get("/logininfor/list", response_model=PageResponseModel, dependencies=[Depends(CheckUserInterfaceAuth('monitor:logininfor:list'))])
-async def get_system_login_log_list(request: Request, login_log_page_query: LoginLogPageQueryModel = Depends(LoginLogPageQueryModel.as_query), query_db: AsyncSession = Depends(get_db)):
+@logController.get(
+    '/logininfor/list',
+    response_model=PageResponseModel,
+    dependencies=[Depends(CheckUserInterfaceAuth('monitor:logininfor:list'))],
+)
+async def get_system_login_log_list(
+    request: Request,
+    login_log_page_query: LoginLogPageQueryModel = Depends(LoginLogPageQueryModel.as_query),
+    query_db: AsyncSession = Depends(get_db),
+):
    # 获取分页数据
-    login_log_page_query_result = await LoginLogService.get_login_log_list_services(query_db, login_log_page_query, is_page=True)
+    login_log_page_query_result = await LoginLogService.get_login_log_list_services(
+        query_db, login_log_page_query, is_page=True
+    )
    logger.info('获取成功')

    return ResponseUtil.success(model_content=login_log_page_query_result)


-@logController.delete("/logininfor/clean", dependencies=[Depends(CheckUserInterfaceAuth('monitor:logininfor:remove'))])
+@logController.delete('/logininfor/clean', dependencies=[Depends(CheckUserInterfaceAuth('monitor:logininfor:remove'))])
@log_decorator(title='登录日志管理', business_type=BusinessType.CLEAN)
 async def clear_system_login_log(request: Request, query_db: AsyncSession = Depends(get_db)):
    clear_login_log_result = await LoginLogService.clear_login_log_services(query_db)
@@ -72,7 +109,9 @@ async def clear_system_login_log(request: Request, query_db: AsyncSession = Depe
    return ResponseUtil.success(msg=clear_login_log_result.message)


-@logController.delete("/logininfor/{info_ids}", dependencies=[Depends(CheckUserInterfaceAuth('monitor:logininfor:remove'))])
+@logController.delete(
+    '/logininfor/{info_ids}', dependencies=[Depends(CheckUserInterfaceAuth('monitor:logininfor:remove'))]
+)
@log_decorator(title='登录日志管理', business_type=BusinessType.DELETE)
 async def delete_system_login_log(request: Request, info_ids: str, query_db: AsyncSession = Depends(get_db)):
    delete_login_log = DeleteLoginLogModel(infoIds=info_ids)
@@ -82,9 +121,11 @@ async def delete_system_login_log(request: Request, info_ids: str, query_db: Asy
    return ResponseUtil.success(msg=delete_login_log_result.message)


-@logController.get("/logininfor/unlock/{user_name}", dependencies=[Depends(CheckUserInterfaceAuth('monitor:logininfor:unlock'))])
+@logController.get(
+    '/logininfor/unlock/{user_name}', dependencies=[Depends(CheckUserInterfaceAuth('monitor:logininfor:unlock'))]
+)
@log_decorator(title='登录日志管理', business_type=BusinessType.OTHER)
-async def clear_system_login_log(request: Request, user_name: str, query_db: AsyncSession = Depends(get_db)):
+async def unlock_system_user(request: Request, user_name: str, query_db: AsyncSession = Depends(get_db)):
    unlock_user = UnlockUser(userName=user_name)
    unlock_user_result = await LoginLogService.unlock_user_services(request, unlock_user)
    logger.info(unlock_user_result.message)
@@ -92,11 +133,17 @@ async def clear_system_login_log(request: Request, user_name: str, query_db: Asy
    return ResponseUtil.success(msg=unlock_user_result.message)


-@logController.post("/logininfor/export", dependencies=[Depends(CheckUserInterfaceAuth('monitor:logininfor:export'))])
+@logController.post('/logininfor/export', dependencies=[Depends(CheckUserInterfaceAuth('monitor:logininfor:export'))])
@log_decorator(title='登录日志管理', business_type=BusinessType.EXPORT)
-async def export_system_login_log_list(request: Request, login_log_page_query: LoginLogPageQueryModel = Depends(LoginLogPageQueryModel.as_form), query_db: AsyncSession = Depends(get_db)):
+async def export_system_login_log_list(
+    request: Request,
+    login_log_page_query: LoginLogPageQueryModel = Depends(LoginLogPageQueryModel.as_form),
+    query_db: AsyncSession = Depends(get_db),
+):
    # 获取全量数据
-    login_log_query_result = await LoginLogService.get_login_log_list_services(query_db, login_log_page_query, is_page=False)
+    login_log_query_result = await LoginLogService.get_login_log_list_services(
+        query_db, login_log_page_query, is_page=False
+    )
    login_log_export_result = await LoginLogService.export_login_log_list_services(login_log_query_result)
    logger.info('导出成功')