mikhail/parr_api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(job-auto-control): Переделал согласно новой структуры. Отправляет задания в matcher.

Browse Source
This commit is contained in:
Mikhail Trubnikov
2025-12-09 08:40:05 +10:00
parent 5e3da5bf08
commit 24759bb3e0
6 changed files with 59 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

195
PARR.JobAutoControl/JobAutoControlManager.cs
View File

@@ -3,9 +3,7 @@ using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using PARR.BLL.Domain.Mq; using PARR.BLL.Domain.Mq;
using PARR.BLL.Services.Interfaces; using PARR.BLL.Services.Interfaces;
using PARR.Common.Domain; using PARR.DAL.Services.Interfaces.Job;
using PARR.Constants;
using PARR.DAL.Services.Interfaces;
using PARR.JobAutoControl.Settings; using PARR.JobAutoControl.Settings;
using System.Text.Json; using System.Text.Json;
@@ -36,166 +34,59 @@ namespace PARR.JobAutoControl
public async Task StartAsync() public async Task StartAsync()
{ {
//logger.LogInformation("Запуск сервиса управления авто-контролем РР (JobAutoControl)"); logger.LogInformation("Запуск сервиса управления авто-контролем РР (JobAutoControl)");
//await intervalService.IntervalInitAsync(async () => await intervalService.IntervalInitAsync(async () =>
//{ {
// using (var scope = serviceProvider.CreateScope()) await using (var scope = serviceProvider.CreateAsyncScope())
// { //using (var scope = serviceProvider.CreateScope())
// var jobAutoControlService = scope.ServiceProvider.GetService<IJobAutoControlService>(); {
// var mqService = scope.ServiceProvider.GetService<IMqService>(); var jobAutoControlService = scope.ServiceProvider.GetService<IJobAutoControlService>();
var mqService = scope.ServiceProvider.GetService<IMqService>();
// if (jobAutoControlService == null || mqService == null) if (jobAutoControlService == null || mqService == null)
// throw new Exception($"Не смог получить серивс {nameof(IJobAutoControlService)} или {nameof(IMqService)}"); throw new Exception($"Не смог получить серивс {nameof(IJobAutoControlService)} или {nameof(IMqService)}");
// await HandlerAsync(jobAutoControlService, mqService); await HandlerAsync(jobAutoControlService, mqService);
// } }
//}, workerSettings.RepeatEvery); }, workerSettings.RepeatEvery);
} }
//private async Task HandlerAsync(IJobAutoControlService jobAutoControlService, IMqService mqService) private async Task HandlerAsync(IJobAutoControlService jobAutoControlService, IMqService mqService)
//{ {
// await GenerateAsync(jobAutoControlService, mqService); var jobsWithAutoControl = await jobAutoControlService.Get().Where(t => t.IsEnable).ToListAsync();
// await DeactivateAsync(jobAutoControlService, mqService);
// await ActivateAsync(jobAutoControlService, mqService); logger.LogInformation($"Работ с включенным авто-контролем: {jobsWithAutoControl.Count} шт.");
//}
if (jobsWithAutoControl.Count == 0)
return;
///// <summary> // формируем сообщения
///// Генерировать новые РР var msgList = jobsWithAutoControl.Select(t => new TemplateMatcherMq
///// </summary> {
///// <param name="jobAutoControlService"></param> Action = Constants.TemplateMatcherActionEnum.Sync,
///// <param name="mqService"></param> EntityType = Constants.SyncTaskEntityTypeEnum.Job,
///// <returns></returns> Id = t.JobId,
//private async Task GenerateAsync(IJobAutoControlService jobAutoControlService, IMqService mqService) Initiator = new Common.Domain.HistoryInitiator
//{ {
// var jobsToGenerate = await jobAutoControlService.Get() InitiatorComment = $"Инициатор авто-контроль, периодичность: {workerSettings.RepeatEvery}",
// .Include(t => t.JobEkMasks) InitiatorIp = null,
// .Include(t => t.JobAutoControlInEkStatuses) InitiatorParrComponentId = Constants.ParrComponentsEnum.JobAutoControl
// .Include(t => t.ApplicationsInWork) }
// .Where(t => t.CreateNew && t.JobEkMasks.Any() && t.JobAutoControlInEkStatuses.Any()) });
// .ToListAsync();
// logger.LogInformation($"Найдено РР с включенным авто-контролем для генерации шаблонов и расписаний: {jobsToGenerate.Count()} шт."); var msgStrList = msgList.Select(t => JsonSerializer.Serialize(t));
// if (!jobsToGenerate.Any()) // отправляем задания в очередь template matcher`a
// return; var sendResult = await mqService.SendAsync(mqSettings.TemplateMatcher, msgStrList.ToArray());
if (!sendResult.IsSuccess)
// jobsToGenerate.ForEach(job => logger.LogError($"Ошибка при отправке сообщений ({msgStrList.Count()} шт.) в очередь.");
// { else
// job.JobEkMasks.ToList().ForEach(ek => logger.LogInformation($"Выполнена отправка сообщений в очередь, {msgStrList.Count()} шт.");
// { }
// //todo: проверить, нормально ли отрабатывает async в Foreach
// job.JobAutoControlInEkStatuses.ToList().ForEach(async ekStatus =>
// {
// var request = new GeneratorTemplateMq
// {
// Action = "create",
// ApplicationId = job.ApplicationsInWork!.ApplicationId,
// Ek = ek.Name,
// WorkId = job.ApplicationsInWork!.WorkId,
// StatusEk = ekStatus.EkStatusCode,
// IsActiveTemplate = job.OnTemplateIsActive,
// IsActiveSchedule = job.OnScheduleIsActive,
// HistoryInitiator = new HistoryInitiator { InitiatorComment = "Запрос на генерацию с авто-контроля", InitiatorParrComponentId = ParrComponentsEnum.JobAutoControl }
// };
// var msg = JsonSerializer.Serialize(request);
// var result = await mqService.SendAsync(mqSettings.Generator, new[] { msg });
// if (result.IsSuccess)
// logger.LogInformation($"Отправлен запрос на генерацию: {msg}");
// else
// logger.LogError($"Ошибка при отправке запроса на генерацию: {msg}");
// });
// });
// });
//}
///// <summary>
///// Деактивировать РР
///// </summary>
///// <param name="jobAutoControlService"></param>
///// <param name="mqService"></param>
///// <returns></returns>
//private async Task DeactivateAsync(IJobAutoControlService jobAutoControlService, IMqService mqService)
//{
// //var jobsToDeactivate = await jobAutoControlService.Get()
// // .Include(t => t.JobEkMasks)
// // .Include(t => t.JobAutoControlInEkStatuses)
// // .Where(t => t.Deactivate && t.JobEkMasks.Any() && t.JobAutoControlInEkStatuses.Any())
// // .Select(t => t.ApplicationInWorkId)
// // .ToListAsync();
// //logger.LogInformation($"Найдено РР с включенным авто-контролем для деактивации шаблонов и расписаний: {jobsToDeactivate.Count()} шт.");
// //if (!jobsToDeactivate.Any())
// // return;
// ////todo: проверить, нормально ли отрабатывает async в foreach
// //jobsToDeactivate.ForEach(async applicationInWorkId =>
// //{
// // var request = new TemplateActivatorMq
// // {
// // Action = TemplateActivatorActionsEnum.DeactivateAllForAutoControl,
// // JobId = applicationInWorkId,
// // HistoryInitiator = new HistoryInitiator { InitiatorComment = "Запрос на деактивацию с авто-контроля", InitiatorParrComponentId = ParrComponentsEnum.JobAutoControl }
// // };
// // var msg = JsonSerializer.Serialize(request);
// // var result = await mqService.SendAsync(mqSettings.Activator, new[] { msg });
// // if (result.IsSuccess)
// // logger.LogInformation($"Отправлен запрос на деактивацию: {msg}");
// // else
// // logger.LogError($"Ошибка при отправке запроса на деактивацию: {msg}");
// //});
//}
///// <summary>
///// Активировать РР
///// </summary>
///// <param name="jobAutoControlService"></param>
///// <param name="mqService"></param>
///// <returns></returns>
//private async Task ActivateAsync(IJobAutoControlService jobAutoControlService, IMqService mqService)
//{
// // var jobsToActivate = await jobAutoControlService.Get()
// // .Include(t => t.JobEkMasks)
// // .Include(t => t.JobAutoControlInEkStatuses)
// // .Where(t => t.Activate && t.JobEkMasks.Any() && t.JobAutoControlInEkStatuses.Any())
// // .Select(t => t.ApplicationInWorkId)
// // .ToListAsync();
// // if (!jobsToActivate.Any())
// // return;
// // //todo: проверить, нормально ли отрабатывает async в foreach
// // jobsToActivate.ForEach(async applicationInWorkId =>
// // {
// // var request = new TemplateActivatorMq
// // {
// // Action = TemplateActivatorActionsEnum.ActivateAllForAutoControl,
// // JobId = applicationInWorkId,
// // HistoryInitiator = new HistoryInitiator { InitiatorComment = "Запрос на активацию с авто-контроля", InitiatorParrComponentId = ParrComponentsEnum.JobAutoControl }
// // };
// // var msg = JsonSerializer.Serialize(request);
// // var result = await mqService.SendAsync(mqSettings.Activator, new[] { msg });
// // if (result.IsSuccess)
// // logger.LogInformation($"Отправлен запрос на активацию: {msg}");
// // else
// // logger.LogError($"Ошибка при отправке запроса на активацию: {msg}");
// // });
//}
} }
} }

