From 8d63a105817e9489d56ec73e7278f6d921043f06 Mon Sep 17 00:00:00 2001 From: Mikhail Trubnikov Date: Wed, 29 Nov 2023 15:59:27 +1000 Subject: [PATCH] =?UTF-8?q?feat(bll):=20IntervalService=20-=20=D1=81=D0=B5?= =?UTF-8?q?=D1=80=D0=B2=D0=B8=D1=81=20=D0=B4=D0=BB=D1=8F=20=D1=84=D1=83?= =?UTF-8?q?=D0=BD=D0=BA=D1=86=D0=B8=D0=B9=20=D0=BA=D0=BE=D1=82=D0=BE=D1=80?= =?UTF-8?q?=D1=8B=D0=B5=20=D0=BD=D1=83=D0=B6=D0=BD=D0=BE=20=D0=B2=D1=8B?= =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D0=BD=D0=B8=D1=82=D1=8C=20=D0=B2=20=D0=B8?= =?UTF-8?q?=D0=BD=D1=82=D0=B5=D1=80=D0=B2=D0=B0=D0=BB=D0=B5,=20=D0=BF?= =?UTF-8?q?=D1=80=D0=B8=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B0=20=D0=BA=20Mas?= =?UTF-8?q?ter,=20EsppOrderLoader.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PARR.BLL/ParrBllInstaller.cs | 1 + .../Implementations/IntervalService.cs | 29 ++++++++++++++++ .../Services/Interfaces/IIntervalService.cs | 15 ++++++++ PARR.EsppOrderLoader/EsppOrderLoader.cs | 34 +++++++++++-------- PARR.Master/Master.cs | 34 +++++++++++-------- 5 files changed, 85 insertions(+), 28 deletions(-) create mode 100644 PARR.BLL/Services/Implementations/IntervalService.cs create mode 100644 PARR.BLL/Services/Interfaces/IIntervalService.cs diff --git a/PARR.BLL/ParrBllInstaller.cs b/PARR.BLL/ParrBllInstaller.cs index 5c230b08..e37f21e9 100644 --- a/PARR.BLL/ParrBllInstaller.cs +++ b/PARR.BLL/ParrBllInstaller.cs @@ -19,6 +19,7 @@ namespace PARR.BLL services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); } } } diff --git a/PARR.BLL/Services/Implementations/IntervalService.cs b/PARR.BLL/Services/Implementations/IntervalService.cs new file mode 100644 index 00000000..130e8710 --- /dev/null +++ b/PARR.BLL/Services/Implementations/IntervalService.cs @@ -0,0 +1,29 @@ +using Microsoft.Extensions.Logging; +using PARR.BLL.Services.Interfaces; + +namespace PARR.BLL.Services.Implementations +{ + internal class IntervalService : IIntervalService + { + private readonly ILogger logger; + + public IntervalService(ILogger logger) + { + this.logger = logger; + } + + public async Task IntervalInitAsync(IntervalHandlerDelegate intervalHandler, TimeSpan interval) + { + while (true) + { + logger.LogInformation($"Запуск по расписанию. Интервал: {interval}"); + + await intervalHandler.Invoke(); + + logger.LogInformation($"Следующая дата запуска: {DateTimeOffset.Now.Add(interval)}"); + + await Task.Delay(interval); + } + } + } +} diff --git a/PARR.BLL/Services/Interfaces/IIntervalService.cs b/PARR.BLL/Services/Interfaces/IIntervalService.cs new file mode 100644 index 00000000..fb93ba11 --- /dev/null +++ b/PARR.BLL/Services/Interfaces/IIntervalService.cs @@ -0,0 +1,15 @@ +namespace PARR.BLL.Services.Interfaces +{ + public delegate Task IntervalHandlerDelegate(); + + public interface IIntervalService + { + /// + /// Метод выполняется с интервалом + /// + /// Метод который нужно выполнить + /// Интервал + /// + Task IntervalInitAsync(IntervalHandlerDelegate intervalHandler, TimeSpan interval); + } +} diff --git a/PARR.EsppOrderLoader/EsppOrderLoader.cs b/PARR.EsppOrderLoader/EsppOrderLoader.cs index 125d5361..8438e3cd 100644 --- a/PARR.EsppOrderLoader/EsppOrderLoader.cs +++ b/PARR.EsppOrderLoader/EsppOrderLoader.cs @@ -1,5 +1,6 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; +using PARR.BLL.Services.Interfaces; using PARR.DAL.Contracts; using PARR.EsppApi; using PARR.EsppApi.Models; @@ -16,13 +17,15 @@ namespace PARR.EsppOrderLoader private readonly IEsppApiService esppApiService; private readonly SettingsFromDb settingsFromDb; private readonly IServiceProvider serviceProvider; + private readonly IIntervalService intervalService; public EsppOrderLoader( WorkerSettings settings, ILogger logger, IEsppApiService esppApiService, SettingsFromDb settingsFromDb, - IServiceProvider serviceProvider + IServiceProvider serviceProvider, + IIntervalService intervalService ) { this.settings = settings; @@ -30,6 +33,7 @@ namespace PARR.EsppOrderLoader this.esppApiService = esppApiService; this.settingsFromDb = settingsFromDb; this.serviceProvider = serviceProvider; + this.intervalService = intervalService; } @@ -37,23 +41,25 @@ namespace PARR.EsppOrderLoader { logger.LogInformation("Запуск сервиса загрузки нарядов из ЕСПП."); - var nextStart = DateTime.Now; + await intervalService.IntervalInitAsync(DownloadOrdersAsync, settings.RepeatEvery); - while (true) - { - if (nextStart.Hour == DateTime.Now.Hour && nextStart.Minute == DateTime.Now.Minute) - { - logger.LogInformation("Загрузка списка нарядов из ЕСПП."); + //var nextStart = DateTime.Now; - await DownloadOrdersAsync(); + //while (true) + //{ + // if (nextStart.Hour == DateTime.Now.Hour && nextStart.Minute == DateTime.Now.Minute) + // { + // logger.LogInformation("Загрузка списка нарядов из ЕСПП."); - nextStart = DateTime.Now.Add(settings.RepeatEvery); - logger.LogInformation($"Следующая дата загрузки: {nextStart}"); - } + // await DownloadOrdersAsync(); - // Каждую минуту - await Task.Delay(60 * 1000); - } + // nextStart = DateTime.Now.Add(settings.RepeatEvery); + // logger.LogInformation($"Следующая дата загрузки: {nextStart}"); + // } + + // // Каждую минуту + // await Task.Delay(60 * 1000); + //} } diff --git a/PARR.Master/Master.cs b/PARR.Master/Master.cs index cc15614f..6efe9224 100644 --- a/PARR.Master/Master.cs +++ b/PARR.Master/Master.cs @@ -1,5 +1,6 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; +using PARR.BLL.Services.Interfaces; using PARR.Master.Services; using PARR.Master.Settings; @@ -10,16 +11,19 @@ namespace PARR.Master private readonly WorkerSettings settings; private readonly ILogger logger; private readonly IServiceProvider serviceProvider; + private readonly IIntervalService intervalService; public Master( WorkerSettings settings, ILogger logger, - IServiceProvider serviceProvider + IServiceProvider serviceProvider, + IIntervalService intervalService ) { this.settings = settings; this.logger = logger; this.serviceProvider = serviceProvider; + this.intervalService = intervalService; } @@ -27,23 +31,25 @@ namespace PARR.Master { logger.LogInformation("Запуск сервиса."); - var nextStart = DateTime.Now; + await intervalService.IntervalInitAsync(ManageOrdersAsync, settings.RepeatEvery); - while (true) - { - if (nextStart.Hour == DateTime.Now.Hour && nextStart.Minute == DateTime.Now.Minute) - { - logger.LogInformation("Запуск по расписанию."); + //var nextStart = DateTime.Now; - await ManageOrdersAsync(); + //while (true) + //{ + // if (nextStart.Hour == DateTime.Now.Hour && nextStart.Minute == DateTime.Now.Minute) + // { + // logger.LogInformation("Запуск по расписанию."); - nextStart = DateTime.Now.Add(settings.RepeatEvery); - logger.LogInformation($"Следующая дата запуска: {nextStart}"); - } + // await ManageOrdersAsync(); - // Каждую минуту - await Task.Delay(60 * 1000); - } + // nextStart = DateTime.Now.Add(settings.RepeatEvery); + // logger.LogInformation($"Следующая дата запуска: {nextStart}"); + // } + + // // Каждую минуту + // await Task.Delay(60 * 1000); + // } }