From f8496a503452f24346326b15cc450fffd1bb4c09 Mon Sep 17 00:00:00 2001 From: Olga Nemt Date: Mon, 17 Jul 2023 15:50:14 +0500 Subject: [PATCH 1/2] =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D1=80=D0=B0=D1=81=D1=87=D0=B5=D1=82=20=D0=B3?= =?UTF-8?q?=D0=BB=D1=83=D0=B1=D0=B8=D0=BD=D1=8B=20=D0=BD=D0=B0=20=D0=BA?= =?UTF-8?q?=D0=BE=D0=BD=D1=86=D0=B0=D1=85=20=D0=BE=D1=82=D1=80=D0=B5=D0=B7?= =?UTF-8?q?=D0=BA=D0=BE=D0=B2=20=D0=BF=D0=BE=20=D0=B4=D0=B0=D1=82=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SubsystemOperationTimeService.cs | 29 ++++++++++++++----- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeService.cs b/AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeService.cs index 64c5022e..19157e5f 100644 --- a/AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeService.cs +++ b/AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeService.cs @@ -76,7 +76,7 @@ namespace AsbCloudInfrastructure.Services.Subsystems { var begin = request.GtDate?.ToUtcDateTimeOffset(well.Timezone.Hours); var end = request.LtDate?.ToUtcDateTimeOffset(well.Timezone.Hours); - data = Trim(data, begin, end); + data = TrimOperation(data, begin, end); } var dtos = data.Select(o => Convert(o, well.Timezone.Hours)); @@ -109,21 +109,34 @@ namespace AsbCloudInfrastructure.Services.Subsystems return statList; } - private static IEnumerable Trim(IEnumerable data, DateTimeOffset? gtDate, DateTimeOffset? ltDate) + private static IEnumerable TrimOperation(IEnumerable data, DateTimeOffset? gtDate, DateTimeOffset? ltDate) { - var items = data.Select((item) => + if (!ltDate.HasValue && !gtDate.HasValue) return data; + + var items = data.Select((item) => { + var dateDiff = (ltDate!.Value - gtDate!.Value).TotalSeconds; + var depthDiff = (item.DepthEnd ?? 0) - (item.DepthStart ?? 0); + var a = depthDiff / (float)dateDiff; + var x = (float)(item.DateStart - gtDate.Value).TotalSeconds; + var b = item.DepthStart; + var cutDepth = a * x + b; + + var operationTime = item.Adapt(); + if (gtDate.HasValue && item.DateStart < gtDate.Value) { - item.DateStart = gtDate.Value; - item.DepthStart = null; + operationTime.DateStart = gtDate.Value; + operationTime.DepthStart = cutDepth; } if (ltDate.HasValue && item.DateEnd > ltDate.Value) { - item.DateEnd = ltDate.Value; - item.DepthEnd = null; + operationTime.DateEnd = ltDate.Value; + operationTime.DepthEnd = cutDepth; + + var test = data; } - return item; + return operationTime; }); return items; From 08b6f7d209722bc338d743ec5707c93e108db1d8 Mon Sep 17 00:00:00 2001 From: Olga Nemt Date: Mon, 17 Jul 2023 17:17:11 +0500 Subject: [PATCH 2/2] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SubsystemOperationTimeService.cs | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeService.cs b/AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeService.cs index 19157e5f..1faa769f 100644 --- a/AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeService.cs +++ b/AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeService.cs @@ -111,30 +111,31 @@ namespace AsbCloudInfrastructure.Services.Subsystems private static IEnumerable TrimOperation(IEnumerable data, DateTimeOffset? gtDate, DateTimeOffset? ltDate) { - if (!ltDate.HasValue && !gtDate.HasValue) return data; + if (!ltDate.HasValue && !gtDate.HasValue) + return data.Select(d => d.Adapt()); var items = data.Select((item) => { - var dateDiff = (ltDate!.Value - gtDate!.Value).TotalSeconds; - var depthDiff = (item.DepthEnd ?? 0) - (item.DepthStart ?? 0); - var a = depthDiff / (float)dateDiff; - var x = (float)(item.DateStart - gtDate.Value).TotalSeconds; - var b = item.DepthStart; - var cutDepth = a * x + b; - var operationTime = item.Adapt(); + if (!(item.DepthStart.HasValue && item.DepthEnd.HasValue)) + return operationTime; + + var dateDiff = (item.DateEnd - item.DateStart).TotalSeconds; + var depthDiff = item.DepthEnd.Value - item.DepthStart.Value; + var a = depthDiff / dateDiff; + var b = item.DepthStart.Value; if (gtDate.HasValue && item.DateStart < gtDate.Value) { operationTime.DateStart = gtDate.Value; - operationTime.DepthStart = cutDepth; + var x = (gtDate.Value - item.DateStart).TotalSeconds; + operationTime.DepthStart = (float)(a * x + b); } if (ltDate.HasValue && item.DateEnd > ltDate.Value) { operationTime.DateEnd = ltDate.Value; - operationTime.DepthEnd = cutDepth; - - var test = data; + var x = (ltDate.Value - item.DateStart).TotalSeconds; + operationTime.DepthEnd = (float)(a * x + b); } return operationTime; });