13
PARR.JobAutoControl/Settings/MqSettings.cs
View File

@@ -4,11 +4,10 @@ namespace PARR.JobAutoControl.Settings
{ {
internal class MqSettings internal class MqSettings
{ {
public Generator Generator { get; set; } public TemplateMatcher TemplateMatcher { get; set; } = new TemplateMatcher();
public Activator Activator { get; set; }
} }
internal class Generator : IMqSettings internal class TemplateMatcher : IMqSettings
{ {
public string HostName { get; set; } = string.Empty; public string HostName { get; set; } = string.Empty;
public string QueueName { get; set; } = string.Empty; public string QueueName { get; set; } = string.Empty;
@@ -17,14 +16,6 @@ namespace PARR.JobAutoControl.Settings
public ushort? PrefetchCount { get; set; } = 0; public ushort? PrefetchCount { get; set; } = 0;
} }
internal class Activator : 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;
public ushort? PrefetchCount { get; set; } = 0;
}
} }

11
PARR.JobAutoControlWorker/Dockerfile
View File

@@ -1,8 +1,11 @@
#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging. # See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
# This stage is used when running from VS in fast mode (Default for Debug configuration)
FROM 10.99.253.167:8090/dotnet/runtime:7.0 AS base FROM 10.99.253.167:8090/dotnet/runtime:7.0 AS base
WORKDIR /app WORKDIR /app
# This stage is used to build the service project
FROM 10.99.253.167:8090/dotnet/sdk:7.0 AS build FROM 10.99.253.167:8090/dotnet/sdk:7.0 AS build
ARG BUILD_CONFIGURATION=Release ARG BUILD_CONFIGURATION=Release
WORKDIR /src WORKDIR /src
@@ -10,19 +13,21 @@ COPY ["NuGet.config", "."]
COPY ["PARR.JobAutoControlWorker/PARR.JobAutoControlWorker.csproj", "PARR.JobAutoControlWorker/"] COPY ["PARR.JobAutoControlWorker/PARR.JobAutoControlWorker.csproj", "PARR.JobAutoControlWorker/"]
COPY ["PARR.JobAutoControl/PARR.JobAutoControl.csproj", "PARR.JobAutoControl/"] COPY ["PARR.JobAutoControl/PARR.JobAutoControl.csproj", "PARR.JobAutoControl/"]
COPY ["PARR.BLL/PARR.BLL.csproj", "PARR.BLL/"] COPY ["PARR.BLL/PARR.BLL.csproj", "PARR.BLL/"]
COPY ["PARR.Constants/PARR.Constants.csproj", "PARR.Constants/"]
COPY ["PARR.Common/PARR.Common.csproj", "PARR.Common/"] COPY ["PARR.Common/PARR.Common.csproj", "PARR.Common/"]
COPY ["PARR.Constants/PARR.Constants.csproj", "PARR.Constants/"]
COPY ["PARR.DAL/PARR.DAL.csproj", "PARR.DAL/"] COPY ["PARR.DAL/PARR.DAL.csproj", "PARR.DAL/"]
RUN dotnet restore "./PARR.JobAutoControlWorker/PARR.JobAutoControlWorker.csproj" RUN dotnet restore "./PARR.JobAutoControlWorker/PARR.JobAutoControlWorker.csproj"
COPY . . COPY . .
WORKDIR "/src/PARR.JobAutoControlWorker" WORKDIR "/src/PARR.JobAutoControlWorker"
RUN dotnet build "./PARR.JobAutoControlWorker.csproj" -c $BUILD_CONFIGURATION -o /app/build RUN dotnet build "./PARR.JobAutoControlWorker.csproj" -c $BUILD_CONFIGURATION -o /app/build
# This stage is used to publish the service project to be copied to the final stage
FROM build AS publish FROM build AS publish
ARG app_version=0.0.0-default
ARG BUILD_CONFIGURATION=Release ARG BUILD_CONFIGURATION=Release
ARG app_version=0.0.0-default
RUN dotnet publish "./PARR.JobAutoControlWorker.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false /p:Version=$app_version RUN dotnet publish "./PARR.JobAutoControlWorker.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false /p:Version=$app_version
# This stage is used in production or when running from VS in regular mode (Default when not using the Debug configuration)
FROM base AS final FROM base AS final
WORKDIR /app WORKDIR /app
COPY --from=publish /app/publish . COPY --from=publish /app/publish .

