From f52bacd52cbc8f8250766d2910e638a8bf4dbcc8 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期六, 22 六月 2024 16:59:12 +0800
Subject: [PATCH] 调用内部代码的定时任务

---
 Wms/Wms/Controllers/JobController.cs |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Wms/Wms/Controllers/JobController.cs b/Wms/Wms/Controllers/JobController.cs
index f42da03..e7f8e2e 100644
--- a/Wms/Wms/Controllers/JobController.cs
+++ b/Wms/Wms/Controllers/JobController.cs
@@ -6,6 +6,7 @@
 using System.Threading.Tasks;
 using Utility.Entity;
 using Utility;
+using Model.ModelVm;
 
 namespace Wms.Controllers
 {
@@ -50,7 +51,7 @@
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public async Task<string> StopJob([FromBody] JobKey job)
+        public async Task<string> StopJob(JobVm job)
         {
             return await scheduler.StopOrDelScheduleJobAsync(job.Group, job.Name);
         }
@@ -60,7 +61,7 @@
         /// </summary> 
         /// <returns></returns>
         [HttpPost]
-        public async Task<string> RemoveJob([FromBody] JobKey job)
+        public async Task<string> RemoveJob(JobVm job)
         {
             return await scheduler.StopOrDelScheduleJobAsync(job.Group, job.Name, true);
         }
@@ -70,7 +71,7 @@
         /// </summary> 
         /// <returns></returns>
         [HttpPost]
-        public async Task<string> ResumeJob([FromBody] JobKey job)
+        public async Task<string> ResumeJob(JobVm job)
         {
             return await scheduler.ResumeJobAsync(job.Group, job.Name);
         }
@@ -80,7 +81,7 @@
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public async Task<ScheduleEntity> QueryJob([FromBody] JobKey job)
+        public async Task<ScheduleEntity> QueryJob(JobVm job)
         {
             return await scheduler.QueryJobAsync(job.Group, job.Name);
         }
@@ -106,9 +107,10 @@
         /// <param name="job"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<bool> TriggerJob([FromBody] JobKey job)
+        public async Task<bool> TriggerJob(JobVm job)
         {
-            await scheduler.TriggerJobAsync(job);
+            JobKey modKey = new JobKey(job.Name, job.Group);
+            await scheduler.TriggerJobAsync(modKey);
             return true;
         }
 
@@ -118,9 +120,10 @@
         /// <param name="jobKey"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<List<string>> GetJobLogs([FromBody] JobKey jobKey)
+        public async Task<List<string>> GetJobLogs(JobVm job)
         {
-            var logs = await scheduler.GetJobLogsAsync(jobKey);
+            JobKey modKey = new JobKey(job.Name, job.Group);
+            var logs = await scheduler.GetJobLogsAsync(modKey);
             logs?.Reverse();
             return logs;
         }

--
Gitblit v1.8.0