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

Syncher fix

Browse Source
This commit is contained in:
Mikhail Kuznetsov
2023-06-05 16:28:36 +10:00
parent 730293f9fa
commit 8a72550ff0
12 changed files with 290 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
PARR.AIHIT/AIHIT/MappingProfiles/RequestToDomain.cs Normal file
View File

@@ -0,0 +1,35 @@
using AutoMapper;
using System.Xml;
namespace PARR.AIHIT.MappingProfiles
{
internal class RequestToDomain : Profile
{
public RequestToDomain()
{
CreateMap<XmlNode, PARR.DAL.Models.Host>()
.ForMember(d => d.HostName, o => o.MapFrom(s => (s.Attributes!["ХОСТ"] != null) ? s.Attributes!["ХОСТ"]!.Value.Trim() : ""))
.ForMember(d => d.IP, o => o.MapFrom(s => s.Attributes!["IP_АДРЕС"]!.Value.Trim()))
.ForMember(d => d.RegionalEK, o => o.MapFrom(s => s.Attributes!["РЕГИОНАЛЬНЫЙ_ЭК"]!.Value.Trim()))
.ForMember(d => d.LinkEK, o => o.MapFrom(s => s.Attributes!["СВЯЗАННЫЙ_ЭК"]!.Value.Trim()))
.ForMember(d => d.Status, o => o.MapFrom(s => s.Attributes!["СТАТУС"]!.Value.Trim()))
.ForMember(d => d.WorkGroup, o => o.MapFrom(s => (s.Attributes!["РАБОЧАЯ_ГР_ОТВ_ЗА_ЭК"] != null) ? s.Attributes!["РАБОЧАЯ_ГР_ОТВ_ЗА_ЭК"]!.Value.Trim() : ""))
.ForMember(d => d.Responsible, o => o.MapFrom(s => s.Attributes!["ОТВЕТСТВЕННЫЙ_ЗА_ЭК"]!.Value.Trim()))
.ForMember(d => d.OS, o => o.MapFrom(s => (s.Attributes!["ОС"] != null) ? s.Attributes!["ОС"]!.Value.Trim() : ""))
.ForMember(d => d.DB, o => o.MapFrom(s => (s.Attributes!["СУБД"] != null) ? s.Attributes!["СУБД"]!.Value.Trim() : ""))
.ForMember(d => d.APP, o => o.MapFrom(s => (s.Attributes!["СП"] != null) ? s.Attributes!["СП"]!.Value.Trim() : ""));
//CreateMap<PARR.DAL.Models.Host, PARR.DAL.Models.Host>()
// .ForMember(d => d.HostName, o => o.MapFrom(s => s.HostName))
// .ForMember(d => d.IP, o => o.MapFrom(s => s.IP))
// .ForMember(d => d.RegionalEK, o => o.MapFrom(s => s.RegionalEK))
// .ForMember(d => d.LinkEK, o => o.MapFrom(s => s.LinkEK))
// .ForMember(d => d.Status, o => o.MapFrom(s => s.Status))
// .ForMember(d => d.WorkGroup, o => o.MapFrom(s => s.WorkGroup))
// .ForMember(d => d.Responsible, o => o.MapFrom(s => s.Responsible))
// .ForMember(d => d.OS, o => o.MapFrom(s => s.OS))
// .ForMember(d => d.DB, o => o.MapFrom(s => s.DB))
// .ForMember(d => d.APP, o => o.MapFrom(s => s.APP));
}
}
}

1
PARR.AIHIT/AIHIT/PARR.AIHIT.csproj
View File

@@ -7,6 +7,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" /> <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
</ItemGroup> </ItemGroup>

164
PARR.AIHIT/AIHIT/Syncher.cs
View File

