perf: 优化定时任务模块service层及异常处理
This commit is contained in:
insistence
@@ -1,12 +1,15 @@
|
||||
from fastapi import Request
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
from typing import List
|
||||
from config.constant import CommonConstant, JobConstant
|
||||
from config.get_scheduler import SchedulerUtil
|
||||
from exceptions.exception import ServiceException
|
||||
from module_admin.dao.job_dao import JobDao
|
||||
from module_admin.entity.vo.common_vo import CrudResponseModel
|
||||
from module_admin.entity.vo.job_vo import DeleteJobModel, EditJobModel, JobModel, JobPageQueryModel
|
||||
from module_admin.service.dict_service import DictDataService
|
||||
from utils.common_util import CamelCaseUtil, export_list2excel
|
||||
from utils.string_util import StringUtil
|
||||
|
||||
|
||||
class JobService:
|
||||
@@ -30,6 +33,21 @@ class JobService:
|
||||
|
||||
return job_list_result
|
||||
|
||||
@classmethod
|
||||
async def check_job_unique_services(cls, query_db: AsyncSession, page_object: JobModel):
|
||||
"""
|
||||
校验定时任务是否存在service
|
||||
|
||||
:param query_db: orm对象
|
||||
:param page_object: 定时任务对象
|
||||
:return: 校验结果
|
||||
"""
|
||||
job_id = -1 if page_object.job_id is None else page_object.job_id
|
||||
job = await JobDao.get_job_detail_by_info(query_db, page_object)
|
||||
if job and job.job_id != job_id:
|
||||
return CommonConstant.NOT_UNIQUE
|
||||
return CommonConstant.UNIQUE
|
||||
|
||||
@classmethod
|
||||
async def add_job_services(cls, query_db: AsyncSession, page_object: JobModel):
|
||||
"""
|
||||
@@ -39,13 +57,28 @@ class JobService:
|
||||
:param page_object: 新增定时任务对象
|
||||
:return: 新增定时任务校验结果
|
||||
"""
|
||||
job = await JobDao.get_job_detail_by_info(query_db, page_object)
|
||||
if job:
|
||||
result = dict(is_success=False, message='定时任务已存在')
|
||||
if not SchedulerUtil.validate_cron_expression(page_object.cron_expression):
|
||||
raise ServiceException(message=f'新增定时任务{page_object.job_name}失败，Cron表达式不正确')
|
||||
elif not await cls.check_job_unique_services(query_db, page_object):
|
||||
raise ServiceException(message=f'新增定时任务{page_object.job_name}失败，定时任务已存在')
|
||||
elif StringUtil.contains_ignore_case(page_object.invoke_target, CommonConstant.LOOKUP_RMI):
|
||||
raise ServiceException(message=f'新增定时任务{page_object.job_name}失败，目标字符串不允许rmi调用')
|
||||
elif StringUtil.contains_any_ignore_case(
|
||||
page_object.invoke_target, [CommonConstant.LOOKUP_LDAP, CommonConstant.LOOKUP_LDAPS]
|
||||
):
|
||||
raise ServiceException(message=f'新增定时任务{page_object.job_name}失败，目标字符串不允许ldap(s)调用')
|
||||
elif StringUtil.contains_any_ignore_case(
|
||||
page_object.invoke_target, [CommonConstant.HTTP, CommonConstant.HTTPS]
|
||||
):
|
||||
raise ServiceException(message=f'新增定时任务{page_object.job_name}失败，目标字符串不允许http(s)调用')
|
||||
elif StringUtil.startswith_any_case(page_object.invoke_target, JobConstant.JOB_ERROR_LIST):
|
||||
raise ServiceException(message=f'新增定时任务{page_object.job_name}失败，目标字符串存在违规')
|
||||
elif not StringUtil.startswith_any_case(page_object.invoke_target, JobConstant.JOB_WHITE_LIST):
|
||||
raise ServiceException(message=f'新增定时任务{page_object.job_name}失败，目标字符串不在白名单内')
|
||||
else:
|
||||
try:
|
||||
await JobDao.add_job_dao(query_db, page_object)
|
||||
job_info = await JobDao.get_job_detail_by_info(query_db, page_object)
|
||||
add_job = await JobDao.add_job_dao(query_db, page_object)
|
||||
job_info = await cls.job_detail_services(query_db, add_job.job_id)
|
||||
if job_info.status == '0':
|
||||
SchedulerUtil.add_scheduler_job(job_info=job_info)
|
||||
await query_db.commit()
|
||||
@@ -68,18 +101,31 @@ class JobService:
|
||||
edit_job = page_object.model_dump(exclude_unset=True)
|
||||
if page_object.type == 'status':
|
||||
del edit_job['type']
|
||||
job_info = await cls.job_detail_services(query_db, edit_job.get('job_id'))
|
||||
job_info = await cls.job_detail_services(query_db, page_object.job_id)
|
||||
if job_info:
|
||||
if page_object.type != 'status' and (
|
||||
job_info.job_name != page_object.job_name
|
||||
or job_info.job_group != page_object.job_group
|
||||
or job_info.invoke_target != page_object.invoke_target
|
||||
or job_info.cron_expression != page_object.cron_expression
|
||||
):
|
||||
job = await JobDao.get_job_detail_by_info(query_db, page_object)
|
||||
if job:
|
||||
result = dict(is_success=False, message='定时任务已存在')
|
||||
return CrudResponseModel(**result)
|
||||
if page_object.type != 'status':
|
||||
if not SchedulerUtil.validate_cron_expression(page_object.cron_expression):
|
||||
raise ServiceException(message=f'修改定时任务{page_object.job_name}失败，Cron表达式不正确')
|
||||
elif not await cls.check_job_unique_services(query_db, page_object):
|
||||
raise ServiceException(message=f'修改定时任务{page_object.job_name}失败，定时任务已存在')
|
||||
elif StringUtil.contains_ignore_case(page_object.invoke_target, CommonConstant.LOOKUP_RMI):
|
||||
raise ServiceException(message=f'修改定时任务{page_object.job_name}失败，目标字符串不允许rmi调用')
|
||||
elif StringUtil.contains_any_ignore_case(
|
||||
page_object.invoke_target, [CommonConstant.LOOKUP_LDAP, CommonConstant.LOOKUP_LDAPS]
|
||||
):
|
||||
raise ServiceException(
|
||||
message=f'修改定时任务{page_object.job_name}失败，目标字符串不允许ldap(s)调用'
|
||||
)
|
||||
elif StringUtil.contains_any_ignore_case(
|
||||
page_object.invoke_target, [CommonConstant.HTTP, CommonConstant.HTTPS]
|
||||
):
|
||||
raise ServiceException(
|
||||
message=f'修改定时任务{page_object.job_name}失败，目标字符串不允许http(s)调用'
|
||||
)
|
||||
elif StringUtil.startswith_any_case(page_object.invoke_target, JobConstant.JOB_ERROR_LIST):
|
||||
raise ServiceException(message=f'修改定时任务{page_object.job_name}失败，目标字符串存在违规')
|
||||
elif not StringUtil.startswith_any_case(page_object.invoke_target, JobConstant.JOB_WHITE_LIST):
|
||||
raise ServiceException(message=f'修改定时任务{page_object.job_name}失败，目标字符串不在白名单内')
|
||||
try:
|
||||
await JobDao.edit_job_dao(query_db, edit_job)
|
||||
query_job = SchedulerUtil.get_scheduler_job(job_id=edit_job.get('job_id'))
|
||||
@@ -89,14 +135,12 @@ class JobService:
|
||||
job_info = await cls.job_detail_services(query_db, edit_job.get('job_id'))
|
||||
SchedulerUtil.add_scheduler_job(job_info=job_info)
|
||||
await query_db.commit()
|
||||
result = dict(is_success=True, message='更新成功')
|
||||
return CrudResponseModel(is_success=True, message='更新成功')
|
||||
except Exception as e:
|
||||
await query_db.rollback()
|
||||
raise e
|
||||
else:
|
||||
result = dict(is_success=False, message='定时任务不存在')
|
||||
|
||||
return CrudResponseModel(**result)
|
||||
raise ServiceException(message='定时任务不存在')
|
||||
|
||||
@classmethod
|
||||
async def execute_job_once_services(cls, query_db: AsyncSession, page_object: JobModel):
|
||||
@@ -113,11 +157,9 @@ class JobService:
|
||||
job_info = await cls.job_detail_services(query_db, page_object.job_id)
|
||||
if job_info:
|
||||
SchedulerUtil.execute_scheduler_job_once(job_info=job_info)
|
||||
result = dict(is_success=True, message='执行成功')
|
||||
return CrudResponseModel(is_success=True, message='执行成功')
|
||||
else:
|
||||
result = dict(is_success=False, message='定时任务不存在')
|
||||
|
||||
return CrudResponseModel(**result)
|
||||
raise ServiceException(message='定时任务不存在')
|
||||
|
||||
@classmethod
|
||||
async def delete_job_services(cls, query_db: AsyncSession, page_object: DeleteJobModel):
|
||||
@@ -137,13 +179,12 @@ class JobService:
|
||||
if query_job:
|
||||
SchedulerUtil.remove_scheduler_job(job_id=job_id)
|
||||
await query_db.commit()
|
||||
result = dict(is_success=True, message='删除成功')
|
||||
return CrudResponseModel(is_success=True, message='删除成功')
|
||||
except Exception as e:
|
||||
await query_db.rollback()
|
||||
raise e
|
||||
else:
|
||||
result = dict(is_success=False, message='传入定时任务id为空')
|
||||
return CrudResponseModel(**result)
|
||||
raise ServiceException(message='传入定时任务id为空')
|
||||
|
||||
@classmethod
|
||||
async def job_detail_services(cls, query_db: AsyncSession, job_id: int):
|
||||
@@ -155,7 +196,10 @@ class JobService:
|
||||
:return: 定时任务id对应的信息
|
||||
"""
|
||||
job = await JobDao.get_job_detail_by_id(query_db, job_id=job_id)
|
||||
result = JobModel(**CamelCaseUtil.transform_result(job))
|
||||
if job:
|
||||
result = JobModel(**CamelCaseUtil.transform_result(job))
|
||||
else:
|
||||
result = JobModel(**dict())
|
||||
|
||||
return result
|
||||
|
||||
|
||||
Reference in New Issue
Block a user