on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity

Добавлен OrderBy при сортировке телеметрии + расчет indexStart и indexEnd в методе CreateDataSaubStat

Browse Source
This commit is contained in:
Olga Nemt 2024-02-02 13:51:58 +05:00
parent b9bbb06584
commit ba56bfe274
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
AsbCloudInfrastructure/Background/PeriodicWorks/WorkDataSaubStat.cs
View File

@ -78,6 +78,7 @@ namespace AsbCloudInfrastructure.Background.PeriodicWorks
.Where(t => t.DateTime >= minDate) .Where(t => t.DateTime >= minDate)
.Where(t => t.DateTime <= maxDate) .Where(t => t.DateTime <= maxDate)
.Where(t => Math.Abs(t.BitDepth - t.WellDepth) < 0.0001) .Where(t => Math.Abs(t.BitDepth - t.WellDepth) < 0.0001)
.OrderBy(t => t.DateTime)
.ToArrayAsync(token); .ToArrayAsync(token);
if (!telemetryDataSaub.Any()) if (!telemetryDataSaub.Any())
@ -94,25 +95,30 @@ namespace AsbCloudInfrastructure.Background.PeriodicWorks
var indexStart = 0; var indexStart = 0;
var indexEnd = 0; var indexEnd = 0;
var result = new List<DataSaubStat>(); var result = new List<DataSaubStat>();
if (!telemetryDataSaub.Any())
return result;
foreach (var operation in detectedOperations) foreach (var operation in detectedOperations)
{ {
indexStart = Array.FindIndex(telemetryDataSaub, indexEnd, t => t.DateTime >= operation.DateStart); indexStart = Array.FindIndex(telemetryDataSaub, indexEnd, t => t.DateTime >= operation.DateStart);
indexEnd = Array.FindIndex(telemetryDataSaub, indexStart, t => t.DateTime > operation.DateEnd) - 1; if (indexStart < 0)
break;
indexEnd = Array.FindIndex(telemetryDataSaub, indexStart, t => t.DateTime > operation.DateEnd);
if (indexEnd < 0)
indexEnd = telemetryDataSaub.Length - 1;
if (indexEnd == indexStart)
continue;
if (indexStart >= 0 && indexEnd >= indexStart)
{
var length = indexEnd - indexStart; var length = indexEnd - indexStart;
var subset = telemetryDataSaub.AsSpan(indexStart, length + 1); var subset = telemetryDataSaub.AsSpan(indexStart, length);
var stats = CalcStats(operation, subset); var stats = CalcStats(operation, subset);
result.AddRange(stats); result.AddRange(stats);
} }
else
{
indexStart = 0;
indexEnd = 0;
}
}
return result; return result;
} }