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

fix(templateDistributor): список рабочих дней рассчитывается на период относительно текущей даты

Browse Source
This commit is contained in:
Mikhail Trubnikov
2024-09-19 15:38:14 +10:00
parent 9f193fe3ae
commit 4140e17825
9 changed files with 54 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
PARR.JobAutoControlWorker/appsettings.Development.json
View File

@@ -1,4 +1,7 @@
{ {
"ConnectionStrings": {
"RedisConnection": "10.99.253.216:6379,password=ParrP@ssPtk202MMdevDvs"
},
"Logging": { "Logging": {
"LogLevel": { "LogLevel": {
"Default": "Information", "Default": "Information",

3
PARR.JobAutoControlWorker/appsettings.json
View File

@@ -1,6 +1,7 @@
{ {
"ConnectionStrings": { "ConnectionStrings": {
"DefaultConnection": "Server=10.99.253.184;Database=parr;User Id=app_parr; Password=PosdfkhT&)%sdfligL&%5546;" "DefaultConnection": "Server=10.99.253.184;Database=parr;User Id=app_parr; Password=PosdfkhT&)%sdfligL&%5546;",
"RedisConnection": "parr-redis:6379,password=ParrP@ssPtk202MMdevDvs"
}, },
"Logging": { "Logging": {
"LogLevel": { "LogLevel": {

3
PARR.NextRunWorker/appsettings.Development.json
View File

@@ -1,4 +1,7 @@
{ {
"ConnectionStrings": {
"RedisConnection": "10.99.253.216:6379,password=ParrP@ssPtk202MMdevDvs"
},
"Logging": { "Logging": {
"LogLevel": { "LogLevel": {
"Default": "Information", "Default": "Information",

3
PARR.NextRunWorker/appsettings.json
View File

@@ -1,6 +1,7 @@
{ {
"ConnectionStrings": { "ConnectionStrings": {
"DefaultConnection": "Server=10.99.253.184;Database=parr;User Id=app_parr; Password=PosdfkhT&)%sdfligL&%5546;" "DefaultConnection": "Server=10.99.253.184;Database=parr;User Id=app_parr; Password=PosdfkhT&)%sdfligL&%5546;",
"RedisConnection": "parr-redis:6379,password=ParrP@ssPtk202MMdevDvs"
}, },
"Logging": { "Logging": {
"LogLevel": { "LogLevel": {

3
PARR.TemplateActivatorWorker/appsettings.Development.json
View File

@@ -1,4 +1,7 @@
{ {
"ConnectionStrings": {
"RedisConnection": "10.99.253.216:6379,password=ParrP@ssPtk202MMdevDvs"
},
"Logging": { "Logging": {
"LogLevel": { "LogLevel": {
"Default": "Information", "Default": "Information",

3
PARR.TemplateActivatorWorker/appsettings.json
View File

@@ -1,6 +1,7 @@
{ {
"ConnectionStrings": { "ConnectionStrings": {
"DefaultConnection": "Server=10.99.253.184;Database=parr;User Id=app_parr; Password=PosdfkhT&)%sdfligL&%5546;" "DefaultConnection": "Server=10.99.253.184;Database=parr;User Id=app_parr; Password=PosdfkhT&)%sdfligL&%5546;",
"RedisConnection": "parr-redis:6379,password=ParrP@ssPtk202MMdevDvs"
}, },
"Logging": { "Logging": {
"LogLevel": { "LogLevel": {

53
PARR.TemplateDistributor/TemplateDistributor.cs
View File

@@ -290,30 +290,45 @@ namespace PARR.TemplateDistributor
{ {
var period = appInWork.EsppSchValues.FirstOrDefault()?.EsppSchTypeValue?.DistributionPeriod; var period = appInWork.EsppSchValues.FirstOrDefault()?.EsppSchTypeValue?.DistributionPeriod;
var periodType = ParseDistributionPeriodType(period!.Type); var periodType = ParseDistributionPeriodType(period!.Type);
var startPeriod = await esppScheduleTransformService.GetStartPeriodForDateAsync(appInWork.Id, appInWork.ReferenceDate, appInWork.ReferenceDate, periodType, period.Duration);
var result = calendarService.GetWorkDatesForPeriod(startPeriod, TimeOnly.FromDateTime(appInWork.ReferenceDate.DateTime), periodType, period.Duration, weekendDayService.GetWeekends); //старт период, берем сейчас, будем получать рабочие дни с вычетом выходных на весь период сразу.
var startPeriod = DateOnly.FromDateTime(DateTimeOffset.UtcNow.Date);
// старт период считаем относительно refDate
//var startPeriod = await esppScheduleTransformService.GetStartPeriodForDateAsync(appInWork.Id, appInWork.ReferenceDate, appInWork.ReferenceDate, periodType, period.Duration);
result.ForEach(wd => var workDays = calendarService.GetWorkDatesForPeriod(startPeriod, TimeOnly.FromDateTime(appInWork.ReferenceDate.DateTime), periodType, period.Duration, weekendDayService.GetWeekends);
{
var wrokDateTimeOffset = new DateTimeOffset(
wd.Year, wd.Month, wd.Day,
appInWork.ReferenceDate.Hour, appInWork.ReferenceDate.Minute, appInWork.ReferenceDate.Second,
new TimeSpan(0, 0, 0));
if (wrokDateTimeOffset < DateTimeOffset.UtcNow) #region старая логика
{ //var resultWorkDays = new List<DateOnly>();
wrokDateTimeOffset = esppScheduleTransformService.GetNextDateForDistributionRun(wrokDateTimeOffset, periodType, period.Duration);
wd = DateOnly.FromDateTime(wrokDateTimeOffset.DateTime);
}
});
//----- убираем даты, которые могли выйти за конец периода (из-за сдвига NextRun по рабочим дням) //workDays.ForEach(wd =>
var endPeriod = calendarService.GetEndPeriodDate(startPeriod, periodType, period.Duration); //{
result = result.Where(t => t <= endPeriod).ToList(); // var wrokDateTimeOffset = new DateTimeOffset(
//----- // wd.Year, wd.Month, wd.Day,
// appInWork.ReferenceDate.Hour, appInWork.ReferenceDate.Minute, appInWork.ReferenceDate.Second,
// new TimeSpan(0, 0, 0));
return result; // if (wrokDateTimeOffset < DateTimeOffset.UtcNow)
// {
// wrokDateTimeOffset = esppScheduleTransformService.GetNextDateForDistributionRun(wrokDateTimeOffset, periodType, period.Duration);
// //wd = DateOnly.FromDateTime(wrokDateTimeOffset.DateTime);
// resultWorkDays.Add(DateOnly.FromDateTime(wrokDateTimeOffset.DateTime));
// }
// else
// {
// resultWorkDays.Add(wd);
// }
//});
////----- убираем даты, которые могли выйти за конец периода (из-за сдвига NextRun по рабочим дням)
//var endPeriod = calendarService.GetEndPeriodDate(DateOnly.FromDateTime(DateTimeOffset.UtcNow.Date), periodType, period.Duration);
//resultWorkDays = resultWorkDays.Where(t => t <= endPeriod).Distinct().OrderBy(t => t).ToList();
////-----
//return resultWorkDays;
#endregion
return workDays;
} }
/// <summary> /// <summary>

3
PARR.TemplateDistributorWorker/appsettings.Development.json
View File

@@ -1,4 +1,7 @@
{ {
"ConnectionStrings": {
"RedisConnection": "10.99.253.216:6379,password=ParrP@ssPtk202MMdevDvs"
},
"Logging": { "Logging": {
"LogLevel": { "LogLevel": {
"Default": "Information", "Default": "Information",

3
PARR.TemplateDistributorWorker/appsettings.json
View File

@@ -1,6 +1,7 @@
{ {
"ConnectionStrings": { "ConnectionStrings": {
"DefaultConnection": "Server=10.99.253.184;Database=parr;User Id=app_parr; Password=PosdfkhT&)%sdfligL&%5546;" "DefaultConnection": "Server=10.99.253.184;Database=parr;User Id=app_parr; Password=PosdfkhT&)%sdfligL&%5546;",
"RedisConnection": "parr-redis:6379,password=ParrP@ssPtk202MMdevDvs"
}, },
"Logging": { "Logging": {
"LogLevel": { "LogLevel": {