From 17aef5b619b689893c42545d756d242d9b6a7df9 Mon Sep 17 00:00:00 2001 From: Olga Nemt Date: Fri, 21 Jun 2024 17:22:29 +0500 Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=BF?= =?UTF-8?q?=D0=BE=20=D1=80=D0=B5=D0=B7=D1=83=D0=BB=D1=8C=D1=82=D0=B0=D1=82?= =?UTF-8?q?=D0=B0=D0=BC=20=D1=80=D0=B5=D0=B2=D1=8C=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcessMaps/ProcessMapPlanRotorDto.cs | 3 +- .../ProcessMaps/ProcessMapPlanSlideDto.cs | 5 +-- .../AsbCloudInfrastructure.csproj | 1 - .../ProcessMapPlanRotorExportService.cs | 10 +---- .../ProcessMapPlanSlideExportService.cs | 38 +++++++----------- .../Parser/ProcessMapPlanParser.cs | 8 ---- .../ProcessMapPlanDrillingTemplate.xlsx | Bin 12611 -> 0 bytes .../Report/ProcessMapReportDrillingService.cs | 38 +++++++++--------- 8 files changed, 37 insertions(+), 66 deletions(-) delete mode 100644 AsbCloudInfrastructure/Services/ProcessMapPlan/Templates/ProcessMapPlanDrillingTemplate.xlsx diff --git a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanRotorDto.cs b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanRotorDto.cs index 8bf03499..eb3640dd 100644 --- a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanRotorDto.cs +++ b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanRotorDto.cs @@ -1,10 +1,9 @@ using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; namespace AsbCloudApp.Data.ProcessMaps; /// -/// РТК план бурение скважины +/// РТК план бурение скважины в роторе /// public class ProcessMapPlanRotorDto : ProcessMapPlanBaseDto { diff --git a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanSlideDto.cs b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanSlideDto.cs index 30fb40e0..617b5f46 100644 --- a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanSlideDto.cs +++ b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanSlideDto.cs @@ -1,10 +1,9 @@ using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; namespace AsbCloudApp.Data.ProcessMaps; /// -/// РТК план бурение скважины +/// РТК план бурение скважины в слайде /// public class ProcessMapPlanSlideDto : ProcessMapPlanBaseDto { @@ -72,5 +71,5 @@ public class ProcessMapPlanSlideDto : ProcessMapPlanBaseDto /// Примечание /// [StringLength(1024, ErrorMessage = "Примечание, не должно превышать 1024 символов")] - public string Note { get; set; } = string.Empty; + public string Note { get; set; } = string.Empty; } \ No newline at end of file diff --git a/AsbCloudInfrastructure/AsbCloudInfrastructure.csproj b/AsbCloudInfrastructure/AsbCloudInfrastructure.csproj index e0fe894d..563b41f5 100644 --- a/AsbCloudInfrastructure/AsbCloudInfrastructure.csproj +++ b/AsbCloudInfrastructure/AsbCloudInfrastructure.csproj @@ -41,7 +41,6 @@ - diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanRotorExportService.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanRotorExportService.cs index 5ed191f8..ce6560d6 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanRotorExportService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanRotorExportService.cs @@ -5,7 +5,6 @@ using AsbCloudApp.Requests.ExportOptions; using AsbCloudApp.Services; using AsbCloudInfrastructure.Services.ExcelServices.Templates; using AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates; -using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; @@ -20,7 +19,7 @@ public class ProcessMapPlanRotorExportService : ProcessMapPlanExportService new ProcessMapPlanRotorTemplate(); + protected override ITemplateParameters TemplateParameters { get; } = new ProcessMapPlanRotorTemplate(); protected override async Task BuildFileNameAsync(WellRelatedExportRequest options, CancellationToken token) { @@ -28,11 +27,4 @@ public class ProcessMapPlanRotorExportService : ProcessMapPlanExportService> GetDtosAsync(WellRelatedExportRequest options, - CancellationToken token) - { - var dtos = await base.GetDtosAsync(options, token); - return dtos; - } } \ No newline at end of file diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanSlideExportService.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanSlideExportService.cs index d308aba0..c6c2fdfe 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanSlideExportService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanSlideExportService.cs @@ -1,8 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; using AsbCloudApp.Data.ProcessMaps; using AsbCloudApp.Repositories; using AsbCloudApp.Requests; @@ -10,31 +5,26 @@ using AsbCloudApp.Requests.ExportOptions; using AsbCloudApp.Services; using AsbCloudInfrastructure.Services.ExcelServices.Templates; using AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates; +using System.Threading; +using System.Threading.Tasks; namespace AsbCloudInfrastructure.Services.ProcessMapPlan.Export; public class ProcessMapPlanSlideExportService : ProcessMapPlanExportService { - public ProcessMapPlanSlideExportService( - IChangeLogRepository processMapPlanRepository, - IWellService wellService) - : base(processMapPlanRepository, wellService) - { - } + public ProcessMapPlanSlideExportService( + IChangeLogRepository processMapPlanRepository, + IWellService wellService) + : base(processMapPlanRepository, wellService) + { + } - protected override ITemplateParameters TemplateParameters => new ProcessMapPlanSlideTemplate(); + protected override ITemplateParameters TemplateParameters { get; } = new ProcessMapPlanSlideTemplate(); - protected override async Task BuildFileNameAsync(WellRelatedExportRequest options, CancellationToken token) - { - var caption = await wellService.GetWellCaptionByIdAsync(options.IdWell, token); + protected override async Task BuildFileNameAsync(WellRelatedExportRequest options, CancellationToken token) + { + var caption = await wellService.GetWellCaptionByIdAsync(options.IdWell, token); - return $"{caption}_РТК_План_бурение_слайд.xlsx"; - } - - protected override async Task> GetDtosAsync(WellRelatedExportRequest options, - CancellationToken token) - { - var dtos = await base.GetDtosAsync(options, token); - return dtos; - } + return $"{caption}_РТК_План_бурение_слайд.xlsx"; + } } \ No newline at end of file diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanParser.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanParser.cs index 333e39a2..89fbd5b7 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanParser.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanParser.cs @@ -27,12 +27,4 @@ public abstract class ProcessMapPlanParser : ParserExcelService - modeName?.Trim().ToLower() switch - { - "ротор" => 1, - "слайд" => 2, - _ => null - }; } \ No newline at end of file diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Templates/ProcessMapPlanDrillingTemplate.xlsx b/AsbCloudInfrastructure/Services/ProcessMapPlan/Templates/ProcessMapPlanDrillingTemplate.xlsx deleted file mode 100644 index bdf13143446f1d64a808c157f915d943dcf5d610..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12611 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 diff --git a/AsbCloudInfrastructure/Services/ProcessMaps/Report/ProcessMapReportDrillingService.cs b/AsbCloudInfrastructure/Services/ProcessMaps/Report/ProcessMapReportDrillingService.cs index 520b282d..4a0e6c89 100644 --- a/AsbCloudInfrastructure/Services/ProcessMaps/Report/ProcessMapReportDrillingService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMaps/Report/ProcessMapReportDrillingService.cs @@ -272,28 +272,28 @@ public class ProcessMapReportDrillingService : IProcessMapReportDrillingService if(processMapPlanFilteredByDepth is ProcessMapPlanRotorDto processMapPlanRotorFilteredByDepth) { - result.PressureDiff.SetpointPlan = processMapPlanRotorFilteredByDepth?.DifferentialPressure; - result.PressureDiff.Limit = processMapPlanRotorFilteredByDepth?.DifferentialPressureLimitMax; - result.AxialLoad.SetpointPlan = processMapPlanRotorFilteredByDepth?.WeightOnBit; - result.AxialLoad.Limit = processMapPlanRotorFilteredByDepth?.WeightOnBitLimitMax; - result.TopDriveTorque.SetpointPlan = processMapPlanRotorFilteredByDepth?.TopDriveTorque; - result.TopDriveTorque.Limit = processMapPlanRotorFilteredByDepth?.TopDriveTorqueLimit; - result.SpeedLimit.SetpointPlan = processMapPlanRotorFilteredByDepth?.RopLimitMax; - result.TopDriveSpeed.SetpointPlan = processMapPlanRotorFilteredByDepth?.RevolutionsPerMinute; - result.Flow.SetpointPlan = processMapPlanRotorFilteredByDepth?.FlowRate; - result.Flow.Limit = processMapPlanRotorFilteredByDepth?.FlowRateLimitMax; - result.Rop.Plan = processMapPlanRotorFilteredByDepth?.RopLimitMax; + result.PressureDiff.SetpointPlan = processMapPlanRotorFilteredByDepth.DifferentialPressure; + result.PressureDiff.Limit = processMapPlanRotorFilteredByDepth.DifferentialPressureLimitMax; + result.AxialLoad.SetpointPlan = processMapPlanRotorFilteredByDepth.WeightOnBit; + result.AxialLoad.Limit = processMapPlanRotorFilteredByDepth.WeightOnBitLimitMax; + result.TopDriveTorque.SetpointPlan = processMapPlanRotorFilteredByDepth.TopDriveTorque; + result.TopDriveTorque.Limit = processMapPlanRotorFilteredByDepth.TopDriveTorqueLimit; + result.SpeedLimit.SetpointPlan = processMapPlanRotorFilteredByDepth.RopLimitMax; + result.TopDriveSpeed.SetpointPlan = processMapPlanRotorFilteredByDepth.RevolutionsPerMinute; + result.Flow.SetpointPlan = processMapPlanRotorFilteredByDepth.FlowRate; + result.Flow.Limit = processMapPlanRotorFilteredByDepth.FlowRateLimitMax; + result.Rop.Plan = processMapPlanRotorFilteredByDepth.RopLimitMax; } if (processMapPlanFilteredByDepth is ProcessMapPlanSlideDto processMapPlanSlideFilteredByDepth) { - result.PressureDiff.SetpointPlan = processMapPlanSlideFilteredByDepth?.DifferentialPressure; - result.PressureDiff.Limit = processMapPlanSlideFilteredByDepth?.DifferentialPressureLimitMax; - result.AxialLoad.SetpointPlan = processMapPlanSlideFilteredByDepth?.WeightOnBit; - result.AxialLoad.Limit = processMapPlanSlideFilteredByDepth?.WeightOnBitLimitMax; - result.SpeedLimit.SetpointPlan = processMapPlanSlideFilteredByDepth?.RopLimitMax; - result.Flow.SetpointPlan = processMapPlanSlideFilteredByDepth?.FlowRate; - result.Flow.Limit = processMapPlanSlideFilteredByDepth?.FlowRateLimitMax; - result.Rop.Plan = processMapPlanSlideFilteredByDepth?.RopLimitMax; + result.PressureDiff.SetpointPlan = processMapPlanSlideFilteredByDepth.DifferentialPressure; + result.PressureDiff.Limit = processMapPlanSlideFilteredByDepth.DifferentialPressureLimitMax; + result.AxialLoad.SetpointPlan = processMapPlanSlideFilteredByDepth.WeightOnBit; + result.AxialLoad.Limit = processMapPlanSlideFilteredByDepth.WeightOnBitLimitMax; + result.SpeedLimit.SetpointPlan = processMapPlanSlideFilteredByDepth.RopLimitMax; + result.Flow.SetpointPlan = processMapPlanSlideFilteredByDepth.FlowRate; + result.Flow.Limit = processMapPlanSlideFilteredByDepth.FlowRateLimitMax; + result.Rop.Plan = processMapPlanSlideFilteredByDepth.RopLimitMax; } return result;