1
PARR.JobAutoControlWorker/Worker.cs
View File

@@ -14,6 +14,7 @@ namespace PARR.JobAutoControlWorker
protected override async Task ExecuteAsync(CancellationToken stoppingToken) protected override async Task ExecuteAsync(CancellationToken stoppingToken)
{ {
await jobAutoControlManager.StartAsync(); await jobAutoControlManager.StartAsync();
await Task.Delay(Timeout.Infinite, stoppingToken);
} }
} }
} }

5
PARR.JobAutoControlWorker/appsettings.Development.json
View File

@@ -27,10 +27,7 @@
] ]
}, },
"MqSettings": { "MqSettings": {
"Generator": { "TemplateMatcher": {
"HostName": "10.99.253.216"
},
"Activator": {
"HostName": "10.99.253.216" "HostName": "10.99.253.216"
} }
} }

14
PARR.JobAutoControlWorker/appsettings.json
View File

@@ -22,17 +22,11 @@
"RepeatEvery": "6:00:00" "RepeatEvery": "6:00:00"
}, },
"MqSettings": { "MqSettings": {
"Generator": { "TemplateMatcher": {
"HostName": "parr-rabbitmq", "HostName": "parr-rabbitmq",
"QueueName": "parr-generate-templates", "QueueName": "parr-template-matcher",
"User": "generate_templates_api", "User": "template_matcher_writer",
"Password": "DHhjgdsf*&%95" "Password": "8ndd%BpP61Ias;ldk23CkvZM"
},
"Activator": {
"HostName": "parr-rabbitmq",
"QueueName": "parr-template-activator",
"User": "template_activator_writer",
"Password": "Gfkjhsdg*%fsdf"
} }
} }
} }