From d7d4713953eb024b7ff7f26c0866463136f28587 Mon Sep 17 00:00:00 2001 From: Mikhail Trubnikov Date: Wed, 8 Jul 2026 14:47:59 +1000 Subject: [PATCH] =?UTF-8?q?fix(core):=20NextRun=20=D1=80=D0=B0=D1=81=D1=87?= =?UTF-8?q?=D0=B5=D1=82=20=D0=95=D0=A1=D0=9F=D0=9F,=20=D0=B8=D1=81=D0=BF?= =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20=D0=BC=D0=B5=D1=82=D0=BE?= =?UTF-8?q?=D0=B4=20=D1=80=D0=B5=D0=B3=D1=83=D0=BB=D1=8F=D1=80=D0=BD=D0=BE?= =?UTF-8?q?=D0=B3=D0=BE=20=D1=80=D0=B0=D1=81=D1=87=D0=B5=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Subservices/EsppScheduleTransformService.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/PARR.Core/Services/NextRunServices/Subservices/EsppScheduleTransformService.cs b/PARR.Core/Services/NextRunServices/Subservices/EsppScheduleTransformService.cs index aaa52040..5ed347f9 100644 --- a/PARR.Core/Services/NextRunServices/Subservices/EsppScheduleTransformService.cs +++ b/PARR.Core/Services/NextRunServices/Subservices/EsppScheduleTransformService.cs @@ -162,7 +162,7 @@ namespace PARR.Core.Services.NextRunServices.Subservices }; var key = values[0].Value.Value; - if (!regDict.TryGetValue(key, out int regMinutes)) + if (!regDict.TryGetValue(key, out int regHours)) { logger.LogError("Неизвестное значение: {Value}", key); throw new ArgumentException($"Неизвестное значение: {key}"); @@ -175,7 +175,7 @@ namespace PARR.Core.Services.NextRunServices.Subservices ////TODO: вот это повторяется от метода к методу ////Если итоговая дата указывает на прошлое, то повторяем расчёт и уходим в рекурсию //if (calcDay < DateTimeOffset.UtcNow /* || calcDay <= referenceDate*/) - // calcDay = GetNextDateRegularly(values, calcDay.AddHours(regMinutes)); + // calcDay = GetNextDateRegularly(values, calcDay.AddHours(regHours)); //return calcDay; @@ -189,12 +189,12 @@ namespace PARR.Core.Services.NextRunServices.Subservices // Сразу вычисляем, сколько целых интервалов нужно прибавить, чтобы догнать текущее время. if (calcDay < nowInTargetZone) { - double totalMinutesPast = (nowInTargetZone - calcDay).TotalMinutes; + double totalHoursPast = (nowInTargetZone - calcDay).TotalHours; // Считаем, сколько полных интервалов помещается в этот отрезок времени - long intervalsToSkip = (long)Math.Ceiling(totalMinutesPast / regMinutes); + long intervalsToSkip = (long)Math.Ceiling(totalHoursPast / regHours); - calcDay = calcDay.AddMinutes(intervalsToSkip * regMinutes); + calcDay = calcDay.AddHours(intervalsToSkip * regHours); } // Проверяем условия и делаем микро-шаги, если необходимо @@ -204,7 +204,7 @@ namespace PARR.Core.Services.NextRunServices.Subservices { return calcDay; } - calcDay = calcDay.AddMinutes(regMinutes); + calcDay = calcDay.AddHours(regHours); } }