@@ -1,9 +1,14 @@
using MailKit.Search; using AutoMapper;
using MailKit.Search;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using MimeKit;
using PARR.AIHIT.Settings; using PARR.AIHIT.Settings;
using PARR.DAL.Models;
using PARR.DAL.Services.Interfaces; using PARR.DAL.Services.Interfaces;
using PARR.Mail.Services; using PARR.Mail.Services;
using System.Text;
using System.Xml;
namespace PARR.AIHIT namespace PARR.AIHIT
{ {
@@ -13,10 +18,18 @@ namespace PARR.AIHIT
private readonly IMailService mailService; private readonly IMailService mailService;
private readonly SyncherSettings syncherSettings; private readonly SyncherSettings syncherSettings;
private readonly IHostService hostService; private readonly IHostService hostService;
private readonly IMapper mapper;
public Syncher(ILogger<Syncher> logger, IMailService mailService, SyncherSettings syncherSettings, IHostService hostService) public Syncher(
ILogger<Syncher> logger,
IMailService mailService,
SyncherSettings syncherSettings,
IHostService hostService,
IMapper mapper
)
{ {
this.hostService = hostService; this.hostService = hostService;
this.mapper = mapper;
this.logger = logger; this.logger = logger;
this.mailService = mailService; this.mailService = mailService;
this.syncherSettings = syncherSettings; this.syncherSettings = syncherSettings;
@@ -30,14 +43,153 @@ namespace PARR.AIHIT
{ {
return; return;
} }
//var includeAddresses = aIHITSyncherSettings.IncludeAddresses.Any() ? aIHITSyncherSettings.IncludeAddresses.Split(",") : null;
// var filtered = messages.Where(m => includeAddresses.Any(i => m.Envelope.From.Mailboxes.First().Address == i)).ToList();
var filtered = messages.Where(m => syncherSettings.IncludeAddressesArray.Any(i => m.Envelope.From.Mailboxes.First().Address == i)).ToList(); var filtered = messages.Where(m => syncherSettings.IncludeAddressesArray.Any(i => m.Envelope.From.Mailboxes.First().Address == i)).ToList();
var lastMessage = filtered.OrderByDescending(f => f.Date).First();
var attachments = await mailService.GetAttachmentsAsync(lastMessage);
foreach (var attachment in attachments)
{
if (attachment is MessagePart)
{
continue;
}
else
{
var stream = new MemoryStream();
((MimePart)attachment).Content.DecodeTo(stream);
if (stream.Position > 0) stream.Position = 0;
var fileName = EncodeString(((MimePart)attachment).FileName);
logger.LogInformation($" Получен файл {fileName}");
if (fileName.Equals("Компонентный состав регионального ЭК.xml"))
{
XmlDocument doc = new XmlDocument();
doc.Load(stream);
var vms = doc.GetElementsByTagName("Сведения");
//var hosts = await hostService.Get().ToListAsync();
foreach (XmlNode vm in vms)
{
var ip = vm?.Attributes?["IP_АДРЕС"]?.Value.Trim();
if (ip == null) continue;
var regionalEK = vm!.Attributes!["РЕГИОНАЛЬНЫЙ_ЭК"]!.Value.Trim();
var eK = vm!.Attributes!["СВЯЗАННЫЙ_ЭК"]!.Value.Trim();
if (!eK.StartsWith("ВРТ")) continue;
var foundHost = await hostService.GetHostByIPAndRegionalEKAsync(ip, regionalEK);
var mappedHost = mapper.Map<Host>(vm);
if (foundHost != null)
{
var isChanged = false;
if (!foundHost.RegionalEK!.Equals(mappedHost.RegionalEK))
{
foundHost.RegionalEK = mappedHost.RegionalEK; isChanged = true;
}
else if (!foundHost.LinkEK!.Equals(mappedHost.LinkEK))
{
foundHost.LinkEK = mappedHost.LinkEK;
isChanged = true;
}
else if (!foundHost.Status!.Equals(mappedHost.Status))
{
foundHost.Status = mappedHost.Status;
isChanged = true;
}
else if (!foundHost.WorkGroup!.Equals(mappedHost.WorkGroup))
{
foundHost.WorkGroup = mappedHost.WorkGroup;
isChanged = true;
}
else if (!foundHost.Responsible!.Equals(mappedHost.Responsible))
{
foundHost.Responsible = mappedHost.Responsible;
isChanged = true;
}
else if (!foundHost.OS!.Equals(mappedHost.OS))
{
foundHost.OS = mappedHost.OS;
isChanged = true;
}
else if (!foundHost.DB!.Equals(mappedHost.DB))
{
foundHost.DB = mappedHost.DB;
isChanged = true;
}
else if (!foundHost.APP!.Equals(mappedHost.APP))
{
foundHost.APP = mappedHost.APP;
isChanged = true;
}
foundHost.DateModified = DateTimeOffset.UtcNow; ;
if (isChanged && !await hostService.CommitAsync())
logger.LogError($"Не удалось обновить узел {mappedHost.IP} {mappedHost.RegionalEK}");
else logger.LogInformation($"Обновлён узел {mappedHost.IP} {mappedHost.RegionalEK}");
}
else
{
if (!await hostService.CreateAsync(mappedHost) || !await hostService.CommitAsync())
logger.LogError($"Не удалось создать узел {mappedHost.IP} {mappedHost.RegionalEK}");
}
//host.DateModified = ...
//var host = new PARR.DAL.Models.Host
//{
// HostName = "",
// IP = vm!.Attributes["IP_АДРЕС"]!.Value,
// RegionalEK = vm?.Attributes?["РЕГИОНАЛЬНЫЙ_ЭК"]?.Value,
// LinkEK = vm?.Attributes?["СВЯЗАННЫЙ_ЭК"]?.Value,
// Status = vm?.Attributes?["СТАТУС"]?.Value,
// WorkGroup = vm?.Attributes?["РАБОЧАЯ_ГР_ОТВ_ЗА_ЭК"]?.Value,
// Responsible = vm?.Attributes?["ОТВЕТСТВЕННЫЙ_ЗА_ЭК"]?.Value,
// OS = vm?.Attributes?["ОС"]?.Value,
// DB = vm?.Attributes?["СУБД"]?.Value,
// APP = vm?.Attributes?["СП"]?.Value,
//};
//logger.LogInformation($"Запись сервера {mappedHost.IP}, региональный ЭК {mappedHost.RegionalEK}");
//if (String.IsNullOrEmpty(host.Status) || !host.Status.Equals("3-В эксплуатации")) continue;
//if (String.IsNullOrEmpty(host.IP)) continue;
}
}
break;
}
}
//прочитано для всех
foreach (var message in filtered) foreach (var message in filtered)
{ {
// await mailService.SetAsSeenAsync(message);
} }
} }
private bool IsChanged(Host host, Host mappedHost)
{
if (host == null) return true;
if (mappedHost == null) return true;
if (!host.IP.Equals(mappedHost.IP)) return true;
if (!host.RegionalEK!.Equals(mappedHost.RegionalEK)) return true;
if (!host.LinkEK!.Equals(mappedHost.LinkEK)) return true;
if (!host.Status!.Equals(mappedHost.Status)) return true;
if (!host.WorkGroup!.Equals(mappedHost.WorkGroup)) return true;
if (!host.Responsible!.Equals(mappedHost.Responsible)) return true;
if (!host.OS!.Equals(mappedHost.OS)) return true;
if (!host.DB!.Equals(mappedHost.DB)) return true;
if (!host.APP!.Equals(mappedHost.APP)) return true;
return false;
}
private static string EncodeString(string str)
{
byte[] bStr = Encoding.GetEncoding("koi8r").GetBytes(str);
Encoding encoding = Encoding.GetEncoding("koi8r");
str = encoding.GetString(bStr, 0, bStr.Length);
return str;
}
} }
} }

