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-11 22:24:58 +08:00
parent 5ae234714f
commit 40a8c73461
4 changed files with 672 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

528
ruoyi-fastapi-backend/module_admin/dao/user_dao.py
View File

@@ -1,13 +1,20 @@
from sqlalchemy import select, update, delete, and_, or_, desc, func
from sqlalchemy.ext.asyncio import AsyncSession
from module_admin.entity.do.user_do import SysUser, SysUserRole, SysUserPost
from module_admin.entity.do.role_do import SysRole, SysRoleDept, SysRoleMenu
from module_admin.entity.do.dept_do import SysDept
from module_admin.entity.do.post_do import SysPost
from module_admin.entity.do.menu_do import SysMenu
from module_admin.entity.vo.user_vo import *
from utils.page_util import PageUtil
from datetime import datetime, time
from sqlalchemy import and_, delete, desc, func, or_, select, update
from sqlalchemy.ext.asyncio import AsyncSession
from module_admin.entity.do.dept_do import SysDept
from module_admin.entity.do.menu_do import SysMenu
from module_admin.entity.do.post_do import SysPost
from module_admin.entity.do.role_do import SysRole, SysRoleDept, SysRoleMenu # noqa: F401
from module_admin.entity.do.user_do import SysUser, SysUserPost, SysUserRole
from module_admin.entity.vo.user_vo import (
UserModel,
UserPageQueryModel,
UserPostModel,
UserRoleModel,
UserRolePageQueryModel,
UserRoleQueryModel,
)
from utils.page_util import PageUtil
class UserDao:
@@ -23,12 +30,18 @@ class UserDao:
:param user_name: 用户名
:return: 当前用户名的用户信息对象
"""
query_user_info = (await db.execute(
select(SysUser)
.where(SysUser.status == '0', SysUser.del_flag == '0', SysUser.user_name == user_name)
.order_by(desc(SysUser.create_time))
.distinct()
)).scalars().first()
query_user_info = (
(
await db.execute(
select(SysUser)
.where(SysUser.status == '0', SysUser.del_flag == '0', SysUser.user_name == user_name)
.order_by(desc(SysUser.create_time))
.distinct()
)
)
.scalars()
.first()
)
return query_user_info
@@ -40,15 +53,23 @@ class UserDao:
:param user: 用户参数
:return: 当前用户参数的用户信息对象
"""
query_user_info = (await db.execute(
select(SysUser)
.where(SysUser.del_flag == '0',
SysUser.user_name == user.user_name if user.user_name else True,
SysUser.phonenumber == user.phonenumber if user.phonenumber else True,
SysUser.email == user.email if user.email else True)
.order_by(desc(SysUser.create_time))
.distinct()
)).scalars().first()
query_user_info = (
(
await db.execute(
select(SysUser)
.where(
SysUser.del_flag == '0',
SysUser.user_name == user.user_name if user.user_name else True,
SysUser.phonenumber == user.phonenumber if user.phonenumber else True,
SysUser.email == user.email if user.email else True,
)
.order_by(desc(SysUser.create_time))
.distinct()
)
)
.scalars()
.first()
)
return query_user_info
@@ -60,62 +81,100 @@ class UserDao:
:param user_id: 用户id
:return: 当前user_id的用户信息对象
"""
query_user_basic_info = (await db.execute(
select(SysUser)
.where(SysUser.status == '0', SysUser.del_flag == '0', SysUser.user_id == user_id)
.distinct()
)).scalars().first()
query_user_dept_info = (await db.execute(
select(SysDept)
.select_from(SysUser)
.where(SysUser.status == '0', SysUser.del_flag == '0', SysUser.user_id == user_id)
.join(SysDept, and_(SysUser.dept_id == SysDept.dept_id, SysDept.status == '0', SysDept.del_flag == '0'))
.distinct()
)).scalars().first()
query_user_role_info = (await db.execute(
select(SysRole)
.select_from(SysUser)
.where(SysUser.status == '0', SysUser.del_flag == '0', SysUser.user_id == user_id)
.join(SysUserRole, SysUser.user_id == SysUserRole.user_id, isouter=True)
.join(SysRole, and_(SysUserRole.role_id == SysRole.role_id, SysRole.status == '0', SysRole.del_flag == '0'))
.distinct()
)).scalars().all()
query_user_post_info = (await db.execute(
select(SysPost)
.select_from(SysUser)
.where(SysUser.status == '0', SysUser.del_flag == '0', SysUser.user_id == user_id)
.join(SysUserPost, SysUser.user_id == SysUserPost.user_id, isouter=True)
.join(SysPost, and_(SysUserPost.post_id == SysPost.post_id, SysPost.status == '0'))
.distinct()
)).scalars().all()
role_id_list = [item.role_id for item in query_user_role_info]
if 1 in role_id_list:
query_user_menu_info = (await db.execute(
select(SysMenu)
.where(SysMenu.status == '0')
query_user_basic_info = (
(
await db.execute(
select(SysUser)
.where(SysUser.status == '0', SysUser.del_flag == '0', SysUser.user_id == user_id)
.distinct()
)).scalars().all()
else:
query_user_menu_info = (await db.execute(
select(SysMenu)
)
)
.scalars()
.first()
)
query_user_dept_info = (
(
await db.execute(
select(SysDept)
.select_from(SysUser)
.where(SysUser.status == '0', SysUser.del_flag == '0', SysUser.user_id == user_id)
.join(
SysDept,
and_(SysUser.dept_id == SysDept.dept_id, SysDept.status == '0', SysDept.del_flag == '0'),
)
.distinct()
)
)
.scalars()
.first()
)
query_user_role_info = (
(
await db.execute(
select(SysRole)
.select_from(SysUser)
.where(SysUser.status == '0', SysUser.del_flag == '0', SysUser.user_id == user_id)
.join(SysUserRole, SysUser.user_id == SysUserRole.user_id, isouter=True)
.join(SysRole,
and_(SysUserRole.role_id == SysRole.role_id, SysRole.status == '0', SysRole.del_flag == '0'),
isouter=True)
.join(SysRoleMenu, SysRole.role_id == SysRoleMenu.role_id, isouter=True)
.join(SysMenu, and_(SysRoleMenu.menu_id == SysMenu.menu_id, SysMenu.status == '0'))
.order_by(SysMenu.order_num)
.join(
SysRole,
and_(SysUserRole.role_id == SysRole.role_id, SysRole.status == '0', SysRole.del_flag == '0'),
)
.distinct()
)).scalars().all()
)
)
.scalars()
.all()
)
query_user_post_info = (
(
await db.execute(
select(SysPost)
.select_from(SysUser)
.where(SysUser.status == '0', SysUser.del_flag == '0', SysUser.user_id == user_id)
.join(SysUserPost, SysUser.user_id == SysUserPost.user_id, isouter=True)
.join(SysPost, and_(SysUserPost.post_id == SysPost.post_id, SysPost.status == '0'))
.distinct()
)
)
.scalars()
.all()
)
role_id_list = [item.role_id for item in query_user_role_info]
if 1 in role_id_list:
query_user_menu_info = (
(await db.execute(select(SysMenu).where(SysMenu.status == '0').distinct())).scalars().all()
)
else:
query_user_menu_info = (
(
await db.execute(
select(SysMenu)
.select_from(SysUser)
.where(SysUser.status == '0', SysUser.del_flag == '0', SysUser.user_id == user_id)
.join(SysUserRole, SysUser.user_id == SysUserRole.user_id, isouter=True)
.join(
SysRole,
and_(
SysUserRole.role_id == SysRole.role_id, SysRole.status == '0', SysRole.del_flag == '0'
),
isouter=True,
)
.join(SysRoleMenu, SysRole.role_id == SysRoleMenu.role_id, isouter=True)
.join(SysMenu, and_(SysRoleMenu.menu_id == SysMenu.menu_id, SysMenu.status == '0'))
.order_by(SysMenu.order_num)
.distinct()
)
)
.scalars()
.all()
)
results = dict(
user_basic_info=query_user_basic_info,
user_dept_info=query_user_dept_info,
user_role_info=query_user_role_info,
user_post_info=query_user_post_info,
user_menu_info=query_user_menu_info
user_menu_info=query_user_menu_info,
)
return results
@@ -128,58 +187,92 @@ class UserDao:
:param user_id: 用户id
:return: 当前user_id的用户信息对象
"""
query_user_basic_info = (await db.execute(
select(SysUser)
.where(SysUser.del_flag == '0', SysUser.user_id == user_id)
.distinct()
)).scalars().first()
query_user_dept_info = (await db.execute(
select(SysDept)
.select_from(SysUser)
.where(SysUser.del_flag == '0', SysUser.user_id == user_id)
.join(SysDept, and_(SysUser.dept_id == SysDept.dept_id, SysDept.status == '0', SysDept.del_flag == '0'))
.distinct()
)).scalars().first()
query_user_role_info = (await db.execute(
select(SysRole)
.select_from(SysUser)
.where(SysUser.del_flag == '0', SysUser.user_id == user_id)
.join(SysUserRole, SysUser.user_id == SysUserRole.user_id, isouter=True)
.join(SysRole, and_(SysUserRole.role_id == SysRole.role_id, SysRole.status == '0', SysRole.del_flag == '0'))
.distinct()
)).scalars().all()
query_user_post_info = (await db.execute(
select(SysPost)
.select_from(SysUser)
.where(SysUser.del_flag == '0', SysUser.user_id == user_id)
.join(SysUserPost, SysUser.user_id == SysUserPost.user_id, isouter=True)
.join(SysPost, and_(SysUserPost.post_id == SysPost.post_id, SysPost.status == '0'))
.distinct()
)).scalars().all()
query_user_menu_info = (await db.execute(
select(SysMenu)
.select_from(SysUser)
.where(SysUser.del_flag == '0', SysUser.user_id == user_id)
.join(SysUserRole, SysUser.user_id == SysUserRole.user_id, isouter=True)
.join(SysRole, and_(SysUserRole.role_id == SysRole.role_id, SysRole.status == '0', SysRole.del_flag == '0'),
isouter=True)
.join(SysRoleMenu, SysRole.role_id == SysRoleMenu.role_id, isouter=True)
.join(SysMenu, and_(SysRoleMenu.menu_id == SysMenu.menu_id, SysMenu.status == '0'))
.distinct()
)).scalars().all()
query_user_basic_info = (
(await db.execute(select(SysUser).where(SysUser.del_flag == '0', SysUser.user_id == user_id).distinct()))
.scalars()
.first()
)
query_user_dept_info = (
(
await db.execute(
select(SysDept)
.select_from(SysUser)
.where(SysUser.del_flag == '0', SysUser.user_id == user_id)
.join(
SysDept,
and_(SysUser.dept_id == SysDept.dept_id, SysDept.status == '0', SysDept.del_flag == '0'),
)
.distinct()
)
)
.scalars()
.first()
)
query_user_role_info = (
(
await db.execute(
select(SysRole)
.select_from(SysUser)
.where(SysUser.del_flag == '0', SysUser.user_id == user_id)
.join(SysUserRole, SysUser.user_id == SysUserRole.user_id, isouter=True)
.join(
SysRole,
and_(SysUserRole.role_id == SysRole.role_id, SysRole.status == '0', SysRole.del_flag == '0'),
)
.distinct()
)
)
.scalars()
.all()
)
query_user_post_info = (
(
await db.execute(
select(SysPost)
.select_from(SysUser)
.where(SysUser.del_flag == '0', SysUser.user_id == user_id)
.join(SysUserPost, SysUser.user_id == SysUserPost.user_id, isouter=True)
.join(SysPost, and_(SysUserPost.post_id == SysPost.post_id, SysPost.status == '0'))
.distinct()
)
)
.scalars()
.all()
)
query_user_menu_info = (
(
await db.execute(
select(SysMenu)
.select_from(SysUser)
.where(SysUser.del_flag == '0', SysUser.user_id == user_id)
.join(SysUserRole, SysUser.user_id == SysUserRole.user_id, isouter=True)
.join(
SysRole,
and_(SysUserRole.role_id == SysRole.role_id, SysRole.status == '0', SysRole.del_flag == '0'),
isouter=True,
)
.join(SysRoleMenu, SysRole.role_id == SysRoleMenu.role_id, isouter=True)
.join(SysMenu, and_(SysRoleMenu.menu_id == SysMenu.menu_id, SysMenu.status == '0'))
.distinct()
)
)
.scalars()
.all()
)
results = dict(
user_basic_info=query_user_basic_info,
user_dept_info=query_user_dept_info,
user_role_info=query_user_role_info,
user_post_info=query_user_post_info,
user_menu_info=query_user_menu_info
user_menu_info=query_user_menu_info,
)
return results
@classmethod
async def get_user_list(cls, db: AsyncSession, query_object: UserPageQueryModel, data_scope_sql: str,
is_page: bool = False):
async def get_user_list(
cls, db: AsyncSession, query_object: UserPageQueryModel, data_scope_sql: str, is_page: bool = False
):
"""
根据查询参数获取用户列表信息
:param db: orm对象
@@ -188,27 +281,40 @@ class UserDao:
:param is_page: 是否开启分页
:return: 用户列表信息对象
"""
query = select(SysUser, SysDept) \
.where(SysUser.del_flag == '0',
or_(SysUser.dept_id == query_object.dept_id, SysUser.dept_id.in_(
select(SysDept.dept_id).where(func.find_in_set(query_object.dept_id, SysDept.ancestors))
)) if query_object.dept_id else True,
SysUser.user_id == query_object.user_id if query_object.user_id is not None else True,
SysUser.user_name.like(f'%{query_object.user_name}%') if query_object.user_name else True,
SysUser.nick_name.like(f'%{query_object.nick_name}%') if query_object.nick_name else True,
SysUser.email.like(f'%{query_object.email}%') if query_object.email else True,
SysUser.phonenumber.like(f'%{query_object.phonenumber}%') if query_object.phonenumber else True,
SysUser.status == query_object.status if query_object.status else True,
SysUser.sex == query_object.sex if query_object.sex else True,
SysUser.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)
) \
.join(SysDept, and_(SysUser.dept_id == SysDept.dept_id, SysDept.status == '0', SysDept.del_flag == '0'),
isouter=True) \
query = (
select(SysUser, SysDept)
.where(
SysUser.del_flag == '0',
or_(
SysUser.dept_id == query_object.dept_id,
SysUser.dept_id.in_(
select(SysDept.dept_id).where(func.find_in_set(query_object.dept_id, SysDept.ancestors))
),
)
if query_object.dept_id
else True,
SysUser.user_id == query_object.user_id if query_object.user_id is not None else True,
SysUser.user_name.like(f'%{query_object.user_name}%') if query_object.user_name else True,
SysUser.nick_name.like(f'%{query_object.nick_name}%') if query_object.nick_name else True,
SysUser.email.like(f'%{query_object.email}%') if query_object.email else True,
SysUser.phonenumber.like(f'%{query_object.phonenumber}%') if query_object.phonenumber else True,
SysUser.status == query_object.status if query_object.status else True,
SysUser.sex == query_object.sex if query_object.sex else True,
SysUser.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),
)
.join(
SysDept,
and_(SysUser.dept_id == SysDept.dept_id, SysDept.status == '0', SysDept.del_flag == '0'),
isouter=True,
)
.distinct()
)
user_list = await PageUtil.paginate(db, query, query_object.page_num, query_object.page_size, is_page)
return user_list
@@ -235,10 +341,7 @@ class UserDao:
:param user: 需要更新的用户字典
:return: 编辑校验结果
"""
await db.execute(
update(SysUser),
[user]
)
await db.execute(update(SysUser), [user])
@classmethod
async def delete_user_dao(cls, db: AsyncSession, user: UserModel):
@@ -250,8 +353,8 @@ class UserDao:
"""
await db.execute(
update(SysUser)
.where(SysUser.user_id == user.user_id)
.values(del_flag='2', update_by=user.update_by, update_time=user.update_time)
.where(SysUser.user_id == user.user_id)
.values(del_flag='2', update_by=user.update_by, update_time=user.update_time)
)
@classmethod
@@ -262,22 +365,32 @@ class UserDao:
:param query_object: 用户角色查询对象
:return: 用户已分配的角色列表信息
"""
allocated_role_list = (await db.execute(
select(SysRole)
.where(SysRole.del_flag == '0',
SysRole.role_id != 1,
SysRole.role_name == query_object.role_name if query_object.role_name else True,
SysRole.role_key == query_object.role_key if query_object.role_key else True,
SysRole.role_id.in_(
select(SysUserRole.role_id).where(SysUserRole.user_id == query_object.user_id)
))
.distinct()
)).scalars().all()
allocated_role_list = (
(
await db.execute(
select(SysRole)
.where(
SysRole.del_flag == '0',
SysRole.role_id != 1,
SysRole.role_name == query_object.role_name if query_object.role_name else True,
SysRole.role_key == query_object.role_key if query_object.role_key else True,
SysRole.role_id.in_(
select(SysUserRole.role_id).where(SysUserRole.user_id == query_object.user_id)
),
)
.distinct()
)
)
.scalars()
.all()
)
return allocated_role_list
@classmethod
async def get_user_role_allocated_list_by_role_id(cls, db: AsyncSession, query_object: UserRolePageQueryModel, data_scope_sql: str, is_page: bool = False):
async def get_user_role_allocated_list_by_role_id(
cls, db: AsyncSession, query_object: UserRolePageQueryModel, data_scope_sql: str, is_page: bool = False
):
"""
根据角色id获取已分配的用户列表信息
:param db: orm对象
@@ -286,22 +399,28 @@ class UserDao:
:param is_page: 是否开启分页
:return: 角色已分配的用户列表信息
"""
query = select(SysUser) \
.join(SysDept, SysDept.dept_id == SysUser.dept_id, isouter=True) \
.join(SysUserRole, SysUserRole.user_id == SysUser.user_id, isouter=True) \
.join(SysRole, SysRole.role_id == SysUserRole.role_id, isouter=True) \
.where(SysUser.del_flag == '0',
SysUser.user_name == query_object.user_name if query_object.user_name else True,
SysUser.phonenumber == query_object.phonenumber if query_object.phonenumber else True,
SysRole.role_id == query_object.role_id,
eval(data_scope_sql)) \
query = (
select(SysUser)
.join(SysDept, SysDept.dept_id == SysUser.dept_id, isouter=True)
.join(SysUserRole, SysUserRole.user_id == SysUser.user_id, isouter=True)
.join(SysRole, SysRole.role_id == SysUserRole.role_id, isouter=True)
.where(
SysUser.del_flag == '0',
SysUser.user_name == query_object.user_name if query_object.user_name else True,
SysUser.phonenumber == query_object.phonenumber if query_object.phonenumber else True,
SysRole.role_id == query_object.role_id,
eval(data_scope_sql),
)
.distinct()
)
allocated_user_list = await PageUtil.paginate(db, query, query_object.page_num, query_object.page_size, is_page)
return allocated_user_list
@classmethod
async def get_user_role_unallocated_list_by_role_id(cls, db: AsyncSession, query_object: UserRolePageQueryModel, data_scope_sql: str, is_page: bool = False):
async def get_user_role_unallocated_list_by_role_id(
cls, db: AsyncSession, query_object: UserRolePageQueryModel, data_scope_sql: str, is_page: bool = False
):
"""
根据角色id获取未分配的用户列表信息
:param db: orm对象
@@ -310,26 +429,31 @@ class UserDao:
:param is_page: 是否开启分页
:return: 角色未分配的用户列表信息
"""
query = select(SysUser) \
.join(SysDept, SysDept.dept_id == SysUser.dept_id, isouter=True) \
.join(SysUserRole, SysUserRole.user_id == SysUser.user_id, isouter=True) \
.join(SysRole, SysRole.role_id == SysUserRole.role_id, isouter=True) \
.where(SysUser.del_flag == '0',
SysUser.user_name == query_object.user_name if query_object.user_name else True,
SysUser.phonenumber == query_object.phonenumber if query_object.phonenumber else True,
or_(SysRole.role_id != query_object.role_id, SysRole.role_id is None),
~SysUser.user_id.in_(
select(SysUser.user_id)
.select_from(SysUser)
.join(SysUserRole,
and_(SysUserRole.user_id == SysUser.user_id,
SysUserRole.role_id == query_object.role_id)
)
),
eval(data_scope_sql)) \
query = (
select(SysUser)
.join(SysDept, SysDept.dept_id == SysUser.dept_id, isouter=True)
.join(SysUserRole, SysUserRole.user_id == SysUser.user_id, isouter=True)
.join(SysRole, SysRole.role_id == SysUserRole.role_id, isouter=True)
.where(
SysUser.del_flag == '0',
SysUser.user_name == query_object.user_name if query_object.user_name else True,
SysUser.phonenumber == query_object.phonenumber if query_object.phonenumber else True,
or_(SysRole.role_id != query_object.role_id, SysRole.role_id is None),
~SysUser.user_id.in_(
select(SysUser.user_id)
.select_from(SysUser)
.join(
SysUserRole,
and_(SysUserRole.user_id == SysUser.user_id, SysUserRole.role_id == query_object.role_id),
)
),
eval(data_scope_sql),
)
.distinct()
unallocated_user_list = await PageUtil.paginate(db, query, query_object.page_num, query_object.page_size,
is_page)
)
unallocated_user_list = await PageUtil.paginate(
db, query, query_object.page_num, query_object.page_size, is_page
)
return unallocated_user_list
@@ -352,10 +476,7 @@ class UserDao:
:param user_role: 用户角色关联对象
:return:
"""
await db.execute(
delete(SysUserRole)
.where(SysUserRole.user_id.in_([user_role.user_id]))
)
await db.execute(delete(SysUserRole).where(SysUserRole.user_id.in_([user_role.user_id])))
@classmethod
async def delete_user_role_by_user_and_role_dao(cls, db: AsyncSession, user_role: UserRoleModel):
@@ -366,9 +487,10 @@ class UserDao:
:return:
"""
await db.execute(
delete(SysUserRole)
.where(SysUserRole.user_id.in_([user_role.user_id]),
SysUserRole.role_id == user_role.role_id if user_role.role_id else True)
delete(SysUserRole).where(
SysUserRole.user_id.in_([user_role.user_id]),
SysUserRole.role_id == user_role.role_id if user_role.role_id else True,
)
)
@classmethod
@@ -379,11 +501,17 @@ class UserDao:
:param user_role: 用户角色关联对象
:return: 用户角色关联信息
"""
user_role_info = (await db.execute(
select(SysUserRole)
.where(SysUserRole.user_id == user_role.user_id, SysUserRole.role_id == user_role.role_id)
.distinct()
)).scalars().first()
user_role_info = (
(
await db.execute(
select(SysUserRole)
.where(SysUserRole.user_id == user_role.user_id, SysUserRole.role_id == user_role.role_id)
.distinct()
)
)
.scalars()
.first()
)
return user_role_info
@@ -406,17 +534,17 @@ class UserDao:
:param user_post: 用户岗位关联对象
:return:
"""
await db.execute(
delete(SysUserPost)
.where(SysUserPost.user_id.in_([user_post.user_id]))
)
await db.execute(delete(SysUserPost).where(SysUserPost.user_id.in_([user_post.user_id])))
@classmethod
async def get_user_dept_info(cls, db: AsyncSession, dept_id: int):
dept_basic_info = (await db.execute(
select(SysDept)
.where(SysDept.dept_id == dept_id,
SysDept.status == '0',
SysDept.del_flag == '0')
)).scalars().first()
dept_basic_info = (
(
await db.execute(
select(SysDept).where(SysDept.dept_id == dept_id, SysDept.status == '0', SysDept.del_flag == '0')
)
)
.scalars()
.first()
)
return dept_basic_info