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:28:28 +08:00
parent ccb9e2a314
commit 659163d662
7 changed files with 249 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
ruoyi-fastapi-backend/module_admin/dao/job_dao.py
View File

@@ -1,7 +1,7 @@
from sqlalchemy import select, update, delete
from sqlalchemy import delete, select, update
from sqlalchemy.ext.asyncio import AsyncSession
from module_admin.entity.do.job_do import SysJob
from module_admin.entity.vo.job_vo import *
from module_admin.entity.vo.job_vo import JobModel, JobPageQueryModel
from utils.page_util import PageUtil
@@ -18,10 +18,7 @@ class JobDao:
:param job_id: 定时任务id
:return: 定时任务信息对象
"""
job_info = (await db.execute(
select(SysJob)
.where(SysJob.job_id == job_id)
)).scalars().first()
job_info = (await db.execute(select(SysJob).where(SysJob.job_id == job_id))).scalars().first()
return job_info
@@ -33,13 +30,20 @@ class JobDao:
:param job: 定时任务参数对象
:return: 定时任务信息对象
"""
job_info = (await db.execute(
select(SysJob)
.where(SysJob.job_name == job.job_name if job.job_name else True,
SysJob.job_group == job.job_group if job.job_group else True,
SysJob.invoke_target == job.invoke_target if job.invoke_target else True,
SysJob.cron_expression == job.cron_expression if job.cron_expression else True)
)).scalars().first()
job_info = (
(
await db.execute(
select(SysJob).where(
SysJob.job_name == job.job_name if job.job_name else True,
SysJob.job_group == job.job_group if job.job_group else True,
SysJob.invoke_target == job.invoke_target if job.invoke_target else True,
SysJob.cron_expression == job.cron_expression if job.cron_expression else True,
)
)
)
.scalars()
.first()
)
return job_info
@@ -52,11 +56,15 @@ class JobDao:
:param is_page: 是否开启分页
:return: 定时任务列表信息对象
"""
query = select(SysJob) \
.where(SysJob.job_name.like(f'%{query_object.job_name}%') if query_object.job_name else True,
SysJob.job_group == query_object.job_group if query_object.job_group else True,
SysJob.status == query_object.status if query_object.status else True) \
query = (
select(SysJob)
.where(
SysJob.job_name.like(f'%{query_object.job_name}%') if query_object.job_name else True,
SysJob.job_group == query_object.job_group if query_object.job_group else True,
SysJob.status == query_object.status if query_object.status else True,
)
.distinct()
)
job_list = await PageUtil.paginate(db, query, query_object.page_num, query_object.page_size, is_page)
return job_list
@@ -68,11 +76,7 @@ class JobDao:
:param db: orm对象
:return: 定时任务列表信息对象
"""
job_list = (await db.execute(
select(SysJob)
.where(SysJob.status == '0')
.distinct()
)).scalars().all()
job_list = (await db.execute(select(SysJob).where(SysJob.status == '0').distinct())).scalars().all()
return job_list
@@ -98,10 +102,7 @@ class JobDao:
:param job: 需要更新的定时任务字典
:return:
"""
await db.execute(
update(SysJob),
[job]
)
await db.execute(update(SysJob), [job])
@classmethod
async def delete_job_dao(cls, db: AsyncSession, job: JobModel):
@@ -111,7 +112,4 @@ class JobDao:
:param job: 定时任务对象
:return:
"""
await db.execute(
delete(SysJob)
.where(SysJob.job_id.in_([job.job_id]))
)
await db.execute(delete(SysJob).where(SysJob.job_id.in_([job.job_id])))

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

@@ -1,10 +1,10 @@
from sqlalchemy import select, delete
from datetime import datetime, time
from sqlalchemy import delete, select
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 *
from module_admin.entity.vo.job_vo import JobLogModel, JobLogPageQueryModel
from utils.page_util import PageUtil
from datetime import datetime, time
class JobLogDao:
@@ -21,15 +21,21 @@ class JobLogDao:
:param is_page: 是否开启分页
:return: 定时任务日志列表信息对象
"""
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) \
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 = await PageUtil.paginate(db, query, query_object.page_num, query_object.page_size, is_page)
return job_log_list
@@ -56,10 +62,7 @@ class JobLogDao:
:param job_log: 定时任务日志对象
:return:
"""
await db.execute(
delete(SysJobLog)
.where(SysJobLog.job_log_id.in_([job_log.job_log_id]))
)
await db.execute(delete(SysJobLog).where(SysJobLog.job_log_id.in_([job_log.job_log_id])))
@classmethod
async def clear_job_log_dao(cls, db: AsyncSession):
@@ -68,6 +71,4 @@ class JobLogDao:
:param db: orm对象
:return:
"""
await db.execute(
delete(SysJobLog)
)
await db.execute(delete(SysJobLog))