PowLu/RuoYi-Vue3-FastAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: 重构数据库orm为异步 #I9MRQS

Browse Source
This commit is contained in:
insistence
2024-05-17 15:04:30 +08:00
parent 18103e3d38
commit 1972f1cb6d
52 changed files with 1414 additions and 1246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
ruoyi-fastapi-backend/module_admin/dao/job_log_dao.py
View File

@@ -1,3 +1,5 @@
from sqlalchemy import select, delete
from sqlalchemy.ext.asyncio import AsyncSession
from sqlalchemy.orm import Session
from module_admin.entity.do.job_do import SysJobLog
from module_admin.entity.vo.job_vo import *
@@ -11,7 +13,7 @@ class JobLogDao:
"""
@classmethod
def get_job_log_list(cls, db: Session, query_object: JobLogPageQueryModel, is_page: bool = False):
async def get_job_log_list(cls, db: AsyncSession, query_object: JobLogPageQueryModel, is_page: bool = False):
"""
根据查询参数获取定时任务日志列表信息
:param db: orm对象
@@ -19,17 +21,16 @@ class JobLogDao:
:param is_page: 是否开启分页
:return: 定时任务日志列表信息对象
"""
query = db.query(SysJobLog) \
.filter(SysJobLog.job_name.like(f'%{query_object.job_name}%') if query_object.job_name else True,
SysJobLog.job_group == query_object.job_group if query_object.job_group else True,
SysJobLog.status == query_object.status if query_object.status else True,
SysJobLog.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(SysJobLog) \
.where(SysJobLog.job_name.like(f'%{query_object.job_name}%') if query_object.job_name else True,
SysJobLog.job_group == query_object.job_group if query_object.job_group else True,
SysJobLog.status == query_object.status if query_object.status else True,
SysJobLog.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()
job_log_list = PageUtil.paginate(query, query_object.page_num, query_object.page_size, is_page)
job_log_list = await PageUtil.paginate(db, query, query_object.page_num, query_object.page_size, is_page)
return job_log_list
@@ -48,23 +49,25 @@ class JobLogDao:
return db_job_log
@classmethod
def delete_job_log_dao(cls, db: Session, job_log: JobLogModel):
async def delete_job_log_dao(cls, db: AsyncSession, job_log: JobLogModel):
"""
删除定时任务日志数据库操作
:param db: orm对象
:param job_log: 定时任务日志对象
:return:
"""
db.query(SysJobLog) \
.filter(SysJobLog.job_log_id == job_log.job_log_id) \
.delete()
await db.execute(
delete(SysJobLog)
.where(SysJobLog.job_log_id.in_([job_log.job_log_id]))
)
@classmethod
def clear_job_log_dao(cls, db: Session):
async def clear_job_log_dao(cls, db: AsyncSession):
"""
清除定时任务日志数据库操作
:param db: orm对象
:return:
"""
db.query(SysJobLog) \
.delete()
await db.execute(
delete(SysJobLog)
)