feat(aititMainLoader): Сделана основная логика загрущки данных из АИХ ИТ в очередь сообщений

This commit is contained in:
Mikhail Kuznetsov
2025-05-19 10:16:09 +10:00
parent b03af638f6
commit 082bc9bf15
16 changed files with 600 additions and 10 deletions

View File

@@ -1,7 +1,7 @@
using PARR.AIHITLoader;
using Serilog;
using PARR.AIHITLoaderWorker;
using Elastic.CommonSchema.Serilog; using Elastic.CommonSchema.Serilog;
using PARR.AIHITLoaderWorker;
using PARR.AIHITMainLoader;
using Serilog;
var builder = Host.CreateApplicationBuilder(); var builder = Host.CreateApplicationBuilder();
@@ -22,7 +22,7 @@ builder.Services.AddLogging(config =>
config.AddSerilog(logger.CreateLogger()); config.AddSerilog(logger.CreateLogger());
}); });
builder.Services.InstallAihitLoaderServices(builder.Configuration); builder.Services.InstallAihitMainLoaderServices(builder.Configuration);
builder.Services.AddHostedService<Worker>(); builder.Services.AddHostedService<Worker>();

View File

@@ -1,21 +1,33 @@
using PARR.AIHITLoader; using PARR.AIHITMainLoader;
namespace PARR.AIHITLoaderWorker namespace PARR.AIHITLoaderWorker
{ {
public class Worker : BackgroundService public class Worker : BackgroundService
{ {
private readonly ILogger<Worker> _logger; private readonly ILogger<Worker> _logger;
private readonly IAihitLoader aihitLoader; private readonly IServiceProvider serviceProvider;
public Worker(ILogger<Worker> logger, IAihitLoader aihitLoader) public Worker(
ILogger<Worker> logger,
IServiceProvider serviceProvider
)
{ {
_logger = logger; _logger = logger;
this.aihitLoader = aihitLoader; this.serviceProvider = serviceProvider;
} }
protected override async Task ExecuteAsync(CancellationToken stoppingToken) protected override async Task ExecuteAsync(CancellationToken stoppingToken)
{ {
await aihitLoader.StartAsync(); using (var scope = serviceProvider.CreateScope())
{
var aihitLoader = scope.ServiceProvider.GetService<IAihitMainLoader>();
if (aihitLoader == null)
throw new Exception("<22><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> IAihitMainLoader, scope.ServiceProvider.GetService<IAihitMainLoader>()");
await aihitLoader.StartAsync();
}
} }
} }
} }

View File

@@ -0,0 +1,101 @@
using Microsoft.Extensions.Logging;
using PARR.AIHITMainLoader.Models;
using PARR.AIHITMainLoader.Services;
using PARR.AIHITMainLoader.Settings;
using PARR.BLL.Domain.Mq;
using PARR.BLL.Services.Interfaces;
using System.Text.Json;
namespace PARR.AIHITMainLoader
{
internal class AihitMainLoader : IAihitMainLoader
{
private readonly ILogger<AihitMainLoader> logger;
private readonly IIntervalService intervalService;
private readonly WorkerSettings workerSettings;
private readonly LoaderSettings loaderSettings;
private readonly MqSettings mqSettings;
private readonly IAihitService aihitService;
private readonly IMqService mqService;
public AihitMainLoader(
ILogger<AihitMainLoader> logger,
IIntervalService intervalService,
WorkerSettings workerSettings,
LoaderSettings loaderSettings,
MqSettings mqSettings,
IAihitService aihitService,
IMqService mqService
)
{
this.logger = logger;
this.intervalService = intervalService;
this.workerSettings = workerSettings;
this.loaderSettings = loaderSettings;
this.mqSettings = mqSettings;
this.aihitService = aihitService;
this.mqService = mqService;
}
public async Task StartAsync()
{
logger.LogInformation("Запуск сервиса загрузки данных из АИХ ИТ.");
await intervalService.IntervalInitAsync(LoadDataAsync, workerSettings.RepeatEvery);
}
private async Task LoadDataAsync()
{
logger.LogInformation("Запуск загрузки данных из АИХ ИТ.");
var services = GetServices();
var listToMq = new List<AihitMainDataMq>();
services.ForEach(service =>
{
loaderSettings.ResponseAreas.ForEach(responseArea =>
{
var EKs = service.Invoke(responseArea);
EKs.ToList().ForEach(item =>
{
listToMq.Add(item.ToMainData());
});
});
});
var preparedData = listToMq.Select(d => JsonSerializer.Serialize(d));
var parts = listToMq.Count() / loaderSettings.PackageSize;
parts++;
for (var i = 0; i < parts; i++)
{
var batch = preparedData.Skip(i * loaderSettings.PackageSize).Take(loaderSettings.PackageSize).ToList();
var sendResult = mqService.Send(mqSettings, batch.ToArray());
if (sendResult.IsSuccess)
{
logger.LogInformation($"Данные переданы в RabbitMQ: {batch.Count()}");
logger.LogDebug($"Список ЭК переданных в RabbitMQ: {string.Join(", ", batch)}");
}
else
logger.LogError($"Ошибка при передаче данных в Rabbit, не переданные сообщения: {string.Join(", ", sendResult.NotSendMessages!)}");
}
await Task.CompletedTask;
}
private List<Func<string, IEnumerable<IMainData>>> GetServices()
{
var serviceList = new List<Func<string, IEnumerable<IMainData>>>();
serviceList.Add(aihitService.GetCvkData);
serviceList.Add(aihitService.GetPtkData);
return serviceList;
}
}
}

