diff --git a/PARR.Constants/TemplateActivatorActionsEnum.cs b/PARR.Constants/TemplateActivatorActionsEnum.cs
index 661577dd..64ae3f64 100644
--- a/PARR.Constants/TemplateActivatorActionsEnum.cs
+++ b/PARR.Constants/TemplateActivatorActionsEnum.cs
@@ -35,14 +35,14 @@
///
DeactivateAllSchedules = 5,
- ///
+ ///
/// Активировать все расписания у которых активированы шаблоны
- ///
+ ///
ActivateSchedulesWithActiveTemplates = 6,
- ///
+ ///
/// Деактивировать все расписания у которых деактивированы шаблоны
- ///
+ ///
DeactivateSchedulesWithDeactivationTemplates = 7
diff --git a/PARR.TemplateActivator/IMqTemplateActivator.cs b/PARR.TemplateActivator/IMqTemplateActivator.cs
new file mode 100644
index 00000000..02eae893
--- /dev/null
+++ b/PARR.TemplateActivator/IMqTemplateActivator.cs
@@ -0,0 +1,7 @@
+namespace PARR.TemplateActivator;
+
+public interface IMqTemplateActivator
+{
+ void Start();
+ void Stop();
+}
diff --git a/PARR.TemplateActivator/ITemplateActivator.cs b/PARR.TemplateActivator/ITemplateActivator.cs
new file mode 100644
index 00000000..c0d9f359
--- /dev/null
+++ b/PARR.TemplateActivator/ITemplateActivator.cs
@@ -0,0 +1,8 @@
+using PARR.Constants;
+
+namespace PARR.TemplateActivator;
+
+public interface ITemplateActivator
+{
+ Task ChangeStateAsync(Guid applicationInWorkId, TemplateActivatorActionsEnum action);
+}
diff --git a/PARR.TemplateActivator/MqTemplateActivator.cs b/PARR.TemplateActivator/MqTemplateActivator.cs
new file mode 100644
index 00000000..c3053447
--- /dev/null
+++ b/PARR.TemplateActivator/MqTemplateActivator.cs
@@ -0,0 +1,71 @@
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using PARR.BLL.Domain.Mq;
+using PARR.BLL.Services.Interfaces;
+using PARR.Constants;
+
+namespace PARR.TemplateActivator;
+
+internal class MqTemplateActivator : IMqTemplateActivator
+{
+ private readonly MqSettings mqSettings;
+ private readonly IMqService mqService;
+ private readonly ILogger logger;
+ private readonly ITransformService transformService;
+ private readonly IValidatorService validatorService;
+ private readonly IServiceProvider serviceProvider;
+
+ public MqTemplateActivator(
+ MqSettings mqSettings,
+ IMqService mqService,
+ ILogger logger,
+ ITransformService transformService,
+ IValidatorService validatorService,
+ IServiceProvider serviceProvider
+ )
+ {
+ this.mqSettings = mqSettings;
+ this.mqService = mqService;
+ this.logger = logger;
+ this.transformService = transformService;
+ this.validatorService = validatorService;
+ this.serviceProvider = serviceProvider;
+ }
+ public void Start()
+ {
+ var isConnected = mqService.InitConsumer(mqSettings, UpdateTemplateStatusAsync);
+
+ if (!isConnected)
+ throw new Exception("Ошибка при подключении к RabbitMq");
+ }
+
+ private async Task UpdateTemplateStatusAsync(string msg)
+ {
+ logger.LogInformation($"{this.GetType().Name}. Получили запрос: {msg}");
+
+ var query = transformService.GetModelFromJson(msg);
+ if (query == null)
+ return;
+
+ if (!await validatorService.IsValidApplicationInWorkAsync(query.ApplicationInWorkId))
+ {
+ logger.LogError($"{this.GetType().Name}. Некорректные параметры регламентной работы {nameof(query.ApplicationInWorkId)}: {query.ApplicationInWorkId}");
+ return;
+ }
+
+ using (var scope = serviceProvider.CreateScope())
+ {
+ var service = scope.ServiceProvider.GetService();
+ if (service == null)
+ throw new Exception($"{this.GetType().Name}. Не найден сервис: {nameof(service.GetType)}");
+
+ await service.ChangeStateAsync(query.ApplicationInWorkId, query.Action);
+
+ }
+ }
+
+ public void Stop()
+ {
+ mqService.Dispose();
+ }
+}
diff --git a/PARR.TemplateActivator/Services/IValidatorService.cs b/PARR.TemplateActivator/Services/IValidatorService.cs
new file mode 100644
index 00000000..86c6de70
--- /dev/null
+++ b/PARR.TemplateActivator/Services/IValidatorService.cs
@@ -0,0 +1,8 @@
+using PARR.Constants;
+
+namespace PARR.TemplateActivator;
+
+internal interface IValidatorService
+{
+ Task IsValidApplicationInWorkAsync(Guid applicationInWorkId);
+}
diff --git a/PARR.TemplateActivator/Services/ValidatorService.cs b/PARR.TemplateActivator/Services/ValidatorService.cs
new file mode 100644
index 00000000..b4b31388
--- /dev/null
+++ b/PARR.TemplateActivator/Services/ValidatorService.cs
@@ -0,0 +1,42 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using PARR.Constants;
+using PARR.DAL.Services.Interfaces;
+
+namespace PARR.TemplateActivator;
+internal class ValidatorService : IValidatorService
+{
+ private readonly IServiceProvider serviceProvider;
+ private readonly ILogger logger;
+
+ public ValidatorService(IServiceProvider serviceProvider,
+ ILogger logger
+ )
+ {
+ this.serviceProvider = serviceProvider;
+ this.logger = logger;
+ }
+
+ public async Task IsValidApplicationInWorkAsync(Guid applicationInWorkId)
+ {
+ using (var scope = serviceProvider.CreateScope())
+ {
+ var service = scope.ServiceProvider.GetService();
+
+ if (service == null)
+ throw new Exception($"Не найден сервис: {nameof(IApplicationsInWorkService)}");
+
+ var appInWork = await service.Get()
+ .FirstOrDefaultAsync(t => t.Id == applicationInWorkId);
+
+ if (appInWork == null)
+ {
+ logger.LogError($"Не найдена регалментная работа {nameof(applicationInWorkId)}: {applicationInWorkId}");
+ return false;
+ }
+
+ return true;
+ }
+ }
+}
\ No newline at end of file
diff --git a/PARR.TemplateActivator/Settings/MqSettings.cs b/PARR.TemplateActivator/Settings/MqSettings.cs
new file mode 100644
index 00000000..426a9831
--- /dev/null
+++ b/PARR.TemplateActivator/Settings/MqSettings.cs
@@ -0,0 +1,12 @@
+using PARR.BLL.Contracts.Interfaces;
+
+namespace PARR.TemplateActivator;
+
+internal class MqSettings : IMqSettings
+{
+ public string HostName { get; set; } = string.Empty;
+ public string QueueName { get; set; } = string.Empty;
+ public string User { get; set; } = string.Empty;
+ public string Password { get; set; } = string.Empty;
+}
+
diff --git a/PARR.TemplateActivator/TemplateActivator.cs b/PARR.TemplateActivator/TemplateActivator.cs
new file mode 100644
index 00000000..29c9bbd2
--- /dev/null
+++ b/PARR.TemplateActivator/TemplateActivator.cs
@@ -0,0 +1,113 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using PARR.Constants;
+using PARR.DAL.Contracts;
+using PARR.DAL.Models;
+using PARR.DAL.Services.Interfaces;
+
+namespace PARR.TemplateActivator;
+
+internal class TemplateActivator : ITemplateActivator
+{
+ private readonly ILogger logger;
+ private readonly ITemplateService templateService;
+ private readonly IRobotConfigurationService robotConfigurationService;
+
+ public TemplateActivator(
+ ILogger logger,
+ ITemplateService templateService,
+ IRobotConfigurationService robotConfigurationService
+ )
+ {
+ this.logger = logger;
+ this.templateService = templateService;
+ this.robotConfigurationService = robotConfigurationService;
+ }
+ public async Task ChangeStateAsync(Guid applicationInWorkId, TemplateActivatorActionsEnum action)
+ {
+ var query = templateService.Get()
+ .Include(t => t.RobotConfigurations).ThenInclude(t => t.Robot)
+ .Where(t => t.ApplicationInWorkId == applicationInWorkId);
+ var changes = 0;
+ switch (action)
+ {
+ case TemplateActivatorActionsEnum.ActivateAllTemplates:
+ query = query.Where(t => !t.IsActiveTemplate);
+ changes = await UpdateTemplateStateAsync(query, true);
+ break;
+ case TemplateActivatorActionsEnum.ActivateTemplatesWithActiveSchedules:
+ query = query.Where(t => !t.IsActiveTemplate && t.IsActiveSchedule);
+ changes = await UpdateTemplateStateAsync(query, true);
+ break;
+ case TemplateActivatorActionsEnum.DeactivateAllTemplates:
+ query = query.Where(t => t.IsActiveTemplate);
+ changes = await UpdateTemplateStateAsync(query, false);
+ break;
+ case TemplateActivatorActionsEnum.DeactivateTemplatesWithDeactivationSchedules:
+ query = query.Where(t => !t.IsActiveTemplate && !t.IsActiveSchedule);
+ changes = await UpdateTemplateStateAsync(query, false);
+ break;
+ case TemplateActivatorActionsEnum.ActivateAllSchedules:
+ query = query.Where(t => !t.IsActiveSchedule);
+ changes = await UpdateScheduleStateAsync(query, true);
+ break;
+ case TemplateActivatorActionsEnum.DeactivateAllSchedules:
+ query = query.Where(t => t.IsActiveSchedule);
+ changes = await UpdateScheduleStateAsync(query, false);
+ break;
+ case TemplateActivatorActionsEnum.ActivateSchedulesWithActiveTemplates:
+ query = query.Where(t => t.IsActiveTemplate && !t.IsActiveSchedule);
+ changes = await UpdateScheduleStateAsync(query, true);
+ break;
+ case TemplateActivatorActionsEnum.DeactivateSchedulesWithDeactivationTemplates:
+ query = query.Where(t => !t.IsActiveTemplate);
+ changes = await UpdateScheduleStateAsync(query, false);
+ break;
+ default:
+ break;
+ }
+
+ if (changes > 0 && !await templateService.CommitAsync())
+ logger.LogError($"{this.GetType} не удалось записать измения состояний шаблонов и расписаний регламентной работы {applicationInWorkId}");
+
+ }
+
+ private async Task UpdateScheduleStateAsync(IQueryable query, bool newState)
+ {
+ var templates = await query.Select(t => t).ToListAsync();
+
+ if (templates.Any())
+ templates.ForEach(t =>
+ {
+ t.IsActiveSchedule = newState;
+ UpdateRobotConfiguration(RobotsEnum.ScheduleOrder, t);
+ });
+
+
+ templates.ForEach(t => t.IsActiveSchedule = newState);
+
+ return templates.Count;
+ }
+
+ private async Task UpdateTemplateStateAsync(IQueryable query, bool newState)
+ {
+ var templates = await query.Select(t => t).ToListAsync();
+
+ if (templates.Any())
+ templates.ForEach(t =>
+ {
+ t.IsActiveTemplate = newState;
+ UpdateRobotConfiguration(RobotsEnum.TemplateOrder, t);
+ });
+
+
+ return templates.Count;
+ }
+
+
+ private void UpdateRobotConfiguration(RobotsEnum robotsEnum, Template t)
+ {
+ var config = robotConfigurationService.GetFromTemplateByRobotCode(robotsEnum, ref t);
+ robotConfigurationService.ChangeTaskStatus(TaskStatusEnum.Updating, ref config);
+ }
+}
diff --git a/PARR.TemplateActivator/TemplateActivatorInstaller.cs b/PARR.TemplateActivator/TemplateActivatorInstaller.cs
new file mode 100644
index 00000000..af3b0426
--- /dev/null
+++ b/PARR.TemplateActivator/TemplateActivatorInstaller.cs
@@ -0,0 +1,24 @@
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using PARR.BLL;
+using PARR.DAL;
+
+namespace PARR.TemplateActivator;
+
+public static class TemplateActivatorInstaller
+{
+
+ public static void InstallTemplateActivatorSerivces(this IServiceCollection services, IConfiguration configuration)
+ {
+ services.InstallBllServices(configuration);
+ services.InstallDalServices(configuration);
+
+ var mqSettings = new MqSettings();
+ configuration.GetSection(nameof(MqSettings)).Bind(mqSettings);
+ services.AddSingleton(mqSettings);
+
+ services.AddTransient();
+ services.AddTransient();
+ services.AddTransient();
+ }
+}
diff --git a/PARR.TemplateActivatorWorker/Program.cs b/PARR.TemplateActivatorWorker/Program.cs
index e341b76f..bd6bf903 100644
--- a/PARR.TemplateActivatorWorker/Program.cs
+++ b/PARR.TemplateActivatorWorker/Program.cs
@@ -1,10 +1,29 @@
+using Serilog;
+using Elastic.CommonSchema.Serilog;
using PARR.TemplateActivatorWorker;
+using PARR.TemplateActivator;
-IHost host = Host.CreateDefaultBuilder(args)
- .ConfigureServices(services =>
- {
- services.AddHostedService();
- })
- .Build();
+var builder = Host.CreateApplicationBuilder();
-host.Run();
+builder.Services.AddLogging(config =>
+{
+ config.ClearProviders();
+
+ var logger = new LoggerConfiguration();
+
+ if (builder.Environment.IsProduction())
+ logger.WriteTo.Console(new EcsTextFormatter());
+ else
+ logger.WriteTo.Console();
+
+ logger.ReadFrom.Configuration(builder.Configuration);
+
+ config.AddSerilog(logger.CreateLogger());
+});
+
+builder.Services.InstallTemplateActivatorSerivces(builder.Configuration);
+
+builder.Services.AddHostedService();
+
+var host = builder.Build();
+host.Run();
\ No newline at end of file
diff --git a/PARR.TemplateActivatorWorker/Worker.cs b/PARR.TemplateActivatorWorker/Worker.cs
index 354417ad..4888141e 100644
--- a/PARR.TemplateActivatorWorker/Worker.cs
+++ b/PARR.TemplateActivatorWorker/Worker.cs
@@ -1,23 +1,28 @@
+using PARR.TemplateActivator;
+
namespace PARR.TemplateActivatorWorker
{
public class Worker : BackgroundService
{
private readonly ILogger _logger;
+ private readonly IMqTemplateActivator mqTemplateActivator;
- public Worker(ILogger logger)
+ public Worker(ILogger logger, IMqTemplateActivator mqTemplateActivator)
{
_logger = logger;
+ this.mqTemplateActivator = mqTemplateActivator;
}
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
{
- // : TemplateActivatorMq
+ mqTemplateActivator.Start();
+ }
- //while (!stoppingToken.IsCancellationRequested)
- //{
- // _logger.LogInformation("Worker running at: {time}", DateTimeOffset.Now);
- // await Task.Delay(1000, stoppingToken);
- //}
+ public override Task StopAsync(CancellationToken cancellationToken)
+ {
+ mqTemplateActivator.Stop();
+
+ return base.StopAsync(cancellationToken);
}
}
}
diff --git a/PARR.TemplateActivatorWorker/appsettings.Development.json b/PARR.TemplateActivatorWorker/appsettings.Development.json
index b2dcdb67..992d2719 100644
--- a/PARR.TemplateActivatorWorker/appsettings.Development.json
+++ b/PARR.TemplateActivatorWorker/appsettings.Development.json
@@ -4,5 +4,8 @@
"Default": "Information",
"Microsoft.Hosting.Lifetime": "Information"
}
+ },
+ "MqSettings": {
+ "HostName": "10.99.253.216"
}
}
diff --git a/PARR.TemplateActivatorWorker/appsettings.json b/PARR.TemplateActivatorWorker/appsettings.json
index b2dcdb67..84d362de 100644
--- a/PARR.TemplateActivatorWorker/appsettings.json
+++ b/PARR.TemplateActivatorWorker/appsettings.json
@@ -1,8 +1,35 @@
{
+ "ConnectionStrings": {
+ "DefaultConnection": "Server=10.99.253.184;Database=parr;User Id=app_parr; Password=PosdfkhT&)%sdfligL&%5546;"
+ },
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.Hosting.Lifetime": "Information"
}
+ },
+ "Serilog": {
+ "MinimumLevel": {
+ "Default": "Debug",
+ "Override": {
+ "Microsoft": "Warning",
+ "Microsoft.Hosting.Lifetime": "Debug"
+ }
+ },
+ "WriteTo": [
+ {
+ "Name": "File",
+ "Args": {
+ "path": "log/log-.txt",
+ "rollingInterval": "Day"
+ }
+ }
+ ]
+ },
+ "MqSettings": {
+ "HostName": "parr-rabbitmq",
+ "QueueName": "parr-template-activator",
+ "User": "template_activator_reader",
+ "Password": "KUYGFskdjhgf&^%sdfg"
}
}