From f7a21704541340c6f4b6307933340a0b5c3aac7b Mon Sep 17 00:00:00 2001 From: Mikhail Trubnikov Date: Fri, 27 Feb 2026 09:33:27 +1000 Subject: [PATCH] =?UTF-8?q?fix(esppSchedule):=20=D0=B8=D1=81=D0=BF=D1=80?= =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=BE=20=D1=81=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=20nextRun:=20espp,=20db,=20calc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PARR.DAL/Services/Abstracts/BaseService.cs | 2 +- PARR.EsppScheduleSync/ScheduleSyncher.cs | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/PARR.DAL/Services/Abstracts/BaseService.cs b/PARR.DAL/Services/Abstracts/BaseService.cs index 0470d73b..43c2a272 100644 --- a/PARR.DAL/Services/Abstracts/BaseService.cs +++ b/PARR.DAL/Services/Abstracts/BaseService.cs @@ -69,7 +69,7 @@ namespace PARR.DAL.Services.Abstracts try { var changedCount = await EntitiContext.SaveChangesAsync(); - logger.LogInformation("Успешно сохранено {ChangedCount} изменений в БД для объектов типа {EntityType}", + logger.LogDebug("Успешно сохранено {ChangedCount} изменений в БД для объектов типа {EntityType}", changedCount, typeof(T).Name); return true; } diff --git a/PARR.EsppScheduleSync/ScheduleSyncher.cs b/PARR.EsppScheduleSync/ScheduleSyncher.cs index b6602358..6fc936b9 100644 --- a/PARR.EsppScheduleSync/ScheduleSyncher.cs +++ b/PARR.EsppScheduleSync/ScheduleSyncher.cs @@ -273,16 +273,26 @@ namespace PARR.EsppScheduleSync logger.LogDebug("Рассчитанные значения для шаблона '{templateName}', {templateId}, следующее срабатывание {scheduledCalculated}, время создания наряда: {basisTimeCalculated}", dbObject.TemplateName, templateId, scheduledCalculated, basisTimeCalculated); - if (EsppSyncHelpers.Normalize(dbObject.Scheduled) != EsppSyncHelpers.Normalize(esppObject.Scheduled) || EsppSyncHelpers.Normalize(dbObject.Scheduled) != scheduledCalculated || EsppSyncHelpers.Normalize(esppObject.Scheduled) != scheduledCalculated) + var dbScheduledNormalized = EsppSyncHelpers.Normalize(dbObject.Scheduled); + var esppScheduledNormalized = EsppSyncHelpers.Normalize(esppObject.Scheduled); + var scheduleCalculatedNormalized = EsppSyncHelpers.Normalize(scheduledCalculated); + + //if (EsppSyncHelpers.Normalize(dbObject.Scheduled) != EsppSyncHelpers.Normalize(esppObject.Scheduled) || EsppSyncHelpers.Normalize(dbObject.Scheduled) != scheduledCalculated || EsppSyncHelpers.Normalize(esppObject.Scheduled) != scheduledCalculated) + if (dbScheduledNormalized != esppScheduledNormalized || dbScheduledNormalized != scheduleCalculatedNormalized || esppScheduledNormalized != scheduleCalculatedNormalized) { - logger.LogInformation("Не совпадают поля ({propName}), dbValueStr: {dbValueStr}, esppValueStr: {esppValueStr}, scheduledCalculated: {scheduledCalculated}. Имя шаблона: {templateName}", + logger.LogInformation("Не совпадают поля ({PropertyName}), dbValueStr: {dbValueStr}, esppValueStr: {esppValueStr}, scheduledCalculated: {scheduledCalculated}. Имя шаблона: {templateName}", nameof(dbObject.Scheduled), dbObject.Scheduled, esppObject.Scheduled, scheduledCalculated, dbObject.TemplateName); return false; } - if (EsppSyncHelpers.Normalize(dbObject.BasisTime) != EsppSyncHelpers.Normalize(esppObject.BasisTime) || EsppSyncHelpers.Normalize(dbObject.BasisTime) != basisTimeCalculated || EsppSyncHelpers.Normalize(esppObject.BasisTime) != basisTimeCalculated) + var dbBasisTimeNormalized = EsppSyncHelpers.Normalize(dbObject.BasisTime); + var esppBasisTimeNormalized = EsppSyncHelpers.Normalize(esppObject.BasisTime); + var calculatedBasisTimeNormalized = EsppSyncHelpers.Normalize(basisTimeCalculated); + + //if (EsppSyncHelpers.Normalize(dbObject.BasisTime) != EsppSyncHelpers.Normalize(esppObject.BasisTime) || EsppSyncHelpers.Normalize(dbObject.BasisTime) != basisTimeCalculated || EsppSyncHelpers.Normalize(esppObject.BasisTime) != basisTimeCalculated) + if (dbBasisTimeNormalized != esppBasisTimeNormalized || dbBasisTimeNormalized != calculatedBasisTimeNormalized || esppBasisTimeNormalized != calculatedBasisTimeNormalized) { - logger.LogInformation("Не совпадают поля ({propName}), dbValueStr: {dbValueStr}, esppValueStr: {esppValueStr}, basisTimeCalculated: {basisTimeCalculated}. Имя шаблона: {templateName}", + logger.LogInformation("Не совпадают поля ({PropertyName}), dbValueStr: {dbValueStr}, esppValueStr: {esppValueStr}, basisTimeCalculated: {basisTimeCalculated}. Имя шаблона: {templateName}", nameof(dbObject.BasisTime), dbObject.BasisTime, esppObject.BasisTime, basisTimeCalculated, dbObject.TemplateName); return false; }