View File

@@ -0,0 +1,40 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using PARR.AIHITMainLoader.Context;
using PARR.AIHITMainLoader.Services;
using PARR.AIHITMainLoader.Settings;
using PARR.BLL;
namespace PARR.AIHITMainLoader
{
public static class AihitMainLoaderInstaller
{
public static void InstallAihitMainLoaderServices(this IServiceCollection services, IConfiguration configuration)
{
services.InstallBllServices(configuration);
var settings = new WorkerSettings();
configuration.GetSection(nameof(WorkerSettings)).Bind(settings);
services.AddSingleton(settings);
var loaderSettings = new LoaderSettings();
configuration.GetSection(nameof(LoaderSettings)).Bind(loaderSettings);
services.AddSingleton(loaderSettings);
var mqSettings = new MqSettings();
configuration.GetSection(nameof(MqSettings)).Bind(mqSettings);
services.AddSingleton(mqSettings);
services.AddDbContext<AIHITContext>(options =>
options.UseSqlServer(
configuration.GetConnectionString("AihitConnection"),
sqlServerOptions => sqlServerOptions.CommandTimeout(1800)
));
services.AddTransient<IAihitService, AihitService>();
services.AddTransient<IAihitMainLoader, AihitMainLoader>();
}
}
}

View File

@@ -0,0 +1,14 @@
using Microsoft.EntityFrameworkCore;
using PARR.AIHITMainLoader.Models;
namespace PARR.AIHITMainLoader.Context
{
internal class AIHITContext : DbContext
{
public AIHITContext(DbContextOptions<AIHITContext> options) : base(options) { }
public DbSet<CvkData> CvkDatas { get; set; }
public DbSet<PtkData> PtkDatas { get; set; }
}
}

View File

@@ -0,0 +1,7 @@
namespace PARR.AIHITMainLoader
{
public interface IAihitMainLoader
{
Task StartAsync();
}
}

View File

