From 996acccd51e8fd31a26d92b012e34b6fbbcf2237 Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期四, 22 八月 2024 14:40:59 +0800
Subject: [PATCH] Merge branch 'master' into Liudl

---
 Wms/Wms/Controllers/JobController.cs |   53 +++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/Wms/Wms/Controllers/JobController.cs b/Wms/Wms/Controllers/JobController.cs
index f42da03..f35990d 100644
--- a/Wms/Wms/Controllers/JobController.cs
+++ b/Wms/Wms/Controllers/JobController.cs
@@ -2,18 +2,22 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Quartz;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Utility.Entity;
 using Utility;
+using Model.ModelVm;
+using Microsoft.AspNetCore.Authorization;
 
 namespace Wms.Controllers
 {
     /// <summary>
     /// 浠诲姟璋冨害
     /// </summary>
-    [Route("api/[controller]/[Action]")]
-    [EnableCors("AllowSameDomain")] //鍏佽璺ㄥ煙 
+    [Route("api/[controller]/[action]")]
+    [ApiController]
+    [Authorize]
     [ServiceFilter(typeof(ApiResponseActionFilter))]
     public class JobController : ControllerBase
     {
@@ -34,14 +38,14 @@
         /// <param name="entity"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<string> AddJob([FromBody] ScheduleEntity entity)
+        public async Task<string> AddJob(ScheduleEntity entity)
         {
             if (entity.TriggerType == TriggerTypeEnum.Cron &&
                      entity.Cron == "* * * * * ?")
             {
                 return "涓嶅厑璁歌繃棰戠箒鎵ц浠诲姟锛�";
             }
-
+            throw Oops.Bah("娴嬭瘯寮傚父");
             return await scheduler.AddScheduleJobAsync(entity);
         }
 
@@ -50,7 +54,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 +64,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 +74,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 +84,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);
         }
@@ -91,10 +95,18 @@
         /// <param name="entity"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<string> ModifyJob([FromBody] ModifyJobInput entity)
+        public async Task<string> ModifyJob(ModifyJobInput entity)
         {
             var jobKey = new JobKey(entity.OldScheduleEntity.JobName, entity.OldScheduleEntity.JobGroup);
-            var runNumber = await scheduler.GetRunNumberAsync(jobKey);
+            long runNumber = 0;
+            try
+            {
+                runNumber = await scheduler.GetRunNumberAsync(jobKey);
+            }
+            catch (Exception)
+            {
+
+            }
             await scheduler.StopOrDelScheduleJobAsync(entity.OldScheduleEntity.JobGroup, entity.OldScheduleEntity.JobName, true);
             await scheduler.AddScheduleJobAsync(entity.NewScheduleEntity, runNumber);
             return "淇敼璁″垝浠诲姟鎴愬姛锛�";
@@ -106,9 +118,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 +131,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;
         }
@@ -150,9 +164,16 @@
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-        public async Task<List<JobInfoEntity>> GetAllJob()
+        public async Task<List<JobInfo>> GetAllJob()
         {
-            return await scheduler.GetAllJobAsync();
+            var list = await scheduler.GetAllJobAsync();
+            var listJob = new List<JobInfo>();
+            foreach (var mod in list)
+            {
+                mod.JobInfoList.ForEach(s => s.GroupName = mod.GroupName);
+                listJob.AddRange(mod.JobInfoList);
+            }
+            return listJob;
         }
 
         /// <summary>

--
Gitblit v1.8.0