2
PARR.AIHIT/AIHIT/SyncherInstaller.cs
View File

@@ -12,6 +12,8 @@ namespace PARR.AIHIT
configuration.GetSection(nameof(SyncherSettings)).Bind(syncherSettings); configuration.GetSection(nameof(SyncherSettings)).Bind(syncherSettings);
services.AddSingleton(syncherSettings); services.AddSingleton(syncherSettings);
services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies());
services.AddTransient<ISyncher, Syncher>(); services.AddTransient<ISyncher, Syncher>();
} }
} }

2
PARR.DAL/Models/Host.cs
View File

@@ -11,7 +11,7 @@ namespace PARR.DAL.Models
public Guid Id { get; set; } public Guid Id { get; set; }
public DateTimeOffset DateCreated { get; set; } public DateTimeOffset DateCreated { get; set; }
public DateTimeOffset? DateModified { get; set; } public DateTimeOffset? DateModified { get; set; }
public required string HostName { get; set; } public string HostName { get; set; }
public required string IP { get; set; } public required string IP { get; set; }
public string? RegionalEK { get; set; } public string? RegionalEK { get; set; }
public string? LinkEK { get; set; } public string? LinkEK { get; set; }

59
PARR.DAL/Services/Implementations/HostService.cs
View File

@@ -20,5 +20,64 @@ namespace PARR.DAL.Services.Implementations
this.dataContext = dataContext; this.dataContext = dataContext;
this.logger = logger; this.logger = logger;
} }
public async Task<Host?> GetHostByIPAndRegionalEKAsync(string IP, string RegionalEK)
{
try
{
var host = await EntitySet.FirstAsync(h => h.IP == IP && h.RegionalEK == RegionalEK);
return host;
}
catch
{
logger.LogInformation($"Не найден узел с IP адресом {IP} и региональным ЭК {RegionalEK}");
return null;
}
}
//public async Task<Host?> GetHostByRegionalEKAsync(string RegionalEK)
//{
// try
// {
// var host = await EntitySet.FirstAsync(h => h.RegionalEK == RegionalEK);
// return host;
// }
// catch
// {
// logger.LogInformation($"Не найден узел с региональным ЭК {RegionalEK}");
// return null;
// }
//}
//public async Task<bool> UpdateAsync(Host host)
//{
// var orig = await EntitySet.FirstAsync(h => h.IP == host.IP);
// if (orig == null)
// return false;
// orig.DateModified = DateTimeOffset.UtcNow;
// orig.HostName = host.HostName;
// orig.RegionalEK = host.RegionalEK;
// orig.LinkEK = host.LinkEK;
// orig.Status = host.Status;
// orig.WorkGroup = host.WorkGroup;
// orig.Responsible = host.Responsible;
// orig.OS = host.OS;
// orig.DB = host.DB;
// orig.APP = host.APP;
// if (!await CommitAsync())
// {
// logger.LogError($"Ошибка обновления узла {host.IP}");
// return false;
// }
// else
// {
// logger.LogInformation($"Обновлен узел {host.IP}");
// return true;
// }
//}
} }
} }

