From b52eaa6ae74471bf9b717c16ce4dac10848b1d71 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: Wed, 19 Oct 2022 08:20:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=EF=BC=8C=E7=A7=BB=E9=99=A4Snowflake.Core=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/System/TasksController.cs | 10 ++++------ ZR.Admin.WebApi/Extensions/TasksExtension.cs | 4 +--- ZR.Admin.WebApi/ZR.Admin.WebApi.csproj | 1 - ZR.Model/System/Dto/TasksDto.cs | 6 +++--- ZR.Model/System/{SysTasksQz.cs => SysTasks.cs} | 9 +++++---- ZR.Model/System/SysTasksLog.cs | 2 -- ZR.Service/System/IService/ISysTasksQzService.cs | 6 +++--- ZR.Service/System/SysTasksQzService.cs | 8 ++++---- ZR.Tasks/ITaskSchedulerServer.cs | 12 ++++++------ ZR.Tasks/TaskScheduler/JobBase.cs | 2 +- ZR.Tasks/TaskSchedulerServer.cs | 16 ++++++++-------- 11 files changed, 35 insertions(+), 41 deletions(-) rename ZR.Model/System/{SysTasksQz.cs => SysTasks.cs} (96%) diff --git a/ZR.Admin.WebApi/Controllers/System/TasksController.cs b/ZR.Admin.WebApi/Controllers/System/TasksController.cs index fc99400..5bb2319 100644 --- a/ZR.Admin.WebApi/Controllers/System/TasksController.cs +++ b/ZR.Admin.WebApi/Controllers/System/TasksController.cs @@ -14,7 +14,6 @@ using ZR.Model.System.Dto; using ZR.Model.System; using ZR.Service.System.IService; using ZR.Tasks; -using Snowflake.Core; using Infrastructure.Extensions; namespace ZR.Admin.WebApi.Controllers @@ -46,7 +45,7 @@ namespace ZR.Admin.WebApi.Controllers public IActionResult Query([FromQuery] TasksQueryDto parm, [FromQuery] PagerInfo pager) { //开始拼装查询条件 - var predicate = Expressionable.Create(); + var predicate = Expressionable.Create(); predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.QueryText), m => m.Name.Contains(parm.QueryText) || @@ -100,10 +99,9 @@ namespace ZR.Admin.WebApi.Controllers throw new CustomException($"程序集或者类名不能为空"); } //从 Dto 映射到 实体 - var tasksQz = parm.Adapt().ToCreate(); - var worker = new IdWorker(1, 1); + var tasksQz = parm.Adapt().ToCreate(); tasksQz.Create_by = HttpContext.GetName(); - tasksQz.ID = worker.NextId().ToString(); + tasksQz.ID = SnowFlakeSingle.Instance.NextId().ToString(); return SUCCESS(_tasksQzService.AddTasks(tasksQz)); } @@ -144,7 +142,7 @@ namespace ZR.Admin.WebApi.Controllers { throw new CustomException($"该任务正在运行中，请先停止在更新"); } - var model = parm.Adapt(); + var model = parm.Adapt(); model.Update_by = HttpContextExtension.GetName(HttpContext); int response = _tasksQzService.UpdateTasks(model); if (response > 0) diff --git a/ZR.Admin.WebApi/Extensions/TasksExtension.cs b/ZR.Admin.WebApi/Extensions/TasksExtension.cs index 62b4387..d397336 100644 --- a/ZR.Admin.WebApi/Extensions/TasksExtension.cs +++ b/ZR.Admin.WebApi/Extensions/TasksExtension.cs @@ -3,8 +3,6 @@ using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; using Quartz.Spi; using System; -using System.Threading.Tasks; -using ZR.Service.System.IService; using ZR.Tasks; namespace ZR.Admin.WebApi.Extensions @@ -38,7 +36,7 @@ namespace ZR.Admin.WebApi.Extensions 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).ToList(); //程序启动后注册所有定时任务 foreach (var task in tasks) diff --git a/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj b/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj index 7c8292c..1774037 100644 --- a/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj +++ b/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj @@ -32,7 +32,6 @@ - diff --git a/ZR.Model/System/Dto/TasksDto.cs b/ZR.Model/System/Dto/TasksDto.cs index 198f439..bffb547 100644 --- a/ZR.Model/System/Dto/TasksDto.cs +++ b/ZR.Model/System/Dto/TasksDto.cs @@ -125,12 +125,12 @@ namespace ZR.Model.System.Dto public class TasksUpdateDto { /// - /// 描述 : UID + /// 描述 : 任务id /// 空值 : False /// 默认 : /// - [Display(Name = "UID")] - [Required(ErrorMessage = "UID不能为空")] + [Display(Name = "任务id")] + [Required(ErrorMessage = "任务不能为空")] public string ID { get; set; } /// diff --git a/ZR.Model/System/SysTasksQz.cs b/ZR.Model/System/SysTasks.cs similarity index 96% rename from ZR.Model/System/SysTasksQz.cs rename to ZR.Model/System/SysTasks.cs index 6de9793..971ae41 100644 --- a/ZR.Model/System/SysTasksQz.cs +++ b/ZR.Model/System/SysTasks.cs @@ -10,18 +10,19 @@ namespace ZR.Model.System /// [SugarTable("sys_tasks")] [Tenant("0")] - public class SysTasksQz + public class SysTasks { - public SysTasksQz() + public SysTasks() { } /// - /// 描述 : UID + /// 描述 : 任务id /// 空值 : False /// 默认 : /// - [Display(Name = "UID")] + [Display(Name = "任务id")] + //[JsonConverter(typeof(ValueToStringConverter))] [SugarColumn(IsPrimaryKey = true)] public string ID { get; set; } diff --git a/ZR.Model/System/SysTasksLog.cs b/ZR.Model/System/SysTasksLog.cs index a540d06..8b03ec6 100644 --- a/ZR.Model/System/SysTasksLog.cs +++ b/ZR.Model/System/SysTasksLog.cs @@ -1,8 +1,6 @@ using OfficeOpenXml.Attributes; using SqlSugar; using System; -using System.Collections.Generic; -using System.Text; namespace ZR.Model.System { diff --git a/ZR.Service/System/IService/ISysTasksQzService.cs b/ZR.Service/System/IService/ISysTasksQzService.cs index c081a2c..3ba6690 100644 --- a/ZR.Service/System/IService/ISysTasksQzService.cs +++ b/ZR.Service/System/IService/ISysTasksQzService.cs @@ -3,10 +3,10 @@ using ZR.Model.System.Dto; namespace ZR.Service.System.IService { - public interface ISysTasksQzService : IBaseService + public interface ISysTasksQzService : IBaseService { //SysTasksQz GetId(object id); - int AddTasks(SysTasksQz parm); - int UpdateTasks(SysTasksQz parm); + int AddTasks(SysTasks parm); + int UpdateTasks(SysTasks parm); } } diff --git a/ZR.Service/System/SysTasksQzService.cs b/ZR.Service/System/SysTasksQzService.cs index f5de924..8c4e1c6 100644 --- a/ZR.Service/System/SysTasksQzService.cs +++ b/ZR.Service/System/SysTasksQzService.cs @@ -10,14 +10,14 @@ namespace ZR.Service.System /// 定时任务 /// [AppService(ServiceType = typeof(ISysTasksQzService), ServiceLifetime = LifeTime.Transient)] - public class SysTasksQzService : BaseService, ISysTasksQzService + public class SysTasksQzService : BaseService, ISysTasksQzService { /// /// 添加任务 /// /// /// - public int AddTasks(SysTasksQz parm) + public int AddTasks(SysTasks parm) { parm.IsStart = false; @@ -34,9 +34,9 @@ namespace ZR.Service.System /// /// /// - public int UpdateTasks(SysTasksQz parm) + public int UpdateTasks(SysTasks parm) { - return Update(f => f.ID == parm.ID, f => new SysTasksQz + return Update(f => f.ID == parm.ID, f => new SysTasks { ID = parm.ID, Name = parm.Name, diff --git a/ZR.Tasks/ITaskSchedulerServer.cs b/ZR.Tasks/ITaskSchedulerServer.cs index 2a6e7b9..f8f040e 100644 --- a/ZR.Tasks/ITaskSchedulerServer.cs +++ b/ZR.Tasks/ITaskSchedulerServer.cs @@ -13,16 +13,16 @@ namespace ZR.Tasks Task StopTaskScheduleAsync(); - Task AddTaskScheduleAsync(SysTasksQz tasksQz); + Task AddTaskScheduleAsync(SysTasks tasksQz); - Task PauseTaskScheduleAsync(SysTasksQz tasksQz); + Task PauseTaskScheduleAsync(SysTasks tasksQz); - Task ResumeTaskScheduleAsync(SysTasksQz tasksQz); + Task ResumeTaskScheduleAsync(SysTasks tasksQz); - Task DeleteTaskScheduleAsync(SysTasksQz tasksQz); + Task DeleteTaskScheduleAsync(SysTasks tasksQz); - Task RunTaskScheduleAsync(SysTasksQz tasksQz); + Task RunTaskScheduleAsync(SysTasks tasksQz); - Task UpdateTaskScheduleAsync(SysTasksQz tasksQz); + Task UpdateTaskScheduleAsync(SysTasks tasksQz); } } diff --git a/ZR.Tasks/TaskScheduler/JobBase.cs b/ZR.Tasks/TaskScheduler/JobBase.cs index 52419e0..208473b 100644 --- a/ZR.Tasks/TaskScheduler/JobBase.cs +++ b/ZR.Tasks/TaskScheduler/JobBase.cs @@ -80,7 +80,7 @@ namespace ZR.Tasks //成功后执行次数+1 if (logModel.Status == "0") { - await taskQzService.UpdateAsync(f => new SysTasksQz() + await taskQzService.UpdateAsync(f => new SysTasks() { RunTimes = f.RunTimes + 1, LastRunTime = DateTime.Now diff --git a/ZR.Tasks/TaskSchedulerServer.cs b/ZR.Tasks/TaskSchedulerServer.cs index 0130aad..455c8a6 100644 --- a/ZR.Tasks/TaskSchedulerServer.cs +++ b/ZR.Tasks/TaskSchedulerServer.cs @@ -114,7 +114,7 @@ namespace ZR.Tasks /// /// /// - public async Task AddTaskScheduleAsync(SysTasksQz tasksQz) + public async Task AddTaskScheduleAsync(SysTasks tasksQz) { try { @@ -190,7 +190,7 @@ namespace ZR.Tasks /// /// /// - public async Task PauseTaskScheduleAsync(SysTasksQz tasksQz) + public async Task PauseTaskScheduleAsync(SysTasks tasksQz) { try { @@ -214,7 +214,7 @@ namespace ZR.Tasks /// /// /// - public async Task ResumeTaskScheduleAsync(SysTasksQz tasksQz) + public async Task ResumeTaskScheduleAsync(SysTasks tasksQz) { try { @@ -237,7 +237,7 @@ namespace ZR.Tasks /// /// /// - public async Task DeleteTaskScheduleAsync(SysTasksQz tasksQz) + public async Task DeleteTaskScheduleAsync(SysTasks tasksQz) { try { @@ -260,7 +260,7 @@ namespace ZR.Tasks /// /// /// - public async Task RunTaskScheduleAsync(SysTasksQz tasksQz) + public async Task RunTaskScheduleAsync(SysTasks tasksQz) { try { @@ -291,7 +291,7 @@ namespace ZR.Tasks /// /// /// - public async Task UpdateTaskScheduleAsync(SysTasksQz tasksQz) + public async Task UpdateTaskScheduleAsync(SysTasks tasksQz) { try { @@ -318,7 +318,7 @@ namespace ZR.Tasks /// /// /// - private ITrigger CreateSimpleTrigger(SysTasksQz tasksQz) + private ITrigger CreateSimpleTrigger(SysTasks tasksQz) { if (tasksQz.RunTimes > 0) { @@ -348,7 +348,7 @@ namespace ZR.Tasks /// /// /// - private ITrigger CreateCronTrigger(SysTasksQz tasksQz) + private ITrigger CreateCronTrigger(SysTasks tasksQz) { // 作业触发器 return TriggerBuilder.Create()