style: 使用ruff格式化utils模块,优化导入

This commit is contained in:
insistence
2024-07-12 11:13:01 +08:00
parent 380693c66d
commit ed9ad54b46
7 changed files with 115 additions and 94 deletions

View File

@@ -1,9 +1,9 @@
import math
from typing import Optional, List
from sqlalchemy import Select, select, func
from sqlalchemy.ext.asyncio import AsyncSession
from pydantic import BaseModel, ConfigDict
from pydantic.alias_generators import to_camel
from sqlalchemy import func, select, Select
from sqlalchemy.ext.asyncio import AsyncSession
from typing import Optional, List
from utils.common_util import CamelCaseUtil
@@ -11,6 +11,7 @@ class PageResponseModel(BaseModel):
"""
列表分页查询返回模型
"""
model_config = ConfigDict(alias_generator=to_camel)
rows: List = []
@@ -43,11 +44,7 @@ class PageUtil:
has_next = True if math.ceil(len(data_list) / page_size) > page_num else False
result = PageResponseModel(
rows=paginated_data,
pageNum=page_num,
pageSize=page_size,
total=len(data_list),
hasNext=has_next
rows=paginated_data, pageNum=page_num, pageSize=page_size, total=len(data_list), hasNext=has_next
)
return result
@@ -65,7 +62,7 @@ class PageUtil:
"""
if is_page:
total = (await db.execute(select(func.count('*')).select_from(query.subquery()))).scalar()
query_result = (await db.execute(query.offset((page_num - 1) * page_size).limit(page_size)))
query_result = await db.execute(query.offset((page_num - 1) * page_size).limit(page_size))
paginated_data = []
for row in query_result:
if row and len(row) == 1:
@@ -78,7 +75,7 @@ class PageUtil:
pageNum=page_num,
pageSize=page_size,
total=total,
hasNext=has_next
hasNext=has_next,
)
else:
query_result = await db.execute(query)
@@ -110,11 +107,7 @@ def get_page_obj(data_list: List, page_num: int, page_size: int):
has_next = True if math.ceil(len(data_list) / page_size) > page_num else False
result = PageResponseModel(
rows=paginated_data,
pageNum=page_num,
pageSize=page_size,
total=len(data_list),
hasNext=has_next
rows=paginated_data, pageNum=page_num, pageSize=page_size, total=len(data_list), hasNext=has_next
)
return result