3
PARR.DAL/Services/Interfaces/IHostService.cs
View File

@@ -5,5 +5,8 @@ namespace PARR.DAL.Services.Interfaces
{ {
public interface IHostService : IBaseService<Host> public interface IHostService : IBaseService<Host>
{ {
Task<Host?> GetHostByIPAndRegionalEKAsync(string IP, string RegionalEK);
//Task<Host?> GetHostByRegionalEKAsync(string LinkEK);
//Task<bool> UpdateAsync(Host host);
} }
} }

12
PARR.Worker/PARR.Worker/Program.cs
View File

@@ -1,12 +1,24 @@
using Microsoft.Extensions.Configuration;
using PARR.AIHIT; using PARR.AIHIT;
using PARR.DAL; using PARR.DAL;
using PARR.Mail; using PARR.Mail;
using PARR.Worker; using PARR.Worker;
using PARR.Worker.Settings;
using Serilog; using Serilog;
using System.Text;
Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
IHost host = Host.CreateDefaultBuilder(args) IHost host = Host.CreateDefaultBuilder(args)
.ConfigureServices((hostContext, services) => .ConfigureServices((hostContext, services) =>
{ {
IConfiguration configuration = hostContext.Configuration;
var workerSettings = new WorkerSettings();
workerSettings = hostContext.Configuration.GetSection(nameof(WorkerSettings)).Get<WorkerSettings>();
services.AddSingleton(workerSettings);
services.InstallMailServices(hostContext.Configuration); services.InstallMailServices(hostContext.Configuration);
services.InstallDalServices(hostContext.Configuration); services.InstallDalServices(hostContext.Configuration);
services.InstallerSyncerServices(hostContext.Configuration); services.InstallerSyncerServices(hostContext.Configuration);

10
PARR.Worker/PARR.Worker/Settings/SyncherSettings.cs
View File

@@ -1,10 +0,0 @@
namespace PARR.Worker.Settings
{
internal class SyncherSettings
{
public int OccursEvery { get; set; }
public string? IncludeAddresses { get; set; }
public List<string> IncludeAddressesArray => IncludeAddresses == null ? new List<string>() : IncludeAddresses.Split(",").ToList();
}
}

7
PARR.Worker/PARR.Worker/Settings/WorkerSettings.cs Normal file
View File

@@ -0,0 +1,7 @@
namespace PARR.Worker.Settings
{
public class WorkerSettings
{
public int OccursEvery { get; set; }
}
}

10
PARR.Worker/PARR.Worker/Worker.cs
View File

@@ -1,4 +1,5 @@
using PARR.AIHIT; using PARR.AIHIT;
using PARR.Worker.Settings;
namespace PARR.Worker namespace PARR.Worker
{ {
@@ -6,11 +7,16 @@ namespace PARR.Worker
{ {
private readonly ILogger<Worker> logger; private readonly ILogger<Worker> logger;
private readonly IServiceProvider serviceProvider; private readonly IServiceProvider serviceProvider;
private readonly WorkerSettings workerSettings;
public Worker(ILogger<Worker> logger, IServiceProvider serviceProvider) public Worker(ILogger<Worker> logger,
IServiceProvider serviceProvider,
WorkerSettings workerSettings
)
{ {
this.logger = logger; this.logger = logger;
this.serviceProvider = serviceProvider; this.serviceProvider = serviceProvider;
this.workerSettings = workerSettings;
} }
protected override async Task ExecuteAsync(CancellationToken stoppingToken) protected override async Task ExecuteAsync(CancellationToken stoppingToken)
@@ -30,7 +36,7 @@ namespace PARR.Worker
//await attachmentUploader.UploadAsync(); //await attachmentUploader.UploadAsync();
//logger.LogInformation("Worker running at: {time}", DateTimeOffset.Now); //logger.LogInformation("Worker running at: {time}", DateTimeOffset.Now);
await Task.Delay(60 * 1000, stoppingToken); await Task.Delay(workerSettings.OccursEvery, stoppingToken);
} }
} }
} }

6
PARR.Worker/PARR.Worker/appsettings.json
View File

@@ -33,9 +33,11 @@
"SSL": false, "SSL": false,
"UserName": "IVC_Robot" "UserName": "IVC_Robot"
}, },
"AIHITSyncherSettings": { "SyncherSettings": {
"OccursEvery": 60000,
"IncludeAddresses": "aihit@gvc.rzd" "IncludeAddresses": "aihit@gvc.rzd"
},
"WorkerSettings": {
"OccursEvery": 60000
} }
} }