From b6c47c3e0133a223a3173dd2a43d778adae2478c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Tue, 6 Dec 2022 18:15:35 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E7=BD=91=E7=BB=9C=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E8=AF=B7=E6=B1=82=E6=96=B9=E6=B3=95=E6=B2=A1=E5=AD=98?=
 =?UTF-8?q?=E5=82=A8=E5=88=B0db?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/System/TasksController.cs      | 18 ++----------------
 ZR.Service/System/SysTasksQzService.cs         | 17 ++++++++++++++++-
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/ZR.Admin.WebApi/Controllers/System/TasksController.cs b/ZR.Admin.WebApi/Controllers/System/TasksController.cs
index 83a9e01..1fb0e05 100644
--- a/ZR.Admin.WebApi/Controllers/System/TasksController.cs
+++ b/ZR.Admin.WebApi/Controllers/System/TasksController.cs
@@ -53,7 +53,7 @@ namespace ZR.Admin.WebApi.Controllers
                 m.AssemblyName.Contains(parm.QueryText));
             predicate.AndIF(parm.TaskType != null, m => m.TaskType == parm.TaskType);
 
-            var response = _tasksQzService.GetPages(predicate.ToExpression(), pager, f => f.IsStart, OrderByType.Desc);
+            var response = _tasksQzService.GetPages(predicate.ToExpression(), pager);
 
             return SUCCESS(response, TIME_FORMAT_FULL);
         }
@@ -99,11 +99,6 @@ namespace ZR.Admin.WebApi.Controllers
             {
                 throw new CustomException($"sql语句不能为空");
             }
-            if (parm.SqlText.IfNotEmpty() && parm.TaskType == 3)
-            {
-                parm.AssemblyName = "ZR.Tasks";
-                parm.ClassName = "TaskScheduler.Job_SqlExecute";
-            }
             if (parm.TaskType == 1 && (parm.AssemblyName.IsEmpty() || parm.ClassName.IsEmpty()))
             {
                 throw new CustomException($"程序集或者类名不能为空");
@@ -143,16 +138,7 @@ namespace ZR.Admin.WebApi.Controllers
             {
                 throw new CustomException($"api地址不能为空");
             }
-            if (parm.ApiUrl.IfNotEmpty() && parm.TaskType == 2)
-            {
-                parm.AssemblyName = "ZR.Tasks";
-                parm.ClassName = "TaskScheduler.Job_HttpRequest";
-            }
-            if (parm.SqlText.IfNotEmpty() && parm.TaskType == 3)
-            {
-                parm.AssemblyName = "ZR.Tasks";
-                parm.ClassName = "TaskScheduler.Job_SqlExecute";
-            }
+
             if (tasksQz.IsStart)
             {
                 throw new CustomException($"该任务正在运行中，请先停止在更新");
diff --git a/ZR.Service/System/SysTasksQzService.cs b/ZR.Service/System/SysTasksQzService.cs
index 69c01a7..ddb796d 100644
--- a/ZR.Service/System/SysTasksQzService.cs
+++ b/ZR.Service/System/SysTasksQzService.cs
@@ -21,12 +21,24 @@ namespace ZR.Service.System
         {
             parm.IsStart = false;
 
+            SetAssembleName(parm);
+
+            return Add(parm);
+        }
+
+        private void SetAssembleName(SysTasks parm)
+        {
             if (parm.ApiUrl.IfNotEmpty() && parm.TaskType == 2)
             {
                 parm.AssemblyName = "ZR.Tasks";
                 parm.ClassName = "TaskScheduler.Job_HttpRequest";
             }
-            return Add(parm);
+
+            if (parm.SqlText.IfNotEmpty() && parm.TaskType == 3)
+            {
+                parm.AssemblyName = "ZR.Tasks";
+                parm.ClassName = "TaskScheduler.Job_SqlExecute";
+            }
         }
 
         /// <summary>
@@ -36,6 +48,8 @@ namespace ZR.Service.System
         /// <returns></returns>
         public int UpdateTasks(SysTasks parm)
         {
+            SetAssembleName(parm);
+
             return Update(f => f.ID == parm.ID, f => new SysTasks
             {
                 ID = parm.ID,
@@ -54,6 +68,7 @@ namespace ZR.Service.System
                 TaskType = parm.TaskType,
                 ApiUrl = parm.ApiUrl,
                 SqlText = parm.SqlText,
+                RequestMethod = parm.RequestMethod,
             });
         }
     }