From 07ea3d1c489bf3f46445f0c30ef3f97aecc2855a 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: Thu, 18 May 2023 18:08:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E8=A1=A8is?=
=?UTF-8?q?Start=E4=B8=BAint=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ZR.Admin.WebApi/Controllers/System/TasksController.cs | 6 +++---
ZR.Admin.WebApi/Extensions/TasksExtension.cs | 6 ++----
ZR.Model/System/SysTasks.cs | 2 +-
ZR.Service/System/SysTasksQzService.cs | 2 +-
4 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/ZR.Admin.WebApi/Controllers/System/TasksController.cs b/ZR.Admin.WebApi/Controllers/System/TasksController.cs
index cfa90bf..66fcc42 100644
--- a/ZR.Admin.WebApi/Controllers/System/TasksController.cs
+++ b/ZR.Admin.WebApi/Controllers/System/TasksController.cs
@@ -137,7 +137,7 @@ namespace ZR.Admin.WebApi.Controllers
throw new CustomException($"api地址不能为空");
}
- if (tasksQz.IsStart)
+ if (tasksQz.IsStart == 1)
{
throw new CustomException($"该任务正在运行中,请先停止在更新");
}
@@ -205,7 +205,7 @@ namespace ZR.Admin.WebApi.Controllers
if (taskResult.Code == 200)
{
- tasksQz.IsStart = true;
+ tasksQz.IsStart = 1;
_tasksQzService.Update(tasksQz);
}
@@ -236,7 +236,7 @@ namespace ZR.Admin.WebApi.Controllers
if (taskResult.Code == 200)
{
- tasksQz.IsStart = false;
+ tasksQz.IsStart = 0;
_tasksQzService.Update(tasksQz);
}
diff --git a/ZR.Admin.WebApi/Extensions/TasksExtension.cs b/ZR.Admin.WebApi/Extensions/TasksExtension.cs
index 32ae6e5..e39c620 100644
--- a/ZR.Admin.WebApi/Extensions/TasksExtension.cs
+++ b/ZR.Admin.WebApi/Extensions/TasksExtension.cs
@@ -28,12 +28,10 @@ namespace ZR.Admin.WebApi.Extensions
///
public static IApplicationBuilder UseAddTaskSchedulers(this IApplicationBuilder app)
{
- //var _tasksQzService = (ISysTasksQzService)App.GetRequiredService(typeof(ISysTasksQzService));
-
ITaskSchedulerServer _schedulerServer = app.ApplicationServices.GetRequiredService();
- //var tasks = _tasksQzService.GetList(m => m.IsStart);
- var tasks = SqlSugar.IOC.DbScoped.SugarScope.Queryable().Where(m => m.IsStart).ToList();
+ var tasks = SqlSugar.IOC.DbScoped.SugarScope.Queryable()
+ .Where(m => m.IsStart == 1).ToList();
//程序启动后注册所有定时任务
foreach (var task in tasks)
diff --git a/ZR.Model/System/SysTasks.cs b/ZR.Model/System/SysTasks.cs
index 1609a5e..56519f7 100644
--- a/ZR.Model/System/SysTasks.cs
+++ b/ZR.Model/System/SysTasks.cs
@@ -97,7 +97,7 @@ namespace ZR.Model.System
/// 默认 : 0
///
[Display(Name = "是否启动")]
- public bool IsStart { get; set; }
+ public int IsStart { get; set; }
///
/// 传入参数
diff --git a/ZR.Service/System/SysTasksQzService.cs b/ZR.Service/System/SysTasksQzService.cs
index ddb796d..cb9c1c4 100644
--- a/ZR.Service/System/SysTasksQzService.cs
+++ b/ZR.Service/System/SysTasksQzService.cs
@@ -19,7 +19,7 @@ namespace ZR.Service.System
///
public int AddTasks(SysTasks parm)
{
- parm.IsStart = false;
+ parm.IsStart = 0;
SetAssembleName(parm);