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 bdf13143..00000000
Binary files a/AsbCloudInfrastructure/Services/ProcessMapPlan/Templates/ProcessMapPlanDrillingTemplate.xlsx and /dev/null differ
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;