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

Merge pull request 'Фикс сервиса автоопределения операций' (#296) from fix/detected_operations into dev

Browse Source 
Reviewed-on: https://test.digitaldrilling.ru:8443/DDrilling/AsbCloudServer/pulls/296
This commit is contained in:
Никита Фролов 2024-07-29 13:08:17 +05:00
commit d999d14c04
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
AsbCloudInfrastructure/Services/DetectOperations/DetectedOperationService.cs
View File

@ -195,13 +195,6 @@ public class DetectedOperationService : IDetectedOperationService
var timeZone = telemetryService.GetTimezone(idTelemetry); var timeZone = telemetryService.GetTimezone(idTelemetry);
if (telemetries.Count() <= gap)
{
var lastTelemetry = telemetries.Last();
var lastDateTelemetry = new DateTimeOffset(lastTelemetry.DateTime, timeZone.Offset);
return (lastDateTelemetry, Enumerable.Empty<DetectedOperationDto>());
}
var detectedOperations = new List<DetectedOperationDto>(); var detectedOperations = new List<DetectedOperationDto>();
var detectableTelemetries = telemetries var detectableTelemetries = telemetries
@ -220,6 +213,13 @@ public class DetectedOperationService : IDetectedOperationService
AxialLoad = t.AxialLoad, AxialLoad = t.AxialLoad,
}).ToArray(); }).ToArray();
if (detectableTelemetries.Length <= gap)
{
var lastTelemetry = telemetries.Last();
var lastDateTelemetry = new DateTimeOffset(lastTelemetry.DateTime, timeZone.Offset);
return (lastDateTelemetry, Enumerable.Empty<DetectedOperationDto>());
}
var positionBegin = 0; var positionBegin = 0;
var positionEnd = detectableTelemetries.Length - gap; var positionEnd = detectableTelemetries.Length - gap;
@ -238,8 +238,9 @@ public class DetectedOperationService : IDetectedOperationService
} }
var point0 = detectableTelemetries[positionBegin]; var point0 = detectableTelemetries[positionBegin];
while (positionBegin < positionEnd && IsChangingTelemetryInterval(point0, detectableTelemetries[++positionBegin]))
; while (positionBegin < positionEnd && IsChangingTelemetryInterval(point0, detectableTelemetries[positionBegin]))
positionBegin++;
} }
return (detectableTelemetries[positionBegin].DateTime, detectedOperations); return (detectableTelemetries[positionBegin].DateTime, detectedOperations);