PowLu/RuoYi-Vue3-FastAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
insistence
2024-07-12 09:35:55 +08:00
parent bd242c95f7
commit 4a7c9367d4
5 changed files with 374 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

226
ruoyi-fastapi-backend/module_admin/dao/role_dao.py
View File

@@ -1,12 +1,12 @@
from sqlalchemy import select, update, delete, desc, and_, or_, func
from datetime import datetime, time
from sqlalchemy import and_, delete, desc, func, or_, select, update # noqa: F401
from sqlalchemy.ext.asyncio import AsyncSession
from module_admin.entity.do.user_do import SysUser, SysUserRole
from module_admin.entity.do.role_do import SysRole, SysRoleMenu, SysRoleDept
from module_admin.entity.do.dept_do import SysDept
from module_admin.entity.do.menu_do import SysMenu
from module_admin.entity.vo.role_vo import *
from module_admin.entity.do.role_do import SysRole, SysRoleMenu, SysRoleDept
from module_admin.entity.do.user_do import SysUser, SysUserRole
from module_admin.entity.vo.role_vo import RoleDeptModel, RoleMenuModel, RoleModel, RolePageQueryModel
from utils.page_util import PageUtil
from datetime import datetime, time
class RoleDao:
@@ -22,12 +22,18 @@ class RoleDao:
:param role_name: 角色名
:return: 当前角色名的角色信息对象
"""
query_role_info = (await db.execute(
select(SysRole)
.where(SysRole.status == '0', SysRole.del_flag == '0', SysRole.role_name == role_name)
.order_by(desc(SysRole.create_time))
.distinct()
)).scalars().first()
query_role_info = (
(
await db.execute(
select(SysRole)
.where(SysRole.status == '0', SysRole.del_flag == '0', SysRole.role_name == role_name)
.order_by(desc(SysRole.create_time))
.distinct()
)
)
.scalars()
.first()
)
return query_role_info
@@ -39,14 +45,22 @@ class RoleDao:
:param role: 角色参数
:return: 当前角色参数的角色信息对象
"""
query_role_info = (await db.execute(
select(SysRole)
.where(SysRole.del_flag == '0',
SysRole.role_name == role.role_name if role.role_name else True,
SysRole.role_key == role.role_key if role.role_key else True)
.order_by(desc(SysRole.create_time))
.distinct()
)).scalars().first()
query_role_info = (
(
await db.execute(
select(SysRole)
.where(
SysRole.del_flag == '0',
SysRole.role_name == role.role_name if role.role_name else True,
SysRole.role_key == role.role_key if role.role_key else True,
)
.order_by(desc(SysRole.create_time))
.distinct()
)
)
.scalars()
.first()
)
return query_role_info
@@ -58,12 +72,15 @@ class RoleDao:
:param role_id: 角色id
:return: 当前角色id的角色信息对象
"""
role_info = (await db.execute(
select(SysRole)
.where(SysRole.role_id == role_id,
SysRole.status == '0',
SysRole.del_flag == '0')
)).scalars().first()
role_info = (
(
await db.execute(
select(SysRole).where(SysRole.role_id == role_id, SysRole.status == '0', SysRole.del_flag == '0')
)
)
.scalars()
.first()
)
return role_info
@@ -75,11 +92,11 @@ class RoleDao:
:param role_id: 角色id
:return: 当前role_id的角色信息对象
"""
query_role_info = (await db.execute(
select(SysRole)
.where(SysRole.del_flag == '0', SysRole.role_id == role_id)
.distinct()
)).scalars().first()
query_role_info = (
(await db.execute(select(SysRole).where(SysRole.del_flag == '0', SysRole.role_id == role_id).distinct()))
.scalars()
.first()
)
return query_role_info
@@ -90,15 +107,22 @@ class RoleDao:
:param db: orm对象
:return: 角色列表信息
"""
role_info = (await db.execute(
select(SysRole)
.where(SysRole.role_id != 1, SysRole.status == '0', SysRole.del_flag == '0')
)).scalars().all()
role_info = (
(
await db.execute(
select(SysRole).where(SysRole.role_id != 1, SysRole.status == '0', SysRole.del_flag == '0')
)
)
.scalars()
.all()
)
return role_info
@classmethod
async def get_role_list(cls, db: AsyncSession, query_object: RolePageQueryModel, data_scope_sql: str, is_page: bool = False):
async def get_role_list(
cls, db: AsyncSession, query_object: RolePageQueryModel, data_scope_sql: str, is_page: bool = False
):
"""
根据查询参数获取角色列表信息
:param db: orm对象
@@ -107,21 +131,27 @@ class RoleDao:
:param is_page: 是否开启分页
:return: 角色列表信息对象
"""
query = select(SysRole) \
.join(SysUserRole, SysUserRole.role_id == SysRole.role_id, isouter=True) \
.join(SysUser, SysUser.user_id == SysUserRole.user_id, isouter=True) \
.join(SysDept, SysDept.dept_id == SysUser.dept_id, isouter=True) \
.where(SysRole.del_flag == '0',
SysRole.role_name.like(f'%{query_object.role_name}%') if query_object.role_name else True,
SysRole.role_key.like(f'%{query_object.role_key}%') if query_object.role_key else True,
SysRole.status == query_object.status if query_object.status else True,
SysRole.create_time.between(
datetime.combine(datetime.strptime(query_object.begin_time, '%Y-%m-%d'), time(00, 00, 00)),
datetime.combine(datetime.strptime(query_object.end_time, '%Y-%m-%d'), time(23, 59, 59)))
if query_object.begin_time and query_object.end_time else True,
eval(data_scope_sql)) \
.order_by(SysRole.role_sort) \
query = (
select(SysRole)
.join(SysUserRole, SysUserRole.role_id == SysRole.role_id, isouter=True)
.join(SysUser, SysUser.user_id == SysUserRole.user_id, isouter=True)
.join(SysDept, SysDept.dept_id == SysUser.dept_id, isouter=True)
.where(
SysRole.del_flag == '0',
SysRole.role_name.like(f'%{query_object.role_name}%') if query_object.role_name else True,
SysRole.role_key.like(f'%{query_object.role_key}%') if query_object.role_key else True,
SysRole.status == query_object.status if query_object.status else True,
SysRole.create_time.between(
datetime.combine(datetime.strptime(query_object.begin_time, '%Y-%m-%d'), time(00, 00, 00)),
datetime.combine(datetime.strptime(query_object.end_time, '%Y-%m-%d'), time(23, 59, 59)),
)
if query_object.begin_time and query_object.end_time
else True,
eval(data_scope_sql),
)
.order_by(SysRole.role_sort)
.distinct()
)
role_list = await PageUtil.paginate(db, query, query_object.page_num, query_object.page_size, is_page)
return role_list
@@ -148,10 +178,7 @@ class RoleDao:
:param role: 需要更新的角色字典
:return:
"""
await db.execute(
update(SysRole),
[role]
)
await db.execute(update(SysRole), [role])
@classmethod
async def delete_role_dao(cls, db: AsyncSession, role: RoleModel):
@@ -163,8 +190,8 @@ class RoleDao:
"""
await db.execute(
update(SysRole)
.where(SysRole.role_id == role.role_id)
.values(del_flag='2', update_by=role.update_by, update_time=role.update_time)
.where(SysRole.role_id == role.role_id)
.values(del_flag='2', update_by=role.update_by, update_time=role.update_time)
)
@classmethod
@@ -175,18 +202,30 @@ class RoleDao:
:param role: 角色对象
:return: 角色菜单关联列表信息
"""
role_menu_query_all = (await db.execute(
select(SysMenu)
.join(SysRoleMenu, SysRoleMenu.menu_id == SysMenu.menu_id)
.where(SysRoleMenu.role_id == role.role_id,
~SysMenu.menu_id.in_(
select(SysMenu.parent_id)
.select_from(SysMenu)
.join(SysRoleMenu,
and_(SysRoleMenu.menu_id == SysMenu.menu_id, SysRoleMenu.role_id == role.role_id))
) if role.menu_check_strictly else True)
.order_by(SysMenu.parent_id, SysMenu.order_num)
)).scalars().all()
role_menu_query_all = (
(
await db.execute(
select(SysMenu)
.join(SysRoleMenu, SysRoleMenu.menu_id == SysMenu.menu_id)
.where(
SysRoleMenu.role_id == role.role_id,
~SysMenu.menu_id.in_(
select(SysMenu.parent_id)
.select_from(SysMenu)
.join(
SysRoleMenu,
and_(SysRoleMenu.menu_id == SysMenu.menu_id, SysRoleMenu.role_id == role.role_id),
)
)
if role.menu_check_strictly
else True,
)
.order_by(SysMenu.parent_id, SysMenu.order_num)
)
)
.scalars()
.all()
)
return role_menu_query_all
@@ -209,10 +248,7 @@ class RoleDao:
:param role_menu: 角色菜单关联对象
:return:
"""
await db.execute(
delete(SysRoleMenu)
.where(SysRoleMenu.role_id.in_([role_menu.role_id]))
)
await db.execute(delete(SysRoleMenu).where(SysRoleMenu.role_id.in_([role_menu.role_id])))
@classmethod
async def get_role_dept_dao(cls, db: AsyncSession, role: RoleModel):
@@ -222,17 +258,30 @@ class RoleDao:
:param role: 角色对象
:return: 角色部门关联列表信息
"""
role_dept_query_all = (await db.execute(
select(SysDept)
.join(SysRoleDept, SysRoleDept.dept_id == SysDept.dept_id)
.where(SysRoleDept.role_id == role.role_id,
~SysDept.dept_id.in_(
select(SysDept.parent_id)
.select_from(SysDept)
.join(SysRoleDept, and_(SysRoleDept.dept_id == SysDept.dept_id, SysRoleDept.role_id == role.role_id))
) if role.dept_check_strictly else True)
.order_by(SysDept.parent_id, SysDept.order_num)
)).scalars().all()
role_dept_query_all = (
(
await db.execute(
select(SysDept)
.join(SysRoleDept, SysRoleDept.dept_id == SysDept.dept_id)
.where(
SysRoleDept.role_id == role.role_id,
~SysDept.dept_id.in_(
select(SysDept.parent_id)
.select_from(SysDept)
.join(
SysRoleDept,
and_(SysRoleDept.dept_id == SysDept.dept_id, SysRoleDept.role_id == role.role_id),
)
)
if role.dept_check_strictly
else True,
)
.order_by(SysDept.parent_id, SysDept.order_num)
)
)
.scalars()
.all()
)
return role_dept_query_all
@@ -255,10 +304,7 @@ class RoleDao:
:param role_dept: 角色部门关联对象
:return:
"""
await db.execute(
delete(SysRoleDept)
.where(SysRoleDept.role_id.in_([role_dept.role_id]))
)
await db.execute(delete(SysRoleDept).where(SysRoleDept.role_id.in_([role_dept.role_id])))
@classmethod
async def count_user_role_dao(cls, db: AsyncSession, role_id: int):
@@ -268,10 +314,8 @@ class RoleDao:
:param role_id: 角色id
:return: 角色关联用户数量
"""
user_count = (await db.execute(
select(func.count('*'))
.select_from(SysUserRole)
.where(SysUserRole.role_id == role_id)
)).scalar()
user_count = (
await db.execute(select(func.count('*')).select_from(SysUserRole).where(SysUserRole.role_id == role_id))
).scalar()
return user_count