@@ -0,0 +1,83 @@
using PARR.BLL.Domain.Mq;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace PARR.AIHITMainLoader.Models
{
public class CvkData : IMainData
{
[Column("ЗОНА_ОТВЕТСТВЕННОСТИ")]
public string? ResponseArea { get; set; }
[Column("КАТЕГОРИЯ_ЭК")]
public string? EKCategory { get; set; }
[Key]
[Column("КОД_ПОИСКАК")]
public string? EKFindCode { get; set; }
[Column("КРАТКОЕ_НАИМЕНОВАНИЕ")]
public string? ShortName { get; set; }
[Column("МВЗ")]
public string? MVZ { get; set; }
[Column("МОДЕЛЬ")]
public string? Model { get; set; }
[Column("ОТВЕТСТВЕННЫЙ_ЗАК")]
public string? ResponsibleByEK { get; set; }
[Column("ПОДКАТЕГОРИЯ_ЭК")]
public string? EKSubCategory { get; set; }
[Column("ПРОИЗВОДИТЕЛЬ_РАЗРАБОТЧИК")]
public string? Developer { get; set; }
[Column("РАБОЧАЯ_ГР_ОТВ_ЗАК")]
public string? WorkGroup { get; set; }
[Column("СТАТУС")]
public string? Status { get; set; }
[Column("ТИП_ЭК")]
public string? EKType { get; set; }
[Column("РГ_смены")]
public string? ShiftWorkGroup { get; set; }
[Column("Сервер СПД")]
public string? SPDServerType { get; set; }
[Column("Сервер БИР")]
public string? BIRServerType { get; set; }
public AihitMainDataMq ToMainData()
{
return new AihitMainDataMq
{
Name = EKFindCode!,//TODO Ты прям уверен???
Properties = new Dictionary<string, string?>
{
{"ЗОНА_ОТВЕТСТВЕННОСТИ", ResponseArea },
{"КАТЕГОРИЯ_ЭК", EKCategory },
{"КРАТКОЕ_НАИМЕНОВАНИЕ", ShortName },
{"MVZ", MVZ },
{"МОДЕЛЬ", Model },
{"ОТВЕТСТВЕННЫЙ_ЗАК", ResponsibleByEK },
{ОДКАТЕГОРИЯ_ЭК", EKSubCategory },
{РОИЗВОДИТЕЛЬ_РАЗРАБОТЧИК", Developer },
{"РАБОЧАЯ_ГР_ОТВ_ЗАК", WorkGroup },
{"СТАТУС", Status },
{"ТИП_ЭК", EKType },
{"РГ_смены", ShiftWorkGroup },
{"Сервер СПД", SPDServerType },
{"Сервер БИР", BIRServerType },
}
};
}
}
}

View File

@@ -0,0 +1,9 @@
using PARR.BLL.Domain.Mq;
namespace PARR.AIHITMainLoader.Models
{
internal interface IMainData
{
AihitMainDataMq ToMainData();
}
}

View File

@@ -0,0 +1,204 @@
using PARR.BLL.Domain.Mq;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace PARR.AIHITMainLoader.Models
{
internal class PtkData : IMainData
{
[Column("IP_АДРЕС")]
public string? IP { get; set; }
[Column("МЕТКА")]
public string? Metka { get; set; }
[Column("АКТИВЕН")]
public string? IsActive { get; set; }
[Column("ВАЖНЫЙ_ЭК")]
public string? IsImportant { get; set; }
[Column("ВРЕМЯ_СОЗДАНИЯ")]
public DateTime? CreateTime { get; set; }
[Column("ДОПОЛНИТЕЛЬНАЯ_ИНФОРМАЦИЯ")]
public string? AdditionalInfo { get; set; }
[Column("ЗОНА_ОТВЕТСТВЕННОСТИ")]
public string? ResponseArea { get; set; }
[Column("КАТЕГОРИЯ_ЭК")]
public string? EKCategory { get; set; }
[Column("КОД_ПОИСКАК")]
public string? EKFindCode { get; set; }
[Column("КОД_ПРОДУКТА")]
public string? ProductCode { get; set; }
[Column("КОД_УСЛУГИ")]
public string? ServiceCode { get; set; }
[Column("КРАТКОЕ_НАИМЕНОВАНИЕ")]
public string? ShortName { get; set; }
[Column("ОТВЕТСТВЕННЫЙ_ЗАК")]
public string? ResponsibleByEK { get; set; }
[Column("ПЛАНОВОЕ_ВРЕМЯ_ВОССТАНОВЛЕНИЯ")]
public DateTime? PlannedTimeToRepair { get; set; }
[Column("ПОДКАТЕГОРИЯ_ЭК")]
public string? EKSubCategory { get; set; }
[Column("ПОЛНОЕ_НАИМЕНОВАНИЕ")]
public string? FullName { get; set; }
[Column("ПРЕДПИСАНИЕ")]
public string? Prescription { get; set; }
[Column("ПРЕДПРИЯТИЕ")]
public string? Company { get; set; }
[Column("РАБОЧАЯ_ГР_ОТВ_ЗАК")]
public string? WorkGroup { get; set; }
[Column("РАСПОЛОЖЕНИЕ")]
public string? Location { get; set; }
[Column("РЕВИЗОРК")]
public string? EKRevizor { get; set; }
[Column("РЕГИСТРАТОРК")]
public string? EKRegister { get; set; }
[Column("СЕТЕВОЕМЯ")]
public string? NetworkName { get; set; }
[Column("СТАТУС")]
public string? Status { get; set; }
[Column("ТИП_ЭК")]
public string? EKType { get; set; }
[Column("ФАКТИЧЕСКОЕ_ЗАВЕРШЕНИЕКСПЛУАТАЦИИ")]
public DateTime? EndExplotationDate { get; set; }
[Column("ФАКТИЧЕСКОЕ_НАЧАЛОКСПЛУАТАЦИИ")]
public DateTime? StartExplotationDate { get; set; }
[Column("ЦЕЛЕВОЕ_ВРЕМЯ_ВОССТАНОВЛЕНИЯ")]
public string? TargetRepairTime { get; set; }
[Column("SYSMODTIME")]
public DateTime? SysModTime { get; set; }
[Column("SYSMODUSER")]
public string? SysModUser { get; set; }
[Column("НОВЫЙ_КОД_ПОИСКА")]
public string? NewEKFindCode { get; set; }
[Column("СТАРЫЙ_КОД_ПОИСКА")]
public string? OldEKFindCode { get; set; }
[Column("НАПРАВЛЕНИЕТСК")]
public string? CTSDirection { get; set; }
[Key]
[Column("ID")]
public int? AIHID { get; set; }
[Column("недостоверныеанные")]
public char? IsUnreliableData { get; set; }
[Column("РГ_смены")]
public string? ShiftWorkGroup { get; set; }
[Column("КлиентскоеО")]
public string? ClientSoftware { get; set; }
[Column("Клиентская_ОС")]
public string? ClientOS { get; set; }
[Column("Тип СУБД")]
public string? DBType { get; set; }
[Column("Тип сервера приложений")]
public string? APPType { get; set; }
[Column("Тип сервера ЦК БС")]
public string? CKBSServerType { get; set; }
[Column("Тип сервера ИБ")]
public string? IBServerType { get; set; }
[Column("Тип сервера инфраструктуры")]
public string? InfrastructureServerType { get; set; }
[Column("Тип сервера мониторинга")]
public string? MonitoringServerType { get; set; }
[Column("ОС")]
public string? OSType { get; set; }
[Column("ЗО_РГ")]
public string? WorkGroupResponseArea { get; set; }
public AihitMainDataMq ToMainData()
{
return new AihitMainDataMq
{
Name = EKFindCode!,//TODO Ты прям уверен???
Properties = new Dictionary<string, string?>
{
{"IP_АДРЕС", IP },
{"МЕТКА", Metka },
{"АКТИВЕН", IsActive },
{"ВАЖНЫЙ_ЭК", IsImportant },
{"ВРЕМЯ_СОЗДАНИЯ", CreateTime.ToString() ?? null},
{ОПОЛНИТЕЛЬНАЯ_ИНФОРМАЦИЯ", AdditionalInfo },
{"КАТЕГОРИЯ_ЭК", EKCategory },
{"КОД_ПРОДУКТА", EKFindCode },
{"КОД_УСЛУГИ", ProductCode },
{"КРАТКОЕ_НАИМЕНОВАНИЕ", ShortName },
{"ОТВЕТСТВЕННЫЙ_ЗАК", ResponsibleByEK },
{"ПЛАНОВОЕ_ВРЕМЯ_ВОССТАНОВЛЕНИЯ", PlannedTimeToRepair.ToString() ?? null },
{ОДКАТЕГОРИЯ_ЭК", EKSubCategory },
{ОЛНОЕ_НАИМЕНОВАНИЕ", FullName },
{"ПРЕДПИСАНИЕ", Prescription },
{"ПРЕДПРИЯТИЕ", Company },
{"РАБОЧАЯ_ГР_ОТВ_ЗАК", WorkGroup },
{"РАСПОЛОЖЕНИЕ", Location },
{"РЕВИЗОРК", EKRevizor },
{"РЕГИСТРАТОРК", EKRegister },
{"СЕТЕВОЕМЯ", NetworkName },
{"СТАТУС", Status },
{"ТИП_ЭК", EKType },
{АКТИЧЕСКОЕ_ЗАВЕРШЕНИЕКСПЛУАТАЦИИ", EndExplotationDate.ToString() ?? null },
{АКТИЧЕСКОЕ_НАЧАЛОКСПЛУАТАЦИИ", StartExplotationDate.ToString() ?? null },
{ЕЛЕВОЕ_ВРЕМЯ_ВОССТАНОВЛЕНИЯ", TargetRepairTime },
{"SYSMODTIME", SysModTime.ToString() ?? null },
{"SYSMODUSER", SysModUser },
{"НОВЫЙ_КОД_ПОИСКА", NewEKFindCode },
{"СТАРЫЙ_КОД_ПОИСКА", OldEKFindCode },
{"НАПРАВЛЕНИЕТСК", CTSDirection },
{"ID", AIHID.ToString() },
{едостоверныеанные", IsUnreliableData.ToString() },
{"РГ_смены", ShiftWorkGroup },
{"КлиентскоеО", ClientSoftware },
{"Клиентская_ОС", ClientOS },
{"Тип СУБД", DBType },
{"Тип сервера приложений", APPType },
{"Тип сервера ЦК БС", CKBSServerType },
{"Тип сервера ИБ", IBServerType },
{"Тип сервера инфраструктуры", InfrastructureServerType },
{"Тип сервера мониторинга", MonitoringServerType },
{"ОС", OSType },
{"ЗО_РГ", WorkGroupResponseArea }
}
};
}
}
}

View File

@@ -6,4 +6,12 @@
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.9" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\PARR.BLL\PARR.BLL.csproj" />
</ItemGroup>
</Project> </Project>

View File

@@ -0,0 +1,71 @@
using Microsoft.Data.SqlClient;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using PARR.AIHITMainLoader.Context;
using PARR.AIHITMainLoader.Models;
namespace PARR.AIHITMainLoader.Services
{
internal class AihitService : IAihitService
{
private readonly AIHITContext context;
private readonly ILogger<AihitService> logger;
public AihitService(
AIHITContext context,
ILogger<AihitService> logger
)
{
this.context = context;
this.logger = logger;
}
public IEnumerable<IMainData> GetPtkData(string respArea)
{
var parameters = new List<SqlParameter>() { new SqlParameter("@зо", respArea) };
try
{
var result = context.Set<PtkData>().FromSqlRaw($"EXEC mao2.dbo.sp_IPP_PARR_PTK_get_EK @зо", parameters.ToArray()).AsEnumerable();
if (result == null || !result.Any())
{
logger.LogWarning($"Процедура sp_IPP_PARR_PTK_get_EK вернула пустой список ЭК");
}
return result;
}
catch (Exception ex)
{
logger.LogError(ex, $"Ошибка при выполнении ХП sp_IPP_PARR_PTK_get_EK({respArea})");
}
return new List<IMainData>();
}
public IEnumerable<IMainData> GetCvkData(string respArea)
{
var parameters = new List<SqlParameter>() { new SqlParameter("@зо", respArea) };
try
{
var result = context.Set<CvkData>().FromSqlRaw($"EXEC mao2.dbo.sp_IPP_PARR_PTK_get_EK_CVK @зо", parameters.ToArray()).AsEnumerable();
if (result == null || !result.Any())
{
logger.LogWarning($"Процедура sp_IPP_PARR_PTK_get_EK_CVK вернула пустой список ЭК");
}
return result;
}
catch (Exception ex)
{
logger.LogError(ex, $"Ошибка при выполнении ХП sp_IPP_PARR_PTK_get_EK_CVK({respArea})");
}
return new List<IMainData>();
}
}
}

View File

@@ -0,0 +1,10 @@
using PARR.AIHITMainLoader.Models;
namespace PARR.AIHITMainLoader.Services
{
internal interface IAihitService
{
IEnumerable<IMainData> GetPtkData(string respArea);
IEnumerable<IMainData> GetCvkData(string respArea);
}
}

View File

@@ -0,0 +1,9 @@
namespace PARR.AIHITMainLoader.Settings
{
internal class LoaderSettings
{
public List<string> ResponseAreas { get; set; } = new List<string>();
public int PackageSize { get; set; } = 100;
}
}

View File

@@ -0,0 +1,15 @@
using PARR.BLL.Contracts.Interfaces;
namespace PARR.AIHITMainLoader.Settings
{
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;
}
}

View File

@@ -0,0 +1,7 @@
namespace PARR.AIHITMainLoader.Settings
{
internal class WorkerSettings
{
public TimeSpan RepeatEvery { get; set; }
}
}

View File

@@ -13,6 +13,6 @@
/// <summary> /// <summary>
/// Список полей ЭК, в формате - имя поля / значение /// Список полей ЭК, в формате - имя поля / значение
/// </summary> /// </summary>
public Dictionary<string, string> Properties { get; set; } = new Dictionary<string, string>(); public Dictionary<string, string?> Properties { get; set; } = new Dictionary<string, string?>();
} }
} }