feat(templateMatcher): init. сделан воркер, контроллер. перенесена логика из TemplateTaskGenerator

This commit is contained in:
Mikhail Kuznetsov
2025-11-01 15:29:12 +10:00
parent e716d9649d
commit 2950d21a69
24 changed files with 584 additions and 3 deletions

View File

@@ -468,6 +468,15 @@
#endregion
#region SyncTask
public static class SyncTask
{
public const string MatchTemplatesForJob = Base + "/sync-tasks/jobs/{jobId}/match-templates";
public const string MatchTemplatesForJobGroup = Base + "/sync-tasks/job-groups/{jobGroupId}/match-templates";
public const string MatchTemplatesForTemplate = Base + "/sync-tasks/templates/{templateId}/match-templates";
}
#endregion
public static class Weekend
{

View File

@@ -0,0 +1,62 @@
using Microsoft.AspNetCore.Mvc;
using PARR.API.Contracts.V1;
using PARR.API.Contracts.V1.Responses.Base;
using PARR.API.Controllers.V1.Base;
using PARR.API.Services.Implementations;
using PARR.API.Services.Interfaces;
using PARR.API.Settings;
using PARR.BLL.Domain.Mq;
using PARR.BLL.Services.Interfaces;
using System.Text.Json;
namespace PARR.API.Controllers.V1
{
public class SyncTaskController : BaseApiController
{
private readonly ILogger<SyncTaskController> logger;
private readonly IMqService mqService;
private readonly IUriService uriService;
private readonly MqSettings mqSettings;
public SyncTaskController(
ILogger<SyncTaskController> logger,
IMqService mqService,
IUriService uriService,
MqSettings mqSettings
)
{
this.logger = logger;
this.mqService = mqService;
this.uriService = uriService;
this.mqSettings = mqSettings;
}
/// <summary>
/// Сопоставить текущие шаблоны для Job, создать недостущие шаблоны
/// </summary>
/// <param name="id">ИД шаблона</param>
[HttpPost(ApiRoutes.SyncTask.MatchTemplatesForJob)]
public async Task<IActionResult> MatchTemplatesForJob([FromRoute] Guid jobId)
{
//24b3529a-dd43-444a-b10e-ac54fefd046a
var matchTemplateTask = new TemplateMatcherMq
{
Id = jobId,
EntityType = Constants.SyncTaskEntityTypeEnum.Job
};
var msg = JsonSerializer.Serialize(matchTemplateTask);
logger.LogDebug("Подготовлено сообщение: {Message}", new[] { msg });
var result = await mqService.SendAsync(mqSettings.TemplatesMatcher, new[] { msg });
logger.LogDebug("Получен код отпрвки: {IsSuccess}", result.IsSuccess);
if (!result.IsSuccess)
return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = "Ошибка отправки сообщения в очередь" } }));
var createdUri = uriService.GetAllUri(ApiRoutes.SyncTask.MatchTemplatesForJob);
return Created(createdUri, new Response<string?>(null, true, new List<ErrorModel>(), "Отправлен запрос на сопоставление шаблонов и Job"));
}
}
}

View File

@@ -8,6 +8,7 @@ namespace PARR.API.Settings
public MqTemplateDistributor TemplateDistributor { get; set; } = new MqTemplateDistributor();
public MqTemplateActivator TemplateActivator { get; set; } = new MqTemplateActivator();
public MqStatistics Statistics { get; set; } = new MqStatistics();
public MqTemplatesMatcher TemplatesMatcher { get; set; } = new MqTemplatesMatcher();
}
public class MqGenerateTemplates : IMqSettings
@@ -50,4 +51,13 @@ namespace PARR.API.Settings
public string Password { get; set; } = string.Empty;
public ushort? PrefetchCount { get; set; } = 0;
}
public class MqTemplatesMatcher : 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;
}
}

View File

@@ -10,7 +10,7 @@
},
"Serilog": {
"MinimumLevel": {
"Default": "Information",
"Default": "Debug",
"Override": {
"Microsoft": "Warning",
"Microsoft.Hosting.Lifetime": "Information"
@@ -30,6 +30,9 @@
"TemplateActivator": {
"HostName": "10.99.253.216"
},
"TemplatesMatcher": {
"HostName": "10.99.253.216"
},
"Statistics": {
"StatMqAuth": {
"HostName": "10.99.253.216"

View File

@@ -57,6 +57,12 @@
"User": "template_activator_writer",
"Password": "Gfkjhsdg*%fsdf"
},
"TemplatesMatcher": {
"HostName": "parr-rabbitmq",
"QueueName": "parr-template-matcher",
"User": "template_matcher_writer",
"Password": "8ndd%BpP61Ias;ldk23CkvZM"
},
"Statistics": {
"StatMqAuth": {
"HostName": "parr-rabbitmq",