From 24c0ba5e164dfb1ba4127daa4d959d4c443a6cb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A4=D1=80=D0=BE=D0=BB=D0=BE=D0=B2?= Date: Fri, 24 Dec 2021 11:42:23 +0500 Subject: [PATCH] Fix dateTime bug --- .../Services/TelemetryTracker.cs | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/AsbCloudInfrastructure/Services/TelemetryTracker.cs b/AsbCloudInfrastructure/Services/TelemetryTracker.cs index b3d65769..801d687f 100644 --- a/AsbCloudInfrastructure/Services/TelemetryTracker.cs +++ b/AsbCloudInfrastructure/Services/TelemetryTracker.cs @@ -88,9 +88,15 @@ namespace AsbCloudInfrastructure.Services foreach (var oldReq in oldRequests) { var telemetryStat = telemetriesStats.GetOrAdd(oldReq.Uid, (uid) => new TrackerStat { RemoteUid = uid }); - telemetryStat.TelemetryDateMin = oldReq.DateMin; - telemetryStat.TelemetryDateMax = oldReq.DateMax; - telemetryStat.LastTimeServer = oldReq.DateMax; + var dateMin = oldReq.DateMin.Kind == DateTimeKind.Local + ? oldReq.DateMin.ToUniversalTime() + : oldReq.DateMin; + var dateMax = oldReq.DateMax.Kind == DateTimeKind.Local + ? oldReq.DateMax.ToUniversalTime() + : oldReq.DateMax; + telemetryStat.TelemetryDateMin = dateMin; + telemetryStat.TelemetryDateMax = dateMax; + telemetryStat.LastTimeServer = dateMax; } }).ContinueWith((t) => { @@ -123,7 +129,7 @@ namespace AsbCloudInfrastructure.Services stat.LastTimeServer = DateTime.Now; - if(stat.TelemetryDateMax < remoteDate) + if(stat.TelemetryDateMax.ToUniversalTime() < remoteDate.ToUniversalTime()) stat.TelemetryDateMax = remoteDate; }