SpringSunYY преди 5 месеца
родител
ревизия
e6128ff1e6
променени са 2 файла, в които са добавени 3 реда и са изтрити 2 реда
  1. 1 0
      ruoyi_apscheduler/controller/job.py
  2. 2 2
      ruoyi_apscheduler/service/job.py

+ 1 - 0
ruoyi_apscheduler/controller/job.py

@@ -184,6 +184,7 @@ def common_job_run(dto:SysJob) -> AjaxResponse:
     return AjaxResponse.from_success()
     return AjaxResponse.from_success()
 
 
 
 
+@reg.api.route("/monitor/job/<ids>", methods=["DELETE"])
 @reg.api.route("/monitor/job/remove", methods=["DELETE"])
 @reg.api.route("/monitor/job/remove", methods=["DELETE"])
 @PathValidator()
 @PathValidator()
 @PreAuthorize(HasPerm('monitor:job:remove'))
 @PreAuthorize(HasPerm('monitor:job:remove'))

+ 2 - 2
ruoyi_apscheduler/service/job.py

@@ -117,7 +117,7 @@ class SysJobService:
         Returns:
         Returns:
             int: 删除的任务数量
             int: 删除的任务数量
         """
         """
-        num = SysJobMapper.delete_job(job.job_id)
+        num = SysJobMapper.delete_job_by_id(job.job_id)
         if num > 0:
         if num > 0:
             scheduler.remove_job(job.job_key)
             scheduler.remove_job(job.job_key)
         return num
         return num
@@ -134,7 +134,7 @@ class SysJobService:
         for job_id in job_ids:
         for job_id in job_ids:
             job = cls.select_job_by_id(job_id)
             job = cls.select_job_by_id(job_id)
             if job:
             if job:
-                cls.delete_job(job)
+                cls.delete_job_by_id(job)
     
     
     @classmethod
     @classmethod
     @Transactional(db.session)
     @Transactional(db.session)