perf: 优化定时任务模块service层及异常处理

2024-07-14 22:37:35 +08:00
parent 4669d6b29b
commit c39375b776
7 changed files with 398 additions and 174 deletions
--- a/ruoyi-fastapi-backend/module_admin/controller/job_controller.py
+++ b/ruoyi-fastapi-backend/module_admin/controller/job_controller.py
@@ -35,14 +35,11 @@ async def get_system_job_list(
    job_page_query: JobPageQueryModel = Depends(JobPageQueryModel.as_query),
    query_db: AsyncSession = Depends(get_db),
 ):
-    try:
-        # 获取分页数据
-        notice_page_query_result = await JobService.get_job_list_services(query_db, job_page_query, is_page=True)
-        logger.info('获取成功')
-        return ResponseUtil.success(model_content=notice_page_query_result)
-    except Exception as e:
-        logger.exception(e)
-        return ResponseUtil.error(msg=str(e))
+    # 获取分页数据
+    notice_page_query_result = await JobService.get_job_list_services(query_db, job_page_query, is_page=True)
+    logger.info('获取成功')
+
+    return ResponseUtil.success(model_content=notice_page_query_result)


@jobController.post('/job', dependencies=[Depends(CheckUserInterfaceAuth('monitor:job:add'))])
@@ -54,21 +51,14 @@ async def add_system_job(
    query_db: AsyncSession = Depends(get_db),
    current_user: CurrentUserModel = Depends(LoginService.get_current_user),
 ):
-    try:
-        add_job.create_by = current_user.user.user_name
-        add_job.create_time = datetime.now()
-        add_job.update_by = current_user.user.user_name
-        add_job.update_time = datetime.now()
-        add_job_result = await JobService.add_job_services(query_db, add_job)
-        if add_job_result.is_success:
-            logger.info(add_job_result.message)
-            return ResponseUtil.success(msg=add_job_result.message)
-        else:
-            logger.warning(add_job_result.message)
-            return ResponseUtil.failure(msg=add_job_result.message)
-    except Exception as e:
-        logger.exception(e)
-        return ResponseUtil.error(msg=str(e))
+    add_job.create_by = current_user.user.user_name
+    add_job.create_time = datetime.now()
+    add_job.update_by = current_user.user.user_name
+    add_job.update_time = datetime.now()
+    add_job_result = await JobService.add_job_services(query_db, add_job)
+    logger.info(add_job_result.message)
+
+    return ResponseUtil.success(msg=add_job_result.message)


@jobController.put('/job', dependencies=[Depends(CheckUserInterfaceAuth('monitor:job:edit'))])
@@ -80,89 +70,62 @@ async def edit_system_job(
    query_db: AsyncSession = Depends(get_db),
    current_user: CurrentUserModel = Depends(LoginService.get_current_user),
 ):
-    try:
-        edit_job.update_by = current_user.user.user_name
-        edit_job.update_time = datetime.now()
-        edit_job_result = await JobService.edit_job_services(query_db, edit_job)
-        if edit_job_result.is_success:
-            logger.info(edit_job_result.message)
-            return ResponseUtil.success(msg=edit_job_result.message)
-        else:
-            logger.warning(edit_job_result.message)
-            return ResponseUtil.failure(msg=edit_job_result.message)
-    except Exception as e:
-        logger.exception(e)
-        return ResponseUtil.error(msg=str(e))
+    edit_job.update_by = current_user.user.user_name
+    edit_job.update_time = datetime.now()
+    edit_job_result = await JobService.edit_job_services(query_db, edit_job)
+    logger.info(edit_job_result.message)
+
+    return ResponseUtil.success(msg=edit_job_result.message)


@jobController.put('/job/changeStatus', dependencies=[Depends(CheckUserInterfaceAuth('monitor:job:changeStatus'))])
@log_decorator(title='定时任务管理', business_type=BusinessType.UPDATE)
 async def change_system_job_status(
    request: Request,
-    edit_job: EditJobModel,
+    change_job: EditJobModel,
    query_db: AsyncSession = Depends(get_db),
    current_user: CurrentUserModel = Depends(LoginService.get_current_user),
 ):
