From ec057fb27da202250fafc209e8026c2919a97611 Mon Sep 17 00:00:00 2001 From: Mikhail Kuznetsov Date: Wed, 20 Sep 2023 17:07:17 +1000 Subject: [PATCH] =?UTF-8?q?=D1=80=D0=B0=D0=B7=D0=B4=D0=B5=D0=BB=D0=B8?= =?UTF-8?q?=D1=82=D0=B5=D0=BB=D1=8C=20=D0=9F=D0=B0=D1=80=D1=81=D0=B5=D1=80?= =?UTF-8?q?=D0=B0=20=D1=81=D1=82=D1=80=D0=BE=D0=BA=20=D0=B8=D0=B7=20=D0=95?= =?UTF-8?q?=D0=A1=D0=9F=D0=9F=20=D0=B2=D1=8B=D0=BD=D0=B5=D1=81=D0=B5=D0=BD?= =?UTF-8?q?=20=D0=B2=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA?= =?UTF-8?q?=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/ParserService.cs | 10 ++++- .../Settings/GlobalSettings.cs | 1 + .../appsettings.Development.json | 37 +++++++++++++++++-- PARR.EsppTemplateSyncWorker/appsettings.json | 3 +- .../Services/TemplatesInitializer.cs | 12 +++--- 5 files changed, 51 insertions(+), 12 deletions(-) diff --git a/PARR.EsppTemplateSync/Services/ParserService.cs b/PARR.EsppTemplateSync/Services/ParserService.cs index f2cfdf64..f5148053 100644 --- a/PARR.EsppTemplateSync/Services/ParserService.cs +++ b/PARR.EsppTemplateSync/Services/ParserService.cs @@ -2,6 +2,7 @@ using PARR.DAL.Contracts; using PARR.DAL.Models; using PARR.DAL.Services.Interfaces; +using PARR.EsppTemplateSync.Settings; using System.Globalization; namespace PARR.EsppTemplateSync.Services @@ -9,10 +10,15 @@ namespace PARR.EsppTemplateSync.Services internal class ParserService : IParserService { private readonly ILogger logger; + private readonly GlobalSettings globalSettings; - public ParserService(ILogger logger) + public ParserService( + ILogger logger, + GlobalSettings globalSettings + ) { this.logger = logger; + this.globalSettings = globalSettings; } public async Task ParseFileAsync(string path) { @@ -29,7 +35,7 @@ namespace PARR.EsppTemplateSync.Services //TODO: а если формат нет тот? Все будет ок? //TODO: - var splittedContent = str.Split("<|>"); + var splittedContent = str.Split(globalSettings.ParsingSeparator); if (splittedContent.Length != 17) { return null; diff --git a/PARR.EsppTemplateSync/Settings/GlobalSettings.cs b/PARR.EsppTemplateSync/Settings/GlobalSettings.cs index fdf69ec4..1f69926b 100644 --- a/PARR.EsppTemplateSync/Settings/GlobalSettings.cs +++ b/PARR.EsppTemplateSync/Settings/GlobalSettings.cs @@ -6,6 +6,7 @@ public StorageSettings? StorageSettings { get; set; } public List? IgnoreTemplateFields { get; set; } + public string ParsingSeparator { get; set; } = "<|>"; } internal class MqSettings diff --git a/PARR.EsppTemplateSyncWorker/appsettings.Development.json b/PARR.EsppTemplateSyncWorker/appsettings.Development.json index 512fc588..45166210 100644 --- a/PARR.EsppTemplateSyncWorker/appsettings.Development.json +++ b/PARR.EsppTemplateSyncWorker/appsettings.Development.json @@ -1,19 +1,50 @@ { + "ConnectionStrings": { + "DefaultConnection": "Server=10.99.253.184;Database=parr;User Id=app_parr; Password=PosdfkhT&)%sdfligL&%5546;" + }, "Logging": { "LogLevel": { "Default": "Information", "Microsoft.Hosting.Lifetime": "Information" } }, + "Serilog": { + "MinimumLevel": { + "Default": "Debug", + "Override": { + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Debug" + } + }, + "WriteTo": [ + { + "Name": "File", + "Args": { + "path": "log/log-.txt", + "rollingInterval": "Day" + } + } + ] + }, "StorageSettings": { - "StoragePath": "W:\\" + "StoragePath": "Data", + "EsppTemplates": { + "AllowedExtensions": [ ".csv" ], + "MaxFileSizeMb": 100 + } }, "GlobalSettings": { "MqSettings": { + "HostName": "10.99.253.216", + "QueueName": "parr-espp-templates", + "UserName": "espp_templates_reader", + "Password": "P@ssReaderPtk202!" }, "StorageSettings": { - "CheckIntervalSeconds": 5 - } + "CheckIntervalSeconds": 30 + }, + "IgnoreTemplateFields": [ "Id", "Status", "DateCreated", "DateModified", "StatusCode" ], + "ParsingSeparator": "<|>" } } diff --git a/PARR.EsppTemplateSyncWorker/appsettings.json b/PARR.EsppTemplateSyncWorker/appsettings.json index 6cda1658..45166210 100644 --- a/PARR.EsppTemplateSyncWorker/appsettings.json +++ b/PARR.EsppTemplateSyncWorker/appsettings.json @@ -44,6 +44,7 @@ "StorageSettings": { "CheckIntervalSeconds": 30 }, - "IgnoreTemplateFields": [ "Id","Status","DateCreated","DateModified","StatusCode" ] + "IgnoreTemplateFields": [ "Id", "Status", "DateCreated", "DateModified", "StatusCode" ], + "ParsingSeparator": "<|>" } } diff --git a/PARR.MockData/Services/TemplatesInitializer.cs b/PARR.MockData/Services/TemplatesInitializer.cs index d17c11f9..b0709aa2 100644 --- a/PARR.MockData/Services/TemplatesInitializer.cs +++ b/PARR.MockData/Services/TemplatesInitializer.cs @@ -71,15 +71,15 @@ namespace PARR.MockData.Services logger.LogInformation($"----- Создан subprocess: {subprocess.Name} -----"); } - var tnk = await tnkService.Get().FirstOrDefaultAsync(p => p.EsppId == 292454); + var tnk = await tnkService.Get().FirstOrDefaultAsync(p => p.EsppId == 292917); if (tnk == null) { tnk = new Tnk { Id = Guid.NewGuid(), DateCreated = DateTimeOffset.UtcNow, - Name = "ППО Анализ прикладных журналов серверов приложений (О3.2.2.4)", - EsppId = 292454, + Name = "Прочее(работы)", + EsppId = 292917, SubprocessId = subprocess.Id }; if (!await tnkService.CreateAsync(tnk) || !await tnkService.CommitAsync()) @@ -91,15 +91,15 @@ namespace PARR.MockData.Services logger.LogInformation($"----- Создан tnk: {tnk.Name} -----"); } - var work = await workService.Get().FirstOrDefaultAsync(p => p.EsppId == 292454); + var work = await workService.Get().FirstOrDefaultAsync(p => p.EsppId == 292917); if (work == null) { work = new Work { Id = Guid.NewGuid(), DateCreated = DateTimeOffset.UtcNow, - Name = "ППО Анализ прикладных журналов серверов приложений (О3.2.2.4)", - EsppId = 292454, + Name = "Прочее(работы)", + EsppId = 292917, TnkId = tnk.Id }; if (!await workService.CreateAsync(work) || !await workService.CommitAsync())