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:50:10 +08:00
parent 6d0d772749
commit 2c86992cac
5 changed files with 90 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
ruoyi-fastapi-backend/module_admin/dao/notice_dao.py
View File

@@ -1,9 +1,9 @@
from sqlalchemy import select, update, delete
from datetime import datetime, time
from sqlalchemy import delete, select, update
from sqlalchemy.ext.asyncio import AsyncSession
from module_admin.entity.do.notice_do import SysNotice
from module_admin.entity.vo.notice_vo import *
from module_admin.entity.vo.notice_vo import NoticeModel, NoticePageQueryModel
from utils.page_util import PageUtil
from datetime import datetime, time
class NoticeDao:
@@ -19,10 +19,7 @@ class NoticeDao:
:param notice_id: 通知公告id
:return: 通知公告信息对象
"""
notice_info = (await db.execute(
select(SysNotice)
.where(SysNotice.notice_id == notice_id)
)).scalars().first()
notice_info = (await db.execute(select(SysNotice).where(SysNotice.notice_id == notice_id))).scalars().first()
return notice_info
@@ -34,12 +31,19 @@ class NoticeDao:
:param notice: 通知公告参数对象
:return: 通知公告信息对象
"""
notice_info = (await db.execute(
select(SysNotice)
.where(SysNotice.notice_title == notice.notice_title,
SysNotice.notice_type == notice.notice_type,
SysNotice.notice_content == notice.notice_content)
)).scalars().first()
notice_info = (
(
await db.execute(
select(SysNotice).where(
SysNotice.notice_title == notice.notice_title,
SysNotice.notice_type == notice.notice_type,
SysNotice.notice_content == notice.notice_content,
)
)
)
.scalars()
.first()
)
return notice_info
@@ -52,15 +56,21 @@ class NoticeDao:
:param is_page: 是否开启分页
:return: 通知公告列表信息对象
"""
query = select(SysNotice) \
.where(SysNotice.notice_title.like(f'%{query_object.notice_title}%') if query_object.notice_title else True,
SysNotice.create_by.like(f'%{query_object.create_by}%') if query_object.create_by else True,
SysNotice.notice_type == query_object.notice_type if query_object.notice_type else True,
SysNotice.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(SysNotice)
.where(
SysNotice.notice_title.like(f'%{query_object.notice_title}%') if query_object.notice_title else True,
SysNotice.create_by.like(f'%{query_object.create_by}%') if query_object.create_by else True,
SysNotice.notice_type == query_object.notice_type if query_object.notice_type else True,
SysNotice.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()
)
notice_list = await PageUtil.paginate(db, query, query_object.page_num, query_object.page_size, is_page)
return notice_list
@@ -87,10 +97,7 @@ class NoticeDao:
:param notice: 需要更新的通知公告字典
:return:
"""
await db.execute(
update(SysNotice),
[notice]
)
await db.execute(update(SysNotice), [notice])
@classmethod
async def delete_notice_dao(cls, db: AsyncSession, notice: NoticeModel):
@@ -100,7 +107,4 @@ class NoticeDao:
:param notice: 通知公告对象
:return:
"""
await db.execute(
delete(SysNotice)
.where(SysNotice.notice_id.in_([notice.notice_id]))
)
await db.execute(delete(SysNotice).where(SysNotice.notice_id.in_([notice.notice_id])))