From 8b761779fd847c71fa9dcba39b6921fe8125f62d Mon Sep 17 00:00:00 2001 From: Olga Nemt Date: Thu, 14 Mar 2024 14:57:00 +0500 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20=D0=B0?= =?UTF-8?q?=D0=BB=D0=B3=D0=BE=D1=80=D0=B8=D1=82=D0=BC=D0=B0=20=D1=84=D0=BE?= =?UTF-8?q?=D1=80=D0=BC=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=BF=D0=B8=D1=81=D0=B5=D0=B9=20=D0=B2=20=D0=BA?= =?UTF-8?q?=D0=B5=D1=88-=D1=82=D0=B0=D0=B1=D0=BB=D0=B8=D1=86=D1=83=20Data?= =?UTF-8?q?=5FSaub=5FStat?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PeriodicWorks/WorkDataSaubStat.cs | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/AsbCloudInfrastructure/Background/PeriodicWorks/WorkDataSaubStat.cs b/AsbCloudInfrastructure/Background/PeriodicWorks/WorkDataSaubStat.cs index d7daf9ad..ccb8472e 100644 --- a/AsbCloudInfrastructure/Background/PeriodicWorks/WorkDataSaubStat.cs +++ b/AsbCloudInfrastructure/Background/PeriodicWorks/WorkDataSaubStat.cs @@ -34,7 +34,7 @@ namespace AsbCloudInfrastructure.Background.PeriodicWorks var cacheRequest = new TelemetryDataRequest() { - GeDate = DateTime.UtcNow.AddDays(-Gap) + GeDate = DateTime.UtcNow.AddDays(-100) }; var idTelemetries = telemetryDataCache.GetIds(cacheRequest).ToArray(); @@ -49,6 +49,10 @@ namespace AsbCloudInfrastructure.Background.PeriodicWorks for( var i =0; i < idTelemetries.Length; i++) { var idTelemetry = idTelemetries[i]; + if(idTelemetry == 783) + { + ; + } var lastDate = stats.FirstOrDefault(s => s.IdTelemetry == idTelemetry)?.DateEnd.ToUniversalTime() ?? DateTimeOffset.UnixEpoch; var statsCount = await CreateStatForTelemetryFromDate(idTelemetry, lastDate, dataSaubService, dataSaubStatRepo, detectedOperationRepository, token); onProgressCallback($"Calculate stat for telemetry: {idTelemetry}; from {lastDate}; results count: {statsCount};", 100*i / idTelemetries.Length); @@ -154,13 +158,19 @@ namespace AsbCloudInfrastructure.Background.PeriodicWorks var hasOscillation = EnabledSubsystemsFlags.AutoOscillation.HasEnabledSubsystems(operation.EnabledSubsystems); var aggregatedValues = CalcAggregate(span); + var dateStart = span[0].DateTime; + var dateEnd = span[^1].DateTime; + var depthStart = span[0].WellDepth; + var depthEnd = span[^1].WellDepth; + var speed = ((depthEnd - depthStart) / (dateEnd - dateStart).TotalHours); + var processMapDrillingCacheItem = new DataSaubStatDto { - DateStart = operation.DateStart, - DateEnd = operation.DateEnd, - DepthStart = operation.DepthStart, - DepthEnd = operation.DepthEnd, - Speed = (operation.DepthEnd - operation.DepthStart) / ((operation.DateEnd - operation.DateStart).TotalHours), + DateStart = dateStart, + DateEnd = dateEnd, + DepthStart = depthStart, + DepthEnd = depthEnd, + Speed = speed, BlockSpeedSp = span[0].BlockSpeedSp, Pressure = aggregatedValues.Pressure, PressureIdle = span[0].PressureIdle,