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

feat(nextRun): рассчет поля NextRun по расписанию

Browse Source
This commit is contained in:
Mikhail Trubnikov
2024-02-05 16:05:02 +10:00
parent 51503a5964
commit bacd6f0021
17 changed files with 305 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
PARR.API.sln
View File

@@ -60,6 +60,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PARR.EsppScheduleSync", "PA
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PARR.EsppScheduleSyncWorker", "PARR.EsppScheduleSyncWorker\PARR.EsppScheduleSyncWorker.csproj", "{C597A1D7-1BC5-493B-BC29-03EC830FB090}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PARR.NextRun", "PARR.NextRun\PARR.NextRun.csproj", "{92400205-B781-4C6C-BDA3-6D3652C2B62F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PARR.NextRunWorker", "PARR.NextRunWorker\PARR.NextRunWorker.csproj", "{47C6E193-257A-4001-84D7-11B640E3D1A0}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -160,6 +164,14 @@ Global
{C597A1D7-1BC5-493B-BC29-03EC830FB090}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C597A1D7-1BC5-493B-BC29-03EC830FB090}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C597A1D7-1BC5-493B-BC29-03EC830FB090}.Release|Any CPU.Build.0 = Release|Any CPU
{92400205-B781-4C6C-BDA3-6D3652C2B62F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{92400205-B781-4C6C-BDA3-6D3652C2B62F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{92400205-B781-4C6C-BDA3-6D3652C2B62F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{92400205-B781-4C6C-BDA3-6D3652C2B62F}.Release|Any CPU.Build.0 = Release|Any CPU
{47C6E193-257A-4001-84D7-11B640E3D1A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{47C6E193-257A-4001-84D7-11B640E3D1A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{47C6E193-257A-4001-84D7-11B640E3D1A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{47C6E193-257A-4001-84D7-11B640E3D1A0}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

6
PARR.DAL/TransformServices/EsppScheduleTransformService.cs
View File

@@ -46,7 +46,11 @@ namespace PARR.DAL.TransformServices
{"Суббота", 6 },
{"Воскресенье", 0 }
};
public EsppScheduleTransformService(IEsppSchTypeConfigService esppSchTypeConfigService, ILogger<EsppScheduleTransformService> logger)
public EsppScheduleTransformService(
IEsppSchTypeConfigService esppSchTypeConfigService,
ILogger<EsppScheduleTransformService> logger
)
{
this.esppSchTypeConfigService = esppSchTypeConfigService;
this.logger = logger;

1
PARR.EsppOrderManagerWorker/Program.cs
View File

@@ -1,5 +1,4 @@
using Elastic.CommonSchema.Serilog;
using PARR.EsppApi;
using PARR.EsppOrderManager;
using PARR.EsppOrderManagerWorker;
using Serilog;

7
PARR.NextRun/INextRunManager.cs Normal file
View File

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

23
PARR.NextRun/NextRunInstaller.cs Normal file
View File

@@ -0,0 +1,23 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using PARR.BLL;
using PARR.DAL;
using PARR.NextRun.Settings;
namespace PARR.NextRun
{
public static class NextRunInstaller
{
public static void InstallNextRunServices(this IServiceCollection services, IConfiguration configuration)
{
services.InstallBllServices(configuration);
services.InstallDalServices(configuration);
var settings = new WorkerSettings();
configuration.GetSection(nameof(WorkerSettings)).Bind(settings);
services.AddSingleton(settings);
services.AddTransient<INextRunManager, NextRunManager>();
}
}
}

80
PARR.NextRun/NextRunManager.cs Normal file
View File

@@ -0,0 +1,80 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using PARR.BLL.Services.Interfaces;
using PARR.DAL.Services.Interfaces;
using PARR.DAL.TransformServices;
using PARR.NextRun.Settings;
namespace PARR.NextRun
{
internal class NextRunManager : INextRunManager
{
private readonly WorkerSettings workerSettings;
private readonly ILogger<NextRunManager> logger;
private readonly IIntervalService intervalService;
private readonly IServiceProvider serviceProvider;
public NextRunManager(
WorkerSettings workerSettings,
ILogger<NextRunManager> logger,
IIntervalService intervalService,
IServiceProvider serviceProvider
)
{
this.workerSettings = workerSettings;
this.logger = logger;
this.intervalService = intervalService;
this.serviceProvider = serviceProvider;
}
public async Task StartAsync()
{
logger.LogInformation("Запуск сервиса рассчета времени следующего создания наряда (nextRun)");
await intervalService.IntervalInitAsync(async () =>
{
using (var scope = serviceProvider.CreateScope())
{
var appInWorkService = scope.ServiceProvider.GetService<IApplicationsInWorkService>();
var esppSchService = scope.ServiceProvider.GetService<IEsppScheduleTransformService>();
if (appInWorkService == null || esppSchService == null)
throw new Exception("Не смог получить серивс IApplicationsInWorkService или IEsppScheduleTransformService");
await HandlerAsync(appInWorkService, esppSchService);
}
}, workerSettings.RepeatEvery);
}
/// <summary>
/// Рассчет следующей даты срабатываения
/// </summary>
/// <returns></returns>
private async Task HandlerAsync(IApplicationsInWorkService applicationsInWorkService, IEsppScheduleTransformService esppScheduleTransformService)
{
var objs = await applicationsInWorkService.Get().Where(t => t.NextRun < DateTimeOffset.UtcNow).ToListAsync();
logger.LogDebug($"Объектов для обновления: {objs.Count()} шт.");
int errorsCount = 0;
foreach (var obj in objs)
{
var nextRun = await esppScheduleTransformService.GetNextDateAsync(obj.Id, obj.NextRun);
obj.NextRun = nextRun;
if (await applicationsInWorkService.CommitAsync())
logger.LogDebug($"Обновлено значение поле NextRun {obj.NextRun} для строки {obj.Id}");
else
{
logger.LogError($"Ошибка при обновлении значения поля NextRun {obj.NextRun} для строки {obj.Id}");
errorsCount++;
}
}
logger.LogInformation($"Завершено обновление полей NextRun. Полей в задании: {objs.Count()}, обновлено: {objs.Count() - errorsCount}, ошибок: {errorsCount}");
}
}
}

14
PARR.NextRun/PARR.NextRun.csproj Normal file
View File

@@ -0,0 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\PARR.BLL\PARR.BLL.csproj" />
<ProjectReference Include="..\PARR.DAL\PARR.DAL.csproj" />
</ItemGroup>
</Project>

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

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

28
PARR.NextRunWorker/Dockerfile Normal file
View File

@@ -0,0 +1,28 @@
#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
FROM 10.99.253.167:8090/dotnet/runtime:7.0 AS base
WORKDIR /app
FROM 10.99.253.167:8090/dotnet/sdk:7.0 AS build
ARG BUILD_CONFIGURATION=Release
WORKDIR /src
COPY ["NuGet.config", "."]
COPY ["PARR.NextRunWorker/PARR.NextRunWorker.csproj", "PARR.NextRunWorker/"]
COPY ["PARR.NextRun/PARR.NextRun.csproj", "PARR.NextRun/"]
COPY ["PARR.BLL/PARR.BLL.csproj", "PARR.BLL/"]
COPY ["PARR.DAL/PARR.DAL.csproj", "PARR.DAL/"]
COPY ["PARR.Constants/PARR.Constants.csproj", "PARR.Constants/"]
RUN dotnet restore "./PARR.NextRunWorker/./PARR.NextRunWorker.csproj"
COPY . .
WORKDIR "/src/PARR.NextRunWorker"
RUN dotnet build "./PARR.NextRunWorker.csproj" -c $BUILD_CONFIGURATION -o /app/build
FROM build AS publish
ARG app_version=0.0.0-default
ARG BUILD_CONFIGURATION=Release
RUN dotnet publish "./PARR.NextRunWorker.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false /p:Version=$app_version
FROM base AS final
WORKDIR /app
COPY --from=publish /app/publish .
ENTRYPOINT ["dotnet", "PARR.NextRunWorker.dll"]

24
PARR.NextRunWorker/PARR.NextRunWorker.csproj Normal file
View File

@@ -0,0 +1,24 @@
<Project Sdk="Microsoft.NET.Sdk.Worker">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<UserSecretsId>dotnet-PARR.NextRunWorker-a622ce44-5924-404c-b214-4dcbdba3aca3</UserSecretsId>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Elastic.CommonSchema.Serilog" Version="8.6.1" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
<PackageReference Include="Serilog.Extensions.Hosting" Version="7.0.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="7.0.1" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\PARR.NextRun\PARR.NextRun.csproj" />
</ItemGroup>
</Project>

29
PARR.NextRunWorker/Program.cs Normal file
View File

@@ -0,0 +1,29 @@
using Elastic.CommonSchema.Serilog;
using PARR.NextRun;
using PARR.NextRunWorker;
using Serilog;
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.InstallNextRunServices(builder.Configuration);
builder.Services.AddHostedService<Worker>();
var host = builder.Build();
host.Run();

14
PARR.NextRunWorker/Properties/launchSettings.json Normal file
View File

@@ -0,0 +1,14 @@
{
"profiles": {
"PARR.NextRunWorker": {
"commandName": "Project",
"environmentVariables": {
"DOTNET_ENVIRONMENT": "Development"
},
"dotnetRunMessages": true
},
"Docker": {
"commandName": "Docker"
}
}
}

19
PARR.NextRunWorker/Worker.cs Normal file
View File

@@ -0,0 +1,19 @@
using PARR.NextRun;
namespace PARR.NextRunWorker
{
public class Worker : BackgroundService
{
private readonly INextRunManager nextRunManager;
public Worker(INextRunManager nextRunManager)
{
this.nextRunManager = nextRunManager;
}
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
{
await nextRunManager.StartAsync();
}
}
}

8
PARR.NextRunWorker/appsettings.Development.json Normal file
View File

@@ -0,0 +1,8 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.Hosting.Lifetime": "Information"
}
}
}

32
PARR.NextRunWorker/appsettings.json Normal file
View File

@@ -0,0 +1,32 @@
{
"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"
}
}
]
},
"WorkerSettings": {
"RepeatEvery": "0:50:00"
}
}

2
PARR.Test/Worker.cs
View File

@@ -37,7 +37,7 @@ namespace PARR.Test
private async Task TestEsppApi()
{
//var result = await esppApiService.FindOrdersAsync(new FindOrdersQuery { DescriptionContains = "Полное", GenerateDateStart = new DateTime(2023, 10, 10) , GenerateDateEnd = new DateTime(2023, 10, 24) });
var recordId = "НАР24-00007352";
var recordId = "НАР24-00009262";
var result = await esppApiService.FindOrderByRecordIdAsync(recordId);

3
README.md
View File

@@ -28,5 +28,6 @@
- PARR.Master - логика связывания нарядов ЕСПП и Агентов ПАРР, связывание нарядов и шаблонов, добавление нарядов в очередь на закрытие
- PARR.MasterWorker
- PARR.MockData - загрузка тестовых данных
- PARR.NextRun - рассчет следующей даты генерации наряда/запуска агента
- PARR.NextRunWorker
- PARR.Test - тестирование функций ПАРР