refactor: 重构数据库orm为异步 #I9MRQS
This commit is contained in:
insistence
@@ -1,5 +1,5 @@
|
||||
from sqlalchemy import and_, or_, desc, func
|
||||
from sqlalchemy.orm import Session
|
||||
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
|
||||
@@ -16,73 +16,96 @@ class UserDao:
|
||||
"""
|
||||
|
||||
@classmethod
|
||||
def get_user_by_name(cls, db: Session, user_name: str):
|
||||
async def get_user_by_name(cls, db: AsyncSession, user_name: str):
|
||||
"""
|
||||
根据用户名获取用户信息
|
||||
:param db: orm对象
|
||||
:param user_name: 用户名
|
||||
:return: 当前用户名的用户信息对象
|
||||
"""
|
||||
query_user_info = db.query(SysUser) \
|
||||
.filter(SysUser.status == 0, SysUser.del_flag == 0, SysUser.user_name == user_name) \
|
||||
.order_by(desc(SysUser.create_time)).distinct().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
|
||||
|
||||
@classmethod
|
||||
def get_user_by_info(cls, db: Session, user: UserModel):
|
||||
async def get_user_by_info(cls, db: AsyncSession, user: UserModel):
|
||||
"""
|
||||
根据用户参数获取用户信息
|
||||
:param db: orm对象
|
||||
:param user: 用户参数
|
||||
:return: 当前用户参数的用户信息对象
|
||||
"""
|
||||
query_user_info = db.query(SysUser) \
|
||||
.filter(SysUser.del_flag == 0,
|
||||
SysUser.user_name == user.user_name) \
|
||||
.order_by(desc(SysUser.create_time)).distinct().first()
|
||||
query_user_info = (await db.execute(
|
||||
select(SysUser)
|
||||
.where(SysUser.del_flag == 0, SysUser.user_name == user.user_name)
|
||||
.order_by(desc(SysUser.create_time))
|
||||
.distinct()
|
||||
)).scalars().first()
|
||||
|
||||
return query_user_info
|
||||
|
||||
@classmethod
|
||||
def get_user_by_id(cls, db: Session, user_id: int):
|
||||
async def get_user_by_id(cls, db: AsyncSession, user_id: int):
|
||||
"""
|
||||
根据user_id获取用户信息
|
||||
:param db: orm对象
|
||||
:param user_id: 用户id
|
||||
:return: 当前user_id的用户信息对象
|
||||
"""
|
||||
query_user_basic_info = db.query(SysUser) \
|
||||
.filter(SysUser.status == 0, SysUser.del_flag == 0, SysUser.user_id == user_id) \
|
||||
.distinct().first()
|
||||
query_user_dept_info = db.query(SysDept).select_from(SysUser) \
|
||||
.filter(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().first()
|
||||
query_user_role_info = db.query(SysRole).select_from(SysUser) \
|
||||
.filter(SysUser.status == 0, SysUser.del_flag == 0, SysUser.user_id == user_id) \
|
||||
.outerjoin(SysUserRole, SysUser.user_id == SysUserRole.user_id) \
|
||||
.join(SysRole, and_(SysUserRole.role_id == SysRole.role_id, SysRole.status == 0, SysRole.del_flag == 0)) \
|
||||
.distinct().all()
|
||||
query_user_post_info = db.query(SysPost).select_from(SysUser) \
|
||||
.filter(SysUser.status == 0, SysUser.del_flag == 0, SysUser.user_id == user_id) \
|
||||
.outerjoin(SysUserPost, SysUser.user_id == SysUserPost.user_id) \
|
||||
.join(SysPost, and_(SysUserPost.post_id == SysPost.post_id, SysPost.status == 0)) \
|
||||
.distinct().all()
|
||||
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 = db.query(SysMenu) \
|
||||
.filter(SysMenu.status == 0) \
|
||||
.distinct().all()
|
||||
query_user_menu_info = (await db.execute(
|
||||
select(SysMenu)
|
||||
.where(SysMenu.status == 0)
|
||||
.distinct()
|
||||
)).scalars().all()
|
||||
else:
|
||||
query_user_menu_info = db.query(SysMenu).select_from(SysUser) \
|
||||
.filter(SysUser.status == 0, SysUser.del_flag == 0, SysUser.user_id == user_id) \
|
||||
.outerjoin(SysUserRole, SysUser.user_id == SysUserRole.user_id) \
|
||||
.outerjoin(SysRole, and_(SysUserRole.role_id == SysRole.role_id, SysRole.status == 0, SysRole.del_flag == 0)) \
|
||||
.outerjoin(SysRoleMenu, SysRole.role_id == SysRoleMenu.role_id) \
|
||||
.join(SysMenu, and_(SysRoleMenu.menu_id == SysMenu.menu_id, SysMenu.status == 0)) \
|
||||
.order_by(SysMenu.order_num) \
|
||||
.distinct().all()
|
||||
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,
|
||||
@@ -95,37 +118,52 @@ class UserDao:
|
||||
return results
|
||||
|
||||
@classmethod
|
||||
def get_user_detail_by_id(cls, db: Session, user_id: int):
|
||||
async def get_user_detail_by_id(cls, db: AsyncSession, user_id: int):
|
||||
"""
|
||||
根据user_id获取用户详细信息
|
||||
:param db: orm对象
|
||||
:param user_id: 用户id
|
||||
:return: 当前user_id的用户信息对象
|
||||
"""
|
||||
query_user_basic_info = db.query(SysUser) \
|
||||
.filter(SysUser.del_flag == 0, SysUser.user_id == user_id) \
|
||||
.distinct().first()
|
||||
query_user_dept_info = db.query(SysDept).select_from(SysUser) \
|
||||
.filter(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().first()
|
||||
query_user_role_info = db.query(SysRole).select_from(SysUser) \
|
||||
.filter(SysUser.del_flag == 0, SysUser.user_id == user_id) \
|
||||
.outerjoin(SysUserRole, SysUser.user_id == SysUserRole.user_id) \
|
||||
.join(SysRole, and_(SysUserRole.role_id == SysRole.role_id, SysRole.status == 0, SysRole.del_flag == 0)) \
|
||||
.distinct().all()
|
||||
query_user_post_info = db.query(SysPost).select_from(SysUser) \
|
||||
.filter(SysUser.del_flag == 0, SysUser.user_id == user_id) \
|
||||
.outerjoin(SysUserPost, SysUser.user_id == SysUserPost.user_id) \
|
||||
.join(SysPost, and_(SysUserPost.post_id == SysPost.post_id, SysPost.status == 0)) \
|
||||
.distinct().all()
|
||||
query_user_menu_info = db.query(SysMenu).select_from(SysUser) \
|
||||
.filter(SysUser.del_flag == 0, SysUser.user_id == user_id) \
|
||||
.outerjoin(SysUserRole, SysUser.user_id == SysUserRole.user_id) \
|
||||
.outerjoin(SysRole, and_(SysUserRole.role_id == SysRole.role_id, SysRole.status == 0, SysRole.del_flag == 0)) \
|
||||
.outerjoin(SysRoleMenu, SysRole.role_id == SysRoleMenu.role_id) \
|
||||
.join(SysMenu, and_(SysRoleMenu.menu_id == SysMenu.menu_id, SysMenu.status == 0)) \
|
||||
.distinct().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,
|
||||
@@ -137,7 +175,8 @@ class UserDao:
|
||||
return results
|
||||
|
||||
@classmethod
|
||||
def get_user_list(cls, db: Session, 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对象
|
||||
@@ -146,31 +185,32 @@ class UserDao:
|
||||
:param is_page: 是否开启分页
|
||||
:return: 用户列表信息对象
|
||||
"""
|
||||
query = db.query(SysUser, SysDept) \
|
||||
.filter(SysUser.del_flag == 0,
|
||||
or_(SysUser.dept_id == query_object.dept_id, SysUser.dept_id.in_(
|
||||
db.query(SysDept.dept_id).filter(func.find_in_set(query_object.dept_id, SysDept.ancestors))
|
||||
)) if query_object.dept_id 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)
|
||||
) \
|
||||
.outerjoin(SysDept, and_(SysUser.dept_id == SysDept.dept_id, SysDept.status == 0, SysDept.del_flag == 0)) \
|
||||
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_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 = PageUtil.paginate(query, query_object.page_num, query_object.page_size, is_page)
|
||||
user_list = await PageUtil.paginate(db, query, query_object.page_num, query_object.page_size, is_page)
|
||||
|
||||
return user_list
|
||||
|
||||
@classmethod
|
||||
def add_user_dao(cls, db: Session, user: UserModel):
|
||||
async def add_user_dao(cls, db: AsyncSession, user: UserModel):
|
||||
"""
|
||||
新增用户数据库操作
|
||||
:param db: orm对象
|
||||
@@ -179,57 +219,62 @@ class UserDao:
|
||||
"""
|
||||
db_user = SysUser(**user.model_dump(exclude={'admin'}))
|
||||
db.add(db_user)
|
||||
db.flush()
|
||||
await db.flush()
|
||||
|
||||
return db_user
|
||||
|
||||
@classmethod
|
||||
def edit_user_dao(cls, db: Session, user: dict):
|
||||
async def edit_user_dao(cls, db: AsyncSession, user: dict):
|
||||
"""
|
||||
编辑用户数据库操作
|
||||
:param db: orm对象
|
||||
:param user: 需要更新的用户字典
|
||||
:return: 编辑校验结果
|
||||
"""
|
||||
db.query(SysUser) \
|
||||
.filter(SysUser.user_id == user.get('user_id')) \
|
||||
.update(user)
|
||||
await db.execute(
|
||||
update(SysUser),
|
||||
[user]
|
||||
)
|
||||
|
||||
@classmethod
|
||||
def delete_user_dao(cls, db: Session, user: UserModel):
|
||||
async def delete_user_dao(cls, db: AsyncSession, user: UserModel):
|
||||
"""
|
||||
删除用户数据库操作
|
||||
:param db: orm对象
|
||||
:param user: 用户对象
|
||||
:return:
|
||||
"""
|
||||
db.query(SysUser) \
|
||||
.filter(SysUser.user_id == user.user_id) \
|
||||
.update({SysUser.del_flag: '2', SysUser.update_by: user.update_by, SysUser.update_time: user.update_time})
|
||||
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)
|
||||
)
|
||||
|
||||
@classmethod
|
||||
def get_user_role_allocated_list_by_user_id(cls, db: Session, query_object: UserRoleQueryModel):
|
||||
async def get_user_role_allocated_list_by_user_id(cls, db: AsyncSession, query_object: UserRoleQueryModel):
|
||||
"""
|
||||
根据用户id获取用户已分配的角色列表信息数据库操作
|
||||
:param db: orm对象
|
||||
:param query_object: 用户角色查询对象
|
||||
:return: 用户已分配的角色列表信息
|
||||
"""
|
||||
allocated_role_list = db.query(SysRole) \
|
||||
.filter(
|
||||
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_(
|
||||
db.query(SysUserRole.role_id).filter(SysUserRole.user_id == query_object.user_id)
|
||||
)
|
||||
).distinct().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
|
||||
def get_user_role_allocated_list_by_role_id(cls, db: Session, query_object: UserRolePageQueryModel, is_page: bool = False):
|
||||
async def get_user_role_allocated_list_by_role_id(cls, db: AsyncSession, query_object: UserRolePageQueryModel,
|
||||
is_page: bool = False):
|
||||
"""
|
||||
根据角色id获取已分配的用户列表信息
|
||||
:param db: orm对象
|
||||
@@ -237,22 +282,22 @@ class UserDao:
|
||||
:param is_page: 是否开启分页
|
||||
:return: 角色已分配的用户列表信息
|
||||
"""
|
||||
query = db.query(SysUser) \
|
||||
.filter(
|
||||
SysUser.del_flag == 0,
|
||||
SysUser.user_id != 1,
|
||||
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,
|
||||
SysUser.user_id.in_(
|
||||
db.query(SysUserRole.user_id).filter(SysUserRole.role_id == query_object.role_id)
|
||||
)
|
||||
).distinct()
|
||||
allocated_user_list = PageUtil.paginate(query, query_object.page_num, query_object.page_size, is_page)
|
||||
query = select(SysUser) \
|
||||
.where(SysUser.del_flag == 0,
|
||||
SysUser.user_id != 1,
|
||||
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,
|
||||
SysUser.user_id.in_(
|
||||
select(SysUserRole.user_id).where(SysUserRole.role_id == query_object.role_id)
|
||||
)) \
|
||||
.distinct()
|
||||
allocated_user_list = await PageUtil.paginate(db, query, query_object.page_num, query_object.page_size, is_page)
|
||||
|
||||
return allocated_user_list
|
||||
|
||||
@classmethod
|
||||
def get_user_role_unallocated_list_by_role_id(cls, db: Session, query_object: UserRolePageQueryModel, is_page: bool = False):
|
||||
async def get_user_role_unallocated_list_by_role_id(cls, db: AsyncSession, query_object: UserRolePageQueryModel,
|
||||
is_page: bool = False):
|
||||
"""
|
||||
根据角色id获取未分配的用户列表信息
|
||||
:param db: orm对象
|
||||
@@ -260,22 +305,22 @@ class UserDao:
|
||||
:param is_page: 是否开启分页
|
||||
:return: 角色未分配的用户列表信息
|
||||
"""
|
||||
query = db.query(SysUser) \
|
||||
.filter(
|
||||
SysUser.del_flag == 0,
|
||||
SysUser.user_id != 1,
|
||||
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,
|
||||
~SysUser.user_id.in_(
|
||||
db.query(SysUserRole.user_id).filter(SysUserRole.role_id == query_object.role_id)
|
||||
)
|
||||
).distinct()
|
||||
unallocated_user_list = PageUtil.paginate(query, query_object.page_num, query_object.page_size, is_page)
|
||||
query = select(SysUser) \
|
||||
.where(SysUser.del_flag == 0,
|
||||
SysUser.user_id != 1,
|
||||
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,
|
||||
~SysUser.user_id.in_(
|
||||
select(SysUserRole.user_id).where(SysUserRole.role_id == query_object.role_id)
|
||||
)) \
|
||||
.distinct()
|
||||
unallocated_user_list = await PageUtil.paginate(db, query, query_object.page_num, query_object.page_size,
|
||||
is_page)
|
||||
|
||||
return unallocated_user_list
|
||||
|
||||
@classmethod
|
||||
def add_user_role_dao(cls, db: Session, user_role: UserRoleModel):
|
||||
async def add_user_role_dao(cls, db: AsyncSession, user_role: UserRoleModel):
|
||||
"""
|
||||
新增用户角色关联信息数据库操作
|
||||
:param db: orm对象
|
||||
@@ -286,46 +331,50 @@ class UserDao:
|
||||
db.add(db_user_role)
|
||||
|
||||
@classmethod
|
||||
def delete_user_role_dao(cls, db: Session, user_role: UserRoleModel):
|
||||
async def delete_user_role_dao(cls, db: AsyncSession, user_role: UserRoleModel):
|
||||
"""
|
||||
删除用户角色关联信息数据库操作
|
||||
:param db: orm对象
|
||||
:param user_role: 用户角色关联对象
|
||||
:return:
|
||||
"""
|
||||
db.query(SysUserRole) \
|
||||
.filter(SysUserRole.user_id == user_role.user_id) \
|
||||
.delete()
|
||||
await db.execute(
|
||||
delete(SysUserRole)
|
||||
.where(SysUserRole.user_id.in_([user_role.user_id]))
|
||||
)
|
||||
|
||||
@classmethod
|
||||
def delete_user_role_by_user_and_role_dao(cls, db: Session, user_role: UserRoleModel):
|
||||
async def delete_user_role_by_user_and_role_dao(cls, db: AsyncSession, user_role: UserRoleModel):
|
||||
"""
|
||||
根据用户id及角色id删除用户角色关联信息数据库操作
|
||||
:param db: orm对象
|
||||
:param user_role: 用户角色关联对象
|
||||
:return:
|
||||
"""
|
||||
db.query(SysUserRole) \
|
||||
.filter(SysUserRole.user_id == user_role.user_id,
|
||||
SysUserRole.role_id == user_role.role_id if user_role.role_id else True) \
|
||||
.delete()
|
||||
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)
|
||||
)
|
||||
|
||||
@classmethod
|
||||
def get_user_role_detail(cls, db: Session, user_role: UserRoleModel):
|
||||
async def get_user_role_detail(cls, db: AsyncSession, user_role: UserRoleModel):
|
||||
"""
|
||||
根据用户角色关联获取用户角色关联详细信息
|
||||
:param db: orm对象
|
||||
:param user_role: 用户角色关联对象
|
||||
:return: 用户角色关联信息
|
||||
"""
|
||||
user_role_info = db.query(SysUserRole) \
|
||||
.filter(SysUserRole.user_id == user_role.user_id, SysUserRole.role_id == user_role.role_id) \
|
||||
.distinct().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
|
||||
|
||||
@classmethod
|
||||
def add_user_post_dao(cls, db: Session, user_post: UserPostModel):
|
||||
async def add_user_post_dao(cls, db: AsyncSession, user_post: UserPostModel):
|
||||
"""
|
||||
新增用户岗位关联信息数据库操作
|
||||
:param db: orm对象
|
||||
@@ -336,22 +385,24 @@ class UserDao:
|
||||
db.add(db_user_post)
|
||||
|
||||
@classmethod
|
||||
def delete_user_post_dao(cls, db: Session, user_post: UserPostModel):
|
||||
async def delete_user_post_dao(cls, db: AsyncSession, user_post: UserPostModel):
|
||||
"""
|
||||
删除用户岗位关联信息数据库操作
|
||||
:param db: orm对象
|
||||
:param user_post: 用户岗位关联对象
|
||||
:return:
|
||||
"""
|
||||
db.query(SysUserPost) \
|
||||
.filter(SysUserPost.user_id == user_post.user_id) \
|
||||
.delete()
|
||||
await db.execute(
|
||||
delete(SysUserPost)
|
||||
.where(SysUserPost.user_id.in_([user_post.user_id]))
|
||||
)
|
||||
|
||||
@classmethod
|
||||
def get_user_dept_info(cls, db: Session, dept_id: int):
|
||||
dept_basic_info = db.query(SysDept) \
|
||||
.filter(SysDept.dept_id == dept_id,
|
||||
SysDept.status == 0,
|
||||
SysDept.del_flag == 0) \
|
||||
.first()
|
||||
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()
|
||||
return dept_basic_info
|
||||
|
||||
Reference in New Issue
Block a user