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

feat(api,core,jobAutoControl): Валидация при получении запроса на синхронизацию групп, работ. JobAutoControlWorker - изменена логика, может обрабатывать группы и работы.

Browse Source
This commit is contained in:
Mikhail Trubnikov
2026-06-30 16:12:52 +10:00
parent 4a8a67247d
commit 16f97904eb
7 changed files with 135 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
PARR.JobAutoControl/JobAutoControlManager.cs
View File

@@ -4,6 +4,7 @@ using Microsoft.Extensions.Logging;
using PARR.Core.Common.Interfaces;
using PARR.Core.Common.Interfaces.RabbitServices;
using PARR.Core.Repositories.Interfaces.Job;
using PARR.Core.Repositories.Interfaces.JobGroupRepositories;
using PARR.Domain.Common.Rabbit.Messages;
using PARR.Domain.Entities.Base.History;
using PARR.Domain.Enums;
@@ -13,11 +14,11 @@ namespace PARR.JobAutoControl
{
internal class JobAutoControlManager : IJobAutoControlManager
{
private readonly WorkerSettings workerSettings;
private readonly ILogger<JobAutoControlManager> logger;
private readonly IIntervalService intervalService;
private readonly IServiceProvider serviceProvider;
private readonly MqSettings mqSettings;
private readonly WorkerSettings _workerSettings;
private readonly ILogger<JobAutoControlManager> _logger;
private readonly IIntervalService _intervalService;
private readonly IServiceProvider _serviceProvider;
private readonly MqSettings _mqSettings;
public JobAutoControlManager(
WorkerSettings workerSettings,
@@ -27,68 +28,87 @@ namespace PARR.JobAutoControl
MqSettings mqSettings
)
{
this.workerSettings = workerSettings;
this.logger = logger;
this.intervalService = intervalService;
this.serviceProvider = serviceProvider;
this.mqSettings = mqSettings;
_workerSettings = workerSettings;
_logger = logger;
_intervalService = intervalService;
_serviceProvider = serviceProvider;
_mqSettings = mqSettings;
}
public async Task StartAsync()
{
logger.LogInformation("Запуск сервиса управления авто-контролем РР (JobAutoControl)");
_logger.LogInformation("Запуск сервиса управления авто-контролем РР (JobAutoControl)");
await intervalService.IntervalInitAsync(async () =>
await _intervalService.IntervalInitAsync(async () =>
{
await using (var scope = serviceProvider.CreateAsyncScope())
//using (var scope = serviceProvider.CreateScope())
await using (var scope = _serviceProvider.CreateAsyncScope())
{
var jobAutoControlService = scope.ServiceProvider.GetService<IJobAutoControlRepository>();
var mqService = scope.ServiceProvider.GetService<IRabbitService>();
var jobAutoControlRepository = scope.ServiceProvider.GetRequiredService<IJobAutoControlRepository>();
var jobGroupAutoControlRepository = scope.ServiceProvider.GetRequiredService<IJobGroupAutoControlRepository>();
var mqService = scope.ServiceProvider.GetRequiredService<IRabbitService>();
if (jobAutoControlService == null || mqService == null)
throw new Exception($"Не смог получить серивс {nameof(IJobAutoControlRepository)} или {nameof(IRabbitService)}");
await HandlerAsync(jobAutoControlService, mqService);
await HandlerAsync(jobAutoControlRepository, jobGroupAutoControlRepository, mqService);
}
}, workerSettings.RepeatEvery);
}, _workerSettings.RepeatEvery);
}
private async Task HandlerAsync(IJobAutoControlRepository jobAutoControlService, IRabbitService mqService)
private async Task HandlerAsync(IJobAutoControlRepository jobAutoControlRepository, IJobGroupAutoControlRepository jobGroupAutoControlRepository, IRabbitService mqService)
{
var jobsWithAutoControl = await jobAutoControlService.Get().Where(t => t.IsEnable).ToListAsync();
// Список JobGroup с включенным автоконтролем
var jobGroupsIds = await jobGroupAutoControlRepository.Get()
.AsNoTracking()
.Where(t => t.IsEnable)
.Select(t => t.JobGroupId)
.ToListAsync();
logger.LogInformation($"Работ с включенным авто-контролем: {jobsWithAutoControl.Count} шт.");
// Список Job с включенным автоконтролем, но у которых в JobGroupType.IsJobGroupAutocOntrol==false
var jobIds = await jobAutoControlRepository.Get()
.AsNoTracking()
.Where(t => t.IsEnable && t.Job!.Group!.GroupType!.IsJobGroupAutoControl == false)
.Select(t => t.JobId)
.ToListAsync();
if (jobsWithAutoControl.Count == 0)
_logger.LogInformation("Найдено объектов с включенным автоконтролем, групп: {JobGroupCount} шт., работ: {JobCount} шт.", jobGroupsIds.Count, jobIds.Count);
if (jobGroupsIds.Count == 0 && jobIds.Count == 0)
return;
// формируем сообщения
var msgList = jobsWithAutoControl.Select(t => new TemplateMatcherMq
var msgList = new List<TemplateMatcherMq>(jobGroupsIds.Count + jobIds.Count);
var initiator = new HistoryInitiator
{
InitiatorComment = $"Инициатор авто-контроль, периодичность: {_workerSettings.RepeatEvery}",
InitiatorIp = null,
InitiatorParrComponentId = ParrComponentsEnum.JobAutoControl
};
// группы
msgList.AddRange(jobGroupsIds.Select(id => new TemplateMatcherMq
{
Action = TemplateMatcherActionEnum.Sync,
EntityType = SyncTaskEntityTypeEnum.JobGroup,
Id = id,
Initiator = initiator
}));
// работы
msgList.AddRange(jobIds.Select(id => new TemplateMatcherMq
{
Action = TemplateMatcherActionEnum.Sync,
EntityType = SyncTaskEntityTypeEnum.Job,
Id = t.JobId,
Initiator = new HistoryInitiator
{
InitiatorComment = $"Инициатор авто-контроль, периодичность: {workerSettings.RepeatEvery}",
InitiatorIp = null,
InitiatorParrComponentId = ParrComponentsEnum.JobAutoControl
}
}).ToList();
//var msgStrList = msgList.Select(t => JsonSerializer.Serialize(t));
Id = id,
Initiator = initiator
}));
// отправляем задания в очередь template matcher`a
//var sendResult = await mqService.SendAsync(mqSettings.TemplateMatcher, msgStrList.ToArray());
var sendResult = await mqService.SendAsync(mqSettings.TemplateMatcher, msgList.ToList<object>());
var sendResult = await mqService.SendAsync(_mqSettings.TemplateMatcher, msgList);
if (!sendResult.IsSuccess)
logger.LogError($"Ошибка при отправке сообщений ({msgList.Count()} шт.) в очередь.");
_logger.LogError("Ошибка при отправке сообщений ({Count} шт.) в очередь.", msgList.Count);
else
logger.LogInformation($"Выполнена отправка сообщений в очередь, {msgList.Count()} шт.");
_logger.LogInformation("Выполнена отправка сообщений в очередь, {Count} шт.", msgList.Count);
}
}