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 10:38:36 +08:00
parent 659163d662
commit eac920fcae
5 changed files with 304 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

150
ruoyi-fastapi-backend/module_admin/dao/dict_dao.py
View File

@@ -1,10 +1,10 @@
from sqlalchemy import select, update, delete, and_, func
from datetime import datetime, time
from sqlalchemy import and_, delete, func, select, update
from sqlalchemy.ext.asyncio import AsyncSession
from module_admin.entity.do.dict_do import SysDictType, SysDictData
from module_admin.entity.vo.dict_vo import *
from utils.time_format_util import list_format_datetime
from module_admin.entity.vo.dict_vo import DictDataModel, DictDataPageQueryModel, DictTypeModel, DictTypePageQueryModel
from utils.page_util import PageUtil
from datetime import datetime, time
from utils.time_format_util import list_format_datetime
class DictTypeDao:
@@ -20,10 +20,7 @@ class DictTypeDao:
:param dict_id: 字典类型id
:return: 字典类型信息对象
"""
dict_type_info = (await db.execute(
select(SysDictType)
.where(SysDictType.dict_id == dict_id)
)).scalars().first()
dict_type_info = (await db.execute(select(SysDictType).where(SysDictType.dict_id == dict_id))).scalars().first()
return dict_type_info
@@ -35,11 +32,18 @@ class DictTypeDao:
:param dict_type: 字典类型参数对象
:return: 字典类型信息对象
"""
dict_type_info = (await db.execute(
select(SysDictType)
.where(SysDictType.dict_type == dict_type.dict_type if dict_type.dict_type else True,
SysDictType.dict_name == dict_type.dict_name if dict_type.dict_name else True)
)).scalars().first()
dict_type_info = (
(
await db.execute(
select(SysDictType).where(
SysDictType.dict_type == dict_type.dict_type if dict_type.dict_type else True,
SysDictType.dict_name == dict_type.dict_name if dict_type.dict_name else True,
)
)
)
.scalars()
.first()
)
return dict_type_info
@@ -50,9 +54,7 @@ class DictTypeDao:
:param db: orm对象
:return: 字典类型信息列表对象
"""
dict_type_info = (await db.execute(
select(SysDictType)
)).scalars().all()
dict_type_info = (await db.execute(select(SysDictType))).scalars().all()
return list_format_datetime(dict_type_info)
@@ -65,15 +67,21 @@ class DictTypeDao:
:param is_page: 是否开启分页
:return: 字典类型列表信息对象
"""
query = select(SysDictType) \
.where(SysDictType.dict_name.like(f'%{query_object.dict_name}%') if query_object.dict_name else True,
SysDictType.dict_type.like(f'%{query_object.dict_type}%') if query_object.dict_type else True,
SysDictType.status == query_object.status if query_object.status else True,
SysDictType.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) \
query = (
select(SysDictType)
.where(
SysDictType.dict_name.like(f'%{query_object.dict_name}%') if query_object.dict_name else True,
SysDictType.dict_type.like(f'%{query_object.dict_type}%') if query_object.dict_type else True,
SysDictType.status == query_object.status if query_object.status else True,
SysDictType.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,
)
.distinct()
)
dict_type_list = await PageUtil.paginate(db, query, query_object.page_num, query_object.page_size, is_page)
return dict_type_list
@@ -100,10 +108,7 @@ class DictTypeDao:
:param dict_type: 需要更新的字典类型字典
:return:
"""
await db.execute(
update(SysDictType),
[dict_type]
)
await db.execute(update(SysDictType), [dict_type])
@classmethod
async def delete_dict_type_dao(cls, db: AsyncSession, dict_type: DictTypeModel):
@@ -113,10 +118,7 @@ class DictTypeDao:
:param dict_type: 字典类型对象
:return:
"""
await db.execute(
delete(SysDictType)
.where(SysDictType.dict_id.in_([dict_type.dict_id]))
)
await db.execute(delete(SysDictType).where(SysDictType.dict_id.in_([dict_type.dict_id])))
class DictDataDao:
@@ -132,10 +134,9 @@ class DictDataDao:
:param dict_code: 字典数据id
:return: 字典数据信息对象
"""
dict_data_info = (await db.execute(
select(SysDictData)
.where(SysDictData.dict_code == dict_code)
)).scalars().first()
dict_data_info = (
(await db.execute(select(SysDictData).where(SysDictData.dict_code == dict_code))).scalars().first()
)
return dict_data_info
@@ -147,12 +148,19 @@ class DictDataDao:
:param dict_data: 字典数据参数对象
:return: 字典数据信息对象
"""
dict_data_info = (await db.execute(
select(SysDictData)
.where(SysDictData.dict_type == dict_data.dict_type,
SysDictData.dict_label == dict_data.dict_label,
SysDictData.dict_value == dict_data.dict_value)
)).scalars().first()
dict_data_info = (
(
await db.execute(
select(SysDictData).where(
SysDictData.dict_type == dict_data.dict_type,
SysDictData.dict_label == dict_data.dict_label,
SysDictData.dict_value == dict_data.dict_value,
)
)
)
.scalars()
.first()
)
return dict_data_info
@@ -165,12 +173,16 @@ class DictDataDao:
:param is_page: 是否开启分页
:return: 字典数据列表信息对象
"""
query = select(SysDictData) \
.where(SysDictData.dict_type == query_object.dict_type if query_object.dict_type else True,
SysDictData.dict_label.like(f'%{query_object.dict_label}%') if query_object.dict_label else True,
SysDictData.status == query_object.status if query_object.status else True)\
.order_by(SysDictData.dict_sort)\
query = (
select(SysDictData)
.where(
SysDictData.dict_type == query_object.dict_type if query_object.dict_type else True,
SysDictData.dict_label.like(f'%{query_object.dict_label}%') if query_object.dict_label else True,
SysDictData.status == query_object.status if query_object.status else True,
)
.order_by(SysDictData.dict_sort)
.distinct()
)
dict_data_list = await PageUtil.paginate(db, query, query_object.page_num, query_object.page_size, is_page)
return dict_data_list
@@ -183,14 +195,24 @@ class DictDataDao:
:param dict_type: 字典类型
:return: 字典数据列表信息对象
"""
dict_data_list = (await db.execute(
select(SysDictData)
.select_from(SysDictType)
.where(SysDictType.dict_type == dict_type if dict_type else True, SysDictType.status == '0')
.join(SysDictData, and_(SysDictType.dict_type == SysDictData.dict_type, SysDictData.status == '0'), isouter=True)
.order_by(SysDictData.dict_sort)
.distinct()
)).scalars().all()
dict_data_list = (
(
await db.execute(
select(SysDictData)
.select_from(SysDictType)
.where(SysDictType.dict_type == dict_type if dict_type else True, SysDictType.status == '0')
.join(
SysDictData,
and_(SysDictType.dict_type == SysDictData.dict_type, SysDictData.status == '0'),
isouter=True,
)
.order_by(SysDictData.dict_sort)
.distinct()
)
)
.scalars()
.all()
)
return dict_data_list
@@ -216,10 +238,7 @@ class DictDataDao:
:param dict_data: 需要更新的字典数据字典
:return:
"""
await db.execute(
update(SysDictData),
[dict_data]
)
await db.execute(update(SysDictData), [dict_data])
@classmethod
async def delete_dict_data_dao(cls, db: AsyncSession, dict_data: DictDataModel):
@@ -229,10 +248,7 @@ class DictDataDao:
:param dict_data: 字典数据对象
:return:
"""
await db.execute(
delete(SysDictData)
.where(SysDictData.dict_code.in_([dict_data.dict_code]))
)
await db.execute(delete(SysDictData).where(SysDictData.dict_code.in_([dict_data.dict_code])))
@classmethod
async def count_dict_data_dao(cls, db: AsyncSession, dict_type: str):
@@ -242,10 +258,8 @@ class DictDataDao:
:param dict_type: 字典类型
:return: 字典类型关联的字典数据数量
"""
dict_data_count = (await db.execute(
select(func.count('*'))
.select_from(SysDictData)
.where(SysDictData.dict_type == dict_type)
)).scalar()
dict_data_count = (
await db.execute(select(func.count('*')).select_from(SysDictData).where(SysDictData.dict_type == dict_type))
).scalar()
return dict_data_count