diff --git a/backend/app/api/v1/services/system/job_service.py b/backend/app/api/v1/services/system/job_service.py index 043be833..f8706215 100644 --- a/backend/app/api/v1/services/system/job_service.py +++ b/backend/app/api/v1/services/system/job_service.py @@ -77,9 +77,9 @@ class JobService: elif option == 2: SchedulerUtil().resume_job(job_id=id) await JobCRUD(auth).set_obj_field_crud(ids=[id], status=True) - elif option == 3: - SchedulerUtil().reschedule_job(job_id=id) - await JobCRUD(auth).set_obj_field_crud(ids=[id], status=False) + # elif option == 3: + # SchedulerUtil().reschedule_job(job_id=id) + # await JobCRUD(auth).set_obj_field_crud(ids=[id], status=False) @classmethod async def export_job_service(cls, data_list: List[Dict[str, Any]]) -> bytes: diff --git a/backend/app/core/ap_scheduler.py b/backend/app/core/ap_scheduler.py index b9b275f1..0eb905e4 100644 --- a/backend/app/core/ap_scheduler.py +++ b/backend/app/core/ap_scheduler.py @@ -260,10 +260,12 @@ class SchedulerUtil: :param job_id: 任务id :return: """ + logger.info(f"开始获取全部任务:{cls.get_all_jobs()}, 状态: {cls.get_job_status()}") query_job = cls.get_job(job_id=str(job_id)) if not query_job: raise ValueError(f"未找到该任务:{job_id}") scheduler.pause_job(job_id=str(job_id)) + logger.info(f"查看获取全部任务:{cls.get_all_jobs()}, 状态: {cls.get_job_status()}") @classmethod def resume_job(cls, job_id: Union[str, int]): @@ -272,10 +274,13 @@ class SchedulerUtil: :param job_id: 任务id :return: """ + + logger.info(f"开始获取全部任务:{cls.get_all_jobs()}, 状态: {cls.get_job_status()}") query_job = cls.get_job(job_id=str(job_id)) if not query_job: raise ValueError(f"未找到该任务:{job_id}") scheduler.resume_job(job_id=str(job_id)) + logger.info(f"查看获取全部任务:{cls.get_all_jobs()}, 状态: {cls.get_job_status()}") @classmethod def reschedule_job(cls, job_id: Union[str, int]) -> Job: @@ -284,10 +289,12 @@ class SchedulerUtil: :param job_id: 任务id :return: 重启后的任务对象 """ + logger.info(f"开始获取全部任务:{cls.get_all_jobs()}, 状态: {cls.get_job_status()}") query_job = cls.get_job(job_id=str(job_id)) if not query_job: raise CustomException(msg=f"未找到该任务:{job_id}") - return scheduler.reschedule_job(job_id=str(job_id)) + scheduler.reschedule_job(job_id=str(job_id)) + logger.info(f"查看获取全部任务:{cls.get_all_jobs()}, 状态: {cls.get_job_status()}") @classmethod def export_jobs(cls): diff --git a/backend/dev_sql.db b/backend/dev_sql.db index 6df4a45d..5ad2502c 100644 Binary files a/backend/dev_sql.db and b/backend/dev_sql.db differ diff --git a/frontend/src/components/TopTags/index.vue b/frontend/src/components/TopTags/index.vue index bf1a87bb..e11b6384 100644 --- a/frontend/src/components/TopTags/index.vue +++ b/frontend/src/components/TopTags/index.vue @@ -16,25 +16,29 @@ /> - diff --git a/frontend/src/layouts/basicLayout.vue b/frontend/src/layouts/basicLayout.vue index 69c2a24d..b82f562a 100644 --- a/frontend/src/layouts/basicLayout.vue +++ b/frontend/src/layouts/basicLayout.vue @@ -130,12 +130,12 @@
-
+ -
+
diff --git a/frontend/src/views/system/job/index.vue b/frontend/src/views/system/job/index.vue index fdd370a8..2a2c1e49 100644 --- a/frontend/src/views/system/job/index.vue +++ b/frontend/src/views/system/job/index.vue @@ -102,7 +102,7 @@ 暂停 恢复 - 重启 + @@ -866,7 +866,7 @@ const handleClear = () => { }) } -// 操作按钮:操作类型 1: 暂停 2: 恢复 3: 重启 +// 操作按钮:操作类型 1: 暂停 2: 恢复 3: 重启(暂时移除重启) const handleOption = (row: tableJobType, option: number) => { OptionJob({ id: row.id, option: option }).then(() => { loadingData();