diff --git a/AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeService.cs b/AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeService.cs index 45b4c3fd..4be75fa6 100644 --- a/AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeService.cs +++ b/AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeService.cs @@ -107,7 +107,7 @@ namespace AsbCloudInfrastructure.Services.Subsystems return null; var depthInterval = GetDepthInterval(detectedOperations); - var statList = CalcStat(data,depthInterval, request); + var statList = CalcStat(data,depthInterval); return statList; } @@ -118,9 +118,11 @@ namespace AsbCloudInfrastructure.Services.Subsystems if (data is null) return Enumerable.Empty(); - var dateRanges = new List(); - dateRanges.Add(data.Min(d => d.DateStart)); - dateRanges.Add(data.Max(d => d.DateEnd)); + var dateRanges = new List + { + data.Min(d => d.DateStart), + data.Max(d => d.DateEnd) + }; return dateRanges.AsEnumerable(); } @@ -161,8 +163,7 @@ namespace AsbCloudInfrastructure.Services.Subsystems private IEnumerable CalcStat( IEnumerable dtos, - (double depthIntervalRotor, double depthIntervalSlide) depthInterval, - SubsystemOperationTimeRequest? request = null) + (double depthIntervalRotor, double depthIntervalSlide) depthInterval) { var groupedDataSubsystems = dtos .OrderBy(o => o.Id) @@ -172,7 +173,6 @@ namespace AsbCloudInfrastructure.Services.Subsystems var result = groupedDataSubsystems.Select(g => { var depthIntervalSubsystem = GetDepthIntervalSubsystem(g.Key, depthInterval); - //var depthIntervalSubsystem = CalcInterval(request?.GtDepth, request?.LtDepth, g); var periodGroup = g.Sum(o => (o.DateEnd - o.DateStart).TotalHours); var periodGroupDepth = g.Sum(o => o.DepthEnd - o.DepthStart); var subsystemStat = new SubsystemStatDto() @@ -183,7 +183,6 @@ namespace AsbCloudInfrastructure.Services.Subsystems //% использования = суммарная проходка АПД в слайде /// суммарную проходку автоопределенных операций в слайде. KUsage = periodGroupDepth / depthIntervalSubsystem, - //KUsage = depthIntervalSubsystem / ((request?.LtDepth ?? 0) - (request?.GtDepth ?? 0)), SumDepthInterval = periodGroupDepth, OperationCount = g.Count(), }; @@ -210,33 +209,6 @@ namespace AsbCloudInfrastructure.Services.Subsystems return result; } - private double CalcInterval(double? gtDepth, double? ltDepth, IGrouping g) - { - var operations = g.ToList(); - double sum = 0; - foreach(var operation in operations) - { - var start = operation.DepthStart; - if(gtDepth.HasValue) - { - if (operation.DepthStart < gtDepth) - { - start = (double)gtDepth; - } - } - var end = operation.DepthEnd; - if (ltDepth.HasValue) - { - if (operation.DepthEnd > ltDepth) - { - start = (double)ltDepth; - } - } - sum += (end - start); - } - return sum; - } - private static (double depthIntervalRotor, double depthIntervalSlide) GetDepthInterval (IEnumerable detectedOperations) { var depthIntervalRotor = detectedOperations.Where(o => o.IdCategory == WellOperationCategory.IdRotor)