feat(dal): Добавлен TemplateNameGeneratorService для генерации имени шаблонов по маске в Job

This commit is contained in:
Mikhail Kuznetsov
2025-06-18 09:58:23 +10:00
parent 38c9bb402e
commit 4b0ece1a2e
14 changed files with 4068 additions and 5 deletions

View File

@@ -8,6 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Elastic.CommonSchema.Serilog" Version="8.6.1" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
<PackageReference Include="Serilog.Extensions.Hosting" Version="7.0.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="7.0.1" />

View File

@@ -4,8 +4,9 @@ using PARR.DAL;
using PARR.Test;
using Serilog;
using PARR.TemplateDistributor;
using Elastic.CommonSchema.Serilog;
IHost host = Host.CreateDefaultBuilder(args)
/*IHost host = Host.CreateDefaultBuilder(args)
.ConfigureServices((hostContext, services) =>
{
//services.InstallEsppApiServices(hostContext.Configuration);
@@ -21,6 +22,34 @@ IHost host = Host.CreateDefaultBuilder(args)
.WriteTo.Console()
.ReadFrom.Configuration(hostContext.Configuration);
})
.Build();
.Build();*/
var builder = Host.CreateApplicationBuilder();
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.InstallDalServices(builder.Configuration);
builder.Services.InstallEsppApiServices(builder.Configuration);
builder.Services.InstallBllServices(builder.Configuration);
builder.Configuration.AddDalConfigurations(builder.Services);
builder.Services.AddDallSettings(builder.Configuration);
builder.Services.AddHostedService<Worker>();
var host = builder.Build();
host.Run();

View File

@@ -1,6 +1,8 @@
using Elastic.CommonSchema;
using Microsoft.EntityFrameworkCore;
using PARR.BLL.Services.Interfaces;
using PARR.Constants;
using PARR.DAL.DomainServices;
using PARR.DAL.Services.Interfaces;
using PARR.DAL.Services.Interfaces.Unit;
using PARR.EsppApi;
@@ -36,6 +38,13 @@ namespace PARR.Test
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
{
#region test
using (var scope = serviceProvider.CreateScope())
{
var service = scope.ServiceProvider.GetService<ITemplateNameGeneratorService>();
var ttt = await service.GetTemplateNameAsync(Guid.Parse("ba05948b-b040-48cc-ab77-0accc9c223a0"), Guid.Parse("d4a86f24-6975-4614-98ab-431f26e3eb69"));
}
//var tName = "ДВС-ЭИТИ-ПТК-ПАРР__ВРТ-VCD-02-ДВС__ПРОЧЕЕ(РАБОТЫ)";
//var prefix = "ЭИТИ-ПТК-ПАРР";
////templateName.Contains(settingsFromDb.TemplatePrefixWithoutVariable, StringComparison.CurrentCultureIgnoreCase)