diff --git a/ZR.Admin.WebApi/Controllers/System/TasksController.cs b/ZR.Admin.WebApi/Controllers/System/TasksController.cs index 83a9e015..1fb0e055 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 69c01a78..ddb796dd 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"; + } } /// @@ -36,6 +48,8 @@ namespace ZR.Service.System /// 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, }); } }