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

TemplateService. !!!Ошибка записи в БД

Browse Source
This commit is contained in:
Mikhail Kuznetsov
2023-09-01 16:19:32 +10:00
parent 21eb83a50f
commit af21530d01
16 changed files with 1125 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
PARR.EsppTemplateSync/PARR.EsppTemplateSync.csproj
View File

@@ -7,6 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.4" />
<PackageReference Include="RabbitMQ.Client" Version="6.5.0" />
</ItemGroup>

68
PARR.EsppTemplateSync/Services/Manager.cs
View File

@@ -1,17 +1,34 @@
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using PARR.DAL.Context;
using PARR.DAL.Models;
using PARR.DAL.Services.Interfaces;
namespace PARR.EsppTemplateSync.Services
{
internal class Manager : IManager
{
private readonly ILogger<Manager> logger;
private readonly IServiceProvider serviceProvider;
private readonly IParserService parserService;
// private readonly ITemplateService templateService;
public Manager(ILogger<Manager> logger, IParserService parserService)
public Manager(
ILogger<Manager> logger,
IServiceProvider serviceProvider,
IParserService parserService//,
// ITemplateService templateService
)
{
this.logger = logger;
this.serviceProvider = serviceProvider;
this.parserService = parserService;
// this.templateService = templateService;
//using var scope = serviceProvider.CreateScope();
//var services = scope.ServiceProvider;
//var templateService = services.GetService<ITemplateService>();
}
public Task<bool> ManageFileAsync(string path)
{
@@ -20,18 +37,59 @@ namespace PARR.EsppTemplateSync.Services
public async Task<bool> ManageStringAsync(string str)
{
bool isSuccess = true;
//TOD if (str == null || str.Length <= 2)
var template = await parserService.ParseStringAsync(str);
CheckChanges(template);
await CheckChangesAsync(template);
return isSuccess;
}
private void CheckChanges(Template template)
private async Task CheckChangesAsync(Template esppTemplate)
{
//if (!await templateService.CreateAsync(esppTemplate) || !await templateService.CommitAsync())
//{
// logger.LogError($"Не удалось создать запись Template {esppTemplate.EK}({esppTemplate.ShortDescription})");
//}
//else
// logger.LogInformation($"----- Создана запись Template {esppTemplate.EK}({esppTemplate.ShortDescription}) -----");
// -----------------
//using var dataContext = new DataContext(new Microsoft.EntityFrameworkCore.DbContextOptions<DataContext> { });
////using var dataContext = new DataContext(opt =>
//// opt.UseNpgsql("Server=10.99.253.184;Database=parr;User Id=app_parr; Password=PosdfkhT&)%sdfligL&%5546;"));
//dataContext.Templates.Add(esppTemplate);
//await dataContext.SaveChangesAsync();
// -----------------
using (var scope = serviceProvider.CreateScope())
{
var services = scope.ServiceProvider;
var templateService = services.GetService<ITemplateService>();
if (templateService == null)
return;
var template = await templateService.GetTemplateByNameAsync(esppTemplate.EK);
if (template == null)
{
esppTemplate.Status = "New";
logger.LogInformation($"В ЕСПП активирован неизвестной шаблон: {esppTemplate.EK} секунд. краткое описание: {esppTemplate.ShortDescription}");
if (!await templateService.CreateAsync(esppTemplate) || !await templateService.CommitAsync())
{
logger.LogError($"Не удалось создать запись Template {esppTemplate.EK}({esppTemplate.ShortDescription})");
}
else
logger.LogInformation($"----- Создана запись Template {esppTemplate.EK}({esppTemplate.ShortDescription}) -----");
}
}
}
}
}

7
PARR.EsppTemplateSync/Services/ParserService.cs
View File

@@ -47,7 +47,8 @@ namespace PARR.EsppTemplateSync.Services
Category = category,
EKDateCreated = ConvertDateFromStr(ekDateCreatedStr+ " +03:00"),
Process = process,
SubProcess = subProcess
SubProcess = subProcess,
Status = "Checking"
};
//bool isSuccess = true;
@@ -63,12 +64,12 @@ namespace PARR.EsppTemplateSync.Services
try
{
var result = DateTimeOffset.ParseExact(dateString, format, provider);
Console.WriteLine("{0} было преобразовано в {1}.", dateString, result.ToString());
logger.LogInformation($"{dateString} было преобразовано в {result.ToString()}.");
return result;
}
catch (FormatException)
{
Console.WriteLine("{0} имеет некоррктный формат для преобразование в DateTimeOffset", dateString);
logger.LogWarning($"{dateString} имеет некоррктный формат для преобразование в DateTimeOffset");
}
return null;
}

34
PARR.EsppTemplateSync/TemplateMQSyncer.cs
View File

@@ -1,8 +1,11 @@
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using PARR.DAL.Context;
using PARR.EsppTemplateSync.Services;
using PARR.EsppTemplateSync.Settings;
using RabbitMQ.Client;
using RabbitMQ.Client.Events;
using System.Runtime.Serialization.DataContracts;
using System.Text;
namespace PARR.EsppTemplateSync
@@ -12,18 +15,21 @@ namespace PARR.EsppTemplateSync
private readonly ILogger<TemplateMQSyncer> logger;
private readonly IManager manager;
private readonly GlobalSettings globalSettings;
private readonly IServiceProvider serviceProvider;
private IConnection connection;
private RabbitMQ.Client.IModel channel;
public TemplateMQSyncer(
ILogger<TemplateMQSyncer> logger,
IManager manager,
GlobalSettings globalSettings
GlobalSettings globalSettings,
IServiceProvider serviceProvider
)
{
this.logger = logger;
this.manager = manager;
this.globalSettings = globalSettings;
this.serviceProvider = serviceProvider;
if (globalSettings.MqSettings == null)
{
logger.LogError("Нет секции настроек хранилища. MqSettings, EsppTemplates");
@@ -49,11 +55,12 @@ namespace PARR.EsppTemplateSync
{
logger.LogInformation($"Запущена проверка очереди {globalSettings.MqSettings!.QueueName}. Интервал: {globalSettings.MqSettings!.CheckIntervalSeconds} секунд.");
CancellationTokenSource cancelTokenSource = new CancellationTokenSource();
CancellationToken token = cancelTokenSource.Token;
Task task = new Task(() => { GetMessages(); }, token);
task.Start();
await task.WaitAsync(token);
// CancellationTokenSource cancelTokenSource = new CancellationTokenSource();
// CancellationToken token = cancelTokenSource.Token;
// Task task = new Task(() => { GetMessages(); }, token);
// task.Start();
// await task.WaitAsync(token);
GetMessages();
}
private void GetMessages()
@@ -66,7 +73,18 @@ namespace PARR.EsppTemplateSync
// Обрабатываем полученное сообщение
await manager.ManageStringAsync(content);
// ------------
//using var scope = serviceProvider.CreateScope();
//var services = scope.ServiceProvider;
//var manager = services.GetRequiredService<IManager>();
//// ------------
//if (manager != null) await manager.ManageStringAsync(content);
channel.BasicAck(ea.DeliveryTag, false);
await Task.Yield();
};