-    try:
-        edit_job.update_by = current_user.user.user_name
-        edit_job.update_time = datetime.now()
-        edit_job.type = 'status'
-        edit_job_result = await JobService.edit_job_services(query_db, edit_job)
-        if edit_job_result.is_success:
-            logger.info(edit_job_result.message)
-            return ResponseUtil.success(msg=edit_job_result.message)
-        else:
-            logger.warning(edit_job_result.message)
-            return ResponseUtil.failure(msg=edit_job_result.message)
-    except Exception as e:
-        logger.exception(e)
-        return ResponseUtil.error(msg=str(e))
+    edit_job = EditJobModel(
+        jobId=change_job.job_id,
+        status=change_job.status,
+        updateBy=current_user.user.user_name,
+        updateTime=datetime.now(),
+        type='status',
+    )
+    edit_job_result = await JobService.edit_job_services(query_db, edit_job)
+    logger.info(edit_job_result.message)
+
+    return ResponseUtil.success(msg=edit_job_result.message)


@jobController.put('/job/run', dependencies=[Depends(CheckUserInterfaceAuth('monitor:job:changeStatus'))])
@log_decorator(title='定时任务管理', business_type=BusinessType.UPDATE)
 async def execute_system_job(request: Request, execute_job: JobModel, query_db: AsyncSession = Depends(get_db)):
-    try:
-        execute_job_result = await JobService.execute_job_once_services(query_db, execute_job)
-        if execute_job_result.is_success:
-            logger.info(execute_job_result.message)
-            return ResponseUtil.success(msg=execute_job_result.message)
-        else:
-            logger.warning(execute_job_result.message)
-            return ResponseUtil.failure(msg=execute_job_result.message)
-    except Exception as e:
-        logger.exception(e)
-        return ResponseUtil.error(msg=str(e))
+    execute_job_result = await JobService.execute_job_once_services(query_db, execute_job)
+    logger.info(execute_job_result.message)
+
+    return ResponseUtil.success(msg=execute_job_result.message)


@jobController.delete('/job/{job_ids}', dependencies=[Depends(CheckUserInterfaceAuth('monitor:job:remove'))])
@log_decorator(title='定时任务管理', business_type=BusinessType.DELETE)
 async def delete_system_job(request: Request, job_ids: str, query_db: AsyncSession = Depends(get_db)):
-    try:
-        delete_job = DeleteJobModel(jobIds=job_ids)
-        delete_job_result = await JobService.delete_job_services(query_db, delete_job)
-        if delete_job_result.is_success:
-            logger.info(delete_job_result.message)
-            return ResponseUtil.success(msg=delete_job_result.message)
-        else:
-            logger.warning(delete_job_result.message)
-            return ResponseUtil.failure(msg=delete_job_result.message)
-    except Exception as e:
-        logger.exception(e)
-        return ResponseUtil.error(msg=str(e))
+    delete_job = DeleteJobModel(jobIds=job_ids)
+    delete_job_result = await JobService.delete_job_services(query_db, delete_job)
+    logger.info(delete_job_result.message)
+
+    return ResponseUtil.success(msg=delete_job_result.message)


@jobController.get(
    '/job/{job_id}', response_model=JobModel, dependencies=[Depends(CheckUserInterfaceAuth('monitor:job:query'))]
 )
 async def query_detail_system_job(request: Request, job_id: int, query_db: AsyncSession = Depends(get_db)):
-    try:
-        job_detail_result = await JobService.job_detail_services(query_db, job_id)
-        logger.info(f'获取job_id为{job_id}的信息成功')
-        return ResponseUtil.success(data=job_detail_result)
-    except Exception as e:
-        logger.exception(e)
-        return ResponseUtil.error(msg=str(e))
+    job_detail_result = await JobService.job_detail_services(query_db, job_id)
+    logger.info(f'获取job_id为{job_id}的信息成功')
+
+    return ResponseUtil.success(data=job_detail_result)


@jobController.post('/job/export', dependencies=[Depends(CheckUserInterfaceAuth('monitor:job:export'))])
@@ -172,15 +135,12 @@ async def export_system_job_list(
    job_page_query: JobPageQueryModel = Depends(JobPageQueryModel.as_form),
    query_db: AsyncSession = Depends(get_db),
 ):
-    try:
-        # 获取全量数据
-        job_query_result = await JobService.get_job_list_services(query_db, job_page_query, is_page=False)
-        job_export_result = await JobService.export_job_list_services(request, job_query_result)
-        logger.info('导出成功')
-        return ResponseUtil.streaming(data=bytes2file_response(job_export_result))
-    except Exception as e:
-        logger.exception(e)
-        return ResponseUtil.error(msg=str(e))
+    # 获取全量数据
+    job_query_result = await JobService.get_job_list_services(query_db, job_page_query, is_page=False)
+    job_export_result = await JobService.export_job_list_services(request, job_query_result)
+    logger.info('导出成功')
+
+    return ResponseUtil.streaming(data=bytes2file_response(job_export_result))


@jobController.get(
@@ -191,49 +151,32 @@ async def get_system_job_log_list(
    job_log_page_query: JobLogPageQueryModel = Depends(JobLogPageQueryModel.as_query),
    query_db: AsyncSession = Depends(get_db),
 ):
-    try:
-        # 获取分页数据
-        job_log_page_query_result = await JobLogService.get_job_log_list_services(
-            query_db, job_log_page_query, is_page=True
-        )
-        logger.info('获取成功')
-        return ResponseUtil.success(model_content=job_log_page_query_result)
-    except Exception as e:
-        logger.exception(e)
-        return ResponseUtil.error(msg=str(e))
+    # 获取分页数据
+    job_log_page_query_result = await JobLogService.get_job_log_list_services(
+        query_db, job_log_page_query, is_page=True
+    )
+    logger.info('获取成功')
+
+    return ResponseUtil.success(model_content=job_log_page_query_result)


@jobController.delete('/jobLog/clean', dependencies=[Depends(CheckUserInterfaceAuth('monitor:job:remove'))])
@log_decorator(title='定时任务日志管理', business_type=BusinessType.CLEAN)
 async def clear_system_job_log(request: Request, query_db: AsyncSession = Depends(get_db)):
-    try:
-        clear_job_log_result = await JobLogService.clear_job_log_services(query_db)
-        if clear_job_log_result.is_success:
-            logger.info(clear_job_log_result.message)
-            return ResponseUtil.success(msg=clear_job_log_result.message)
-        else:
-            logger.warning(clear_job_log_result.message)
-            return ResponseUtil.failure(msg=clear_job_log_result.message)
-    except Exception as e:
-        logger.exception(e)
-        return ResponseUtil.error(msg=str(e))
+    clear_job_log_result = await JobLogService.clear_job_log_services(query_db)
+    logger.info(clear_job_log_result.message)
+
+    return ResponseUtil.success(msg=clear_job_log_result.message)


@jobController.delete('/jobLog/{job_log_ids}', dependencies=[Depends(CheckUserInterfaceAuth('monitor:job:remove'))])
@log_decorator(title='定时任务日志管理', business_type=BusinessType.DELETE)
 async def delete_system_job_log(request: Request, job_log_ids: str, query_db: AsyncSession = Depends(get_db)):
-    try:
-        delete_job_log = DeleteJobLogModel(jobLogIds=job_log_ids)
-        delete_job_log_result = await JobLogService.delete_job_log_services(query_db, delete_job_log)
-        if delete_job_log_result.is_success:
-            logger.info(delete_job_log_result.message)
-            return ResponseUtil.success(msg=delete_job_log_result.message)
-        else:
-            logger.warning(delete_job_log_result.message)
-            return ResponseUtil.failure(msg=delete_job_log_result.message)
-    except Exception as e:
-        logger.exception(e)
-        return ResponseUtil.error(msg=str(e))
+    delete_job_log = DeleteJobLogModel(jobLogIds=job_log_ids)
+    delete_job_log_result = await JobLogService.delete_job_log_services(query_db, delete_job_log)
+    logger.info(delete_job_log_result.message)
+
+    return ResponseUtil.success(msg=delete_job_log_result.message)


@jobController.post('/jobLog/export', dependencies=[Depends(CheckUserInterfaceAuth('monitor:job:export'))])
@@ -243,14 +186,9 @@ async def export_system_job_log_list(
    job_log_page_query: JobLogPageQueryModel = Depends(JobLogPageQueryModel.as_form),
    query_db: AsyncSession = Depends(get_db),
 ):
-    try:
-        # 获取全量数据
-        job_log_query_result = await JobLogService.get_job_log_list_services(
-            query_db, job_log_page_query, is_page=False
-        )
-        job_log_export_result = await JobLogService.export_job_log_list_services(request, job_log_query_result)
-        logger.info('导出成功')
-        return ResponseUtil.streaming(data=bytes2file_response(job_log_export_result))
-    except Exception as e:
-        logger.exception(e)
-        return ResponseUtil.error(msg=str(e))
+    # 获取全量数据
+    job_log_query_result = await JobLogService.get_job_log_list_services(query_db, job_log_page_query, is_page=False)
+    job_log_export_result = await JobLogService.export_job_log_list_services(request, job_log_query_result)
+    logger.info('导出成功')
+
+    return ResponseUtil.streaming(data=bytes2file_response(job_log_export_result))