mirror of
https://github.com/insistence/RuoYi-Vue3-FastAPI.git
synced 2026-09-28 15:09:58 +00:00
* perf: 优化代码 * perf: 优化字典类型属性提醒说明 * perf: 优化顶部导航更多菜单路由截取 * perf: 优化RightToolbar搜索栏切换动画 * perf: 优化操作日志详细页面 * feat: 新增锁定屏幕功能 * feat: 字典类型列表新增抽屉效果详细信息 * perf: 优化页签功能&支持全屏按钮操作 * perf: 优化tag全屏为页签内区域 * perf: 菜单搜索支持文本高亮&数量提示 * feat: 添加持久化标签页开关功能 * perf: 优化页签显示 * perf: 优化菜单主题风格 * perf: 黑暗模式下全屏不需要设置背景 * perf: 暗黑浅色主题优化 * perf: 优化快速点击页签刷新出现404问题 * feat: 支持表格列显隐状态记忆 * feat: 代码生成支持表单布局选项 * feat: 新增树分割组件TreePanel * feat: 新增Excel导入组件ExcelImportDialog * perf: 优化样式 * feat: 用户列表新增抽屉效果详细信息 * perf: 代码生成修改拖拽时显示手指样式 * perf: 优化登录页暗黑模式下样式 * feat: 新增标签页样式chrome风格 * perf: 优化白名单支持对通配符路径匹配 * feat: 新增菜单路由地址和名称的校验规则 * feat: 首页新增通知公告消息提醒 * perf&feat: 优化定时任务详情页展示&补充执行时间字段 * feat: 部门管理支持批量保存排序 * feat: 菜单管理支持批量保存排序 * perf: 优化点击任务名称查看详细 * feat: 菜单管理列表新增类型显示 * feat: 新增代码生成详情页功能 * perf: 优化样式 * feat: 通知公告新增详细显示 * feat: 通知公告新增阅读用户列表 * perf: 更换router4过期方法next * perf: 优化暗黑模式下主题样式 * perf: 优化暗黑模式详情样式 * feat: 用户密码支持自定义配置规则 * fix: 修复E2E测试失败的问题
202 lines
8.1 KiB
Python
202 lines
8.1 KiB
Python
from datetime import datetime
|
|
from typing import Annotated
|
|
|
|
from fastapi import Path, Query, Request, Response
|
|
from pydantic_validation_decorator import ValidateFields
|
|
from sqlalchemy import ColumnElement
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
from common.annotation.cache_annotation import ApiCache, ApiCacheEvict
|
|
from common.annotation.log_annotation import Log
|
|
from common.aspect.data_scope import DataScopeDependency
|
|
from common.aspect.db_seesion import DBSessionDependency
|
|
from common.aspect.interface_auth import UserInterfaceAuthDependency
|
|
from common.aspect.pre_auth import CurrentUserDependency, PreAuthDependency
|
|
from common.constant import ApiGroup, ApiNamespace
|
|
from common.enums import BusinessType
|
|
from common.router import APIRouterPro
|
|
from common.vo import DataResponseModel, ResponseBaseModel
|
|
from module_admin.entity.do.dept_do import SysDept
|
|
from module_admin.entity.vo.dept_vo import DeleteDeptModel, DeptModel, DeptQueryModel, DeptSortModel
|
|
from module_admin.entity.vo.user_vo import CurrentUserModel
|
|
from module_admin.service.dept_service import DeptService
|
|
from utils.log_util import logger
|
|
from utils.response_util import ResponseUtil
|
|
|
|
dept_controller = APIRouterPro(
|
|
prefix='/system/dept', order_num=6, tags=['系统管理-部门管理'], dependencies=[PreAuthDependency()]
|
|
)
|
|
|
|
|
|
@dept_controller.get(
|
|
'/list/exclude/{dept_id}',
|
|
summary='获取编辑部门的下拉树接口',
|
|
description='用于获取部门下拉树,不包含指定部门及其子部门',
|
|
response_model=DataResponseModel[list[DeptModel]],
|
|
dependencies=[UserInterfaceAuthDependency('system:dept:list')],
|
|
)
|
|
@ApiCache(namespace=ApiNamespace.SYSTEM_DEPT_EDIT_TREE)
|
|
async def get_system_dept_tree_for_edit_option(
|
|
request: Request,
|
|
dept_id: Annotated[int, Path(description='部门id')],
|
|
query_db: Annotated[AsyncSession, DBSessionDependency()],
|
|
data_scope_sql: Annotated[ColumnElement, DataScopeDependency(SysDept)],
|
|
) -> Response:
|
|
dept_query = DeptModel(deptId=dept_id)
|
|
dept_query_result = await DeptService.get_dept_for_edit_option_services(query_db, dept_query, data_scope_sql)
|
|
logger.info('获取成功')
|
|
|
|
return ResponseUtil.success(data=dept_query_result)
|
|
|
|
|
|
@dept_controller.get(
|
|
'/list',
|
|
summary='获取部门列表接口',
|
|
description='用于获取部门列表',
|
|
response_model=DataResponseModel[list[DeptModel]],
|
|
dependencies=[UserInterfaceAuthDependency('system:dept:list')],
|
|
)
|
|
@ApiCache(namespace=ApiNamespace.SYSTEM_DEPT_LIST)
|
|
async def get_system_dept_list(
|
|
request: Request,
|
|
dept_query: Annotated[DeptQueryModel, Query()],
|
|
query_db: Annotated[AsyncSession, DBSessionDependency()],
|
|
data_scope_sql: Annotated[ColumnElement, DataScopeDependency(SysDept)],
|
|
) -> Response:
|
|
dept_query_result = await DeptService.get_dept_list_services(query_db, dept_query, data_scope_sql)
|
|
logger.info('获取成功')
|
|
|
|
return ResponseUtil.success(data=dept_query_result)
|
|
|
|
|
|
@dept_controller.post(
|
|
'',
|
|
summary='新增部门接口',
|
|
description='用于新增部门',
|
|
response_model=ResponseBaseModel,
|
|
dependencies=[UserInterfaceAuthDependency('system:dept:add')],
|
|
)
|
|
@ValidateFields(validate_model='add_dept')
|
|
@ApiCacheEvict(namespaces=ApiGroup.DATA_SCOPE_MUTATION)
|
|
@Log(title='部门管理', business_type=BusinessType.INSERT)
|
|
async def add_system_dept(
|
|
request: Request,
|
|
add_dept: DeptModel,
|
|
query_db: Annotated[AsyncSession, DBSessionDependency()],
|
|
current_user: Annotated[CurrentUserModel, CurrentUserDependency()],
|
|
) -> Response:
|
|
add_dept.create_by = current_user.user.user_name
|
|
add_dept.create_time = datetime.now()
|
|
add_dept.update_by = current_user.user.user_name
|
|
add_dept.update_time = datetime.now()
|
|
add_dept_result = await DeptService.add_dept_services(query_db, add_dept)
|
|
logger.info(add_dept_result.message)
|
|
|
|
return ResponseUtil.success(msg=add_dept_result.message)
|
|
|
|
|
|
@dept_controller.put(
|
|
'',
|
|
summary='编辑部门接口',
|
|
description='用于编辑部门',
|
|
response_model=ResponseBaseModel,
|
|
dependencies=[UserInterfaceAuthDependency('system:dept:edit')],
|
|
)
|
|
@ValidateFields(validate_model='edit_dept')
|
|
@ApiCacheEvict(namespaces=ApiGroup.DATA_SCOPE_MUTATION)
|
|
@Log(title='部门管理', business_type=BusinessType.UPDATE)
|
|
async def edit_system_dept(
|
|
request: Request,
|
|
edit_dept: DeptModel,
|
|
query_db: Annotated[AsyncSession, DBSessionDependency()],
|
|
current_user: Annotated[CurrentUserModel, CurrentUserDependency()],
|
|
data_scope_sql: Annotated[ColumnElement, DataScopeDependency(SysDept)],
|
|
) -> Response:
|
|
if not current_user.user.admin:
|
|
await DeptService.check_dept_data_scope_services(query_db, edit_dept.dept_id, data_scope_sql)
|
|
edit_dept.update_by = current_user.user.user_name
|
|
edit_dept.update_time = datetime.now()
|
|
edit_dept_result = await DeptService.edit_dept_services(query_db, edit_dept)
|
|
logger.info(edit_dept_result.message)
|
|
|
|
return ResponseUtil.success(msg=edit_dept_result.message)
|
|
|
|
|
|
@dept_controller.put(
|
|
'/updateSort',
|
|
summary='保存部门排序接口',
|
|
description='用于批量保存部门显示顺序',
|
|
response_model=ResponseBaseModel,
|
|
dependencies=[UserInterfaceAuthDependency('system:dept:edit')],
|
|
)
|
|
@ApiCacheEvict(namespaces=ApiGroup.DATA_SCOPE_MUTATION)
|
|
@Log(title='保存部门排序', business_type=BusinessType.UPDATE)
|
|
async def update_system_dept_sort(
|
|
request: Request,
|
|
dept_sort: DeptSortModel,
|
|
query_db: Annotated[AsyncSession, DBSessionDependency()],
|
|
current_user: Annotated[CurrentUserModel, CurrentUserDependency()],
|
|
data_scope_sql: Annotated[ColumnElement, DataScopeDependency(SysDept)],
|
|
) -> Response:
|
|
update_sort_result = await DeptService.update_dept_sort_services(
|
|
query_db,
|
|
dept_sort,
|
|
None if current_user.user.admin else data_scope_sql,
|
|
)
|
|
logger.info(update_sort_result.message)
|
|
|
|
return ResponseUtil.success(msg=update_sort_result.message)
|
|
|
|
|
|
@dept_controller.delete(
|
|
'/{dept_ids}',
|
|
summary='删除部门接口',
|
|
description='用于删除部门',
|
|
response_model=ResponseBaseModel,
|
|
dependencies=[UserInterfaceAuthDependency('system:dept:remove')],
|
|
)
|
|
@ApiCacheEvict(namespaces=ApiGroup.DATA_SCOPE_MUTATION)
|
|
@Log(title='部门管理', business_type=BusinessType.DELETE)
|
|
async def delete_system_dept(
|
|
request: Request,
|
|
dept_ids: Annotated[str, Path(description='需要删除的部门id')],
|
|
query_db: Annotated[AsyncSession, DBSessionDependency()],
|
|
current_user: Annotated[CurrentUserModel, CurrentUserDependency()],
|
|
data_scope_sql: Annotated[ColumnElement, DataScopeDependency(SysDept)],
|
|
) -> Response:
|
|
dept_id_list = dept_ids.split(',') if dept_ids else []
|
|
if dept_id_list:
|
|
for dept_id in dept_id_list:
|
|
if not current_user.user.admin:
|
|
await DeptService.check_dept_data_scope_services(query_db, int(dept_id), data_scope_sql)
|
|
delete_dept = DeleteDeptModel(deptIds=dept_ids)
|
|
delete_dept.update_by = current_user.user.user_name
|
|
delete_dept.update_time = datetime.now()
|
|
delete_dept_result = await DeptService.delete_dept_services(query_db, delete_dept)
|
|
logger.info(delete_dept_result.message)
|
|
|
|
return ResponseUtil.success(msg=delete_dept_result.message)
|
|
|
|
|
|
@dept_controller.get(
|
|
'/{dept_id}',
|
|
summary='获取部门详情接口',
|
|
description='用于获取指定部门的详情信息',
|
|
response_model=DataResponseModel[DeptModel],
|
|
dependencies=[UserInterfaceAuthDependency('system:dept:query')],
|
|
)
|
|
@ApiCache(namespace=ApiNamespace.SYSTEM_DEPT_DETAIL)
|
|
async def query_detail_system_dept(
|
|
request: Request,
|
|
dept_id: Annotated[int, Path(description='部门id')],
|
|
query_db: Annotated[AsyncSession, DBSessionDependency()],
|
|
current_user: Annotated[CurrentUserModel, CurrentUserDependency()],
|
|
data_scope_sql: Annotated[ColumnElement, DataScopeDependency(SysDept)],
|
|
) -> Response:
|
|
if not current_user.user.admin:
|
|
await DeptService.check_dept_data_scope_services(query_db, dept_id, data_scope_sql)
|
|
detail_dept_result = await DeptService.dept_detail_services(query_db, dept_id)
|
|
logger.info(f'获取dept_id为{dept_id}的信息成功')
|
|
|
|
return ResponseUtil.success(data=detail_dept_result)
|