diff --git a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanFunctionsJarrDrillToolDto.cs b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanFunctionsJarrDrillToolDto.cs deleted file mode 100644 index 241f9ff3..00000000 --- a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanFunctionsJarrDrillToolDto.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace AsbCloudApp.Data.ProcessMaps; - -/// -/// РТК план встряхивание бурового инструмента -/// -public class ProcessMapPlanFunctionsJarrDrillToolDto : ProcessMapPlanBaseDto -{ - /// - /// Зенитный угол, градусы - /// - [Range(0.0, 100.0, ErrorMessage = "Зенитный угол, градусы, должно быть в пределах от 0 до 100")] - public double ZenithAngle { get; set; } - - /// - /// Складывание, м - /// - [Range(0.0, 20.0, ErrorMessage = "Складывание, м., должно быть в пределах от 0 до 20")] - public double Buckling { get; set; } - - /// - /// Примечание - /// - [StringLength(1024, ErrorMessage = "Примечание, должно быть не более 1024 символов")] - public string Note { get; set; } = string.Empty; -} \ No newline at end of file diff --git a/AsbCloudDb/Model/AsbCloudDbContext.cs b/AsbCloudDb/Model/AsbCloudDbContext.cs index e15bb310..ed28d6b5 100644 --- a/AsbCloudDb/Model/AsbCloudDbContext.cs +++ b/AsbCloudDb/Model/AsbCloudDbContext.cs @@ -35,7 +35,7 @@ namespace AsbCloudDb.Model public virtual DbSet ProcessMapPlanFunctionsShockTest => Set(); public virtual DbSet ProcessMapPlanFunctionsDamper => Set(); public virtual DbSet ProcessMapPlanFunctionsAutoHold => Set(); - public virtual DbSet ProcessMapPlanFunctionsJarrDrillTool => Set(); + public virtual DbSet ProcessMapPlanFunctionsJarrDrillTool => Set(); public virtual DbSet ProcessMapPlanFunctionsUpgradeNoload => Set(); public virtual DbSet ProcessMapPlanFunctionsOscillation => Set(); public virtual DbSet ProcessMapPlanFunctionsAnticrashRotation => Set(); @@ -538,7 +538,7 @@ namespace AsbCloudDb.Model .WithMany() .OnDelete(DeleteBehavior.Restrict); - modelBuilder.Entity() + modelBuilder.Entity() .HasOne(p => p.Author) .WithMany() .OnDelete(DeleteBehavior.Restrict); @@ -638,7 +638,7 @@ namespace AsbCloudDb.Model .WithMany() .OnDelete(DeleteBehavior.Restrict); - modelBuilder.Entity() + modelBuilder.Entity() .HasOne(p => p.Editor) .WithMany() .OnDelete(DeleteBehavior.Restrict); diff --git a/AsbCloudDb/Model/IAsbCloudDbContext.cs b/AsbCloudDb/Model/IAsbCloudDbContext.cs index e3cd4e21..b33c0f4f 100644 --- a/AsbCloudDb/Model/IAsbCloudDbContext.cs +++ b/AsbCloudDb/Model/IAsbCloudDbContext.cs @@ -96,7 +96,7 @@ namespace AsbCloudDb.Model DbSet ProcessMapPlanFunctionsShockTest { get; } DbSet ProcessMapPlanFunctionsDamper { get; } DbSet ProcessMapPlanFunctionsAutoHold { get; } - DbSet ProcessMapPlanFunctionsJarrDrillTool { get; } + DbSet ProcessMapPlanFunctionsJarrDrillTool { get; } DbSet ProcessMapPlanFunctionsUpgradeNoload { get; } DbSet ProcessMapPlanFunctionsOscillation { get; } DbSet ProcessMapPlanFunctionsAnticrashRotation { get; } diff --git a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanFunctionsJarrDrillTool.cs b/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanRotorRpmAcceleration.cs similarity index 71% rename from AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanFunctionsJarrDrillTool.cs rename to AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanRotorRpmAcceleration.cs index a3b9f512..856fc3b8 100644 --- a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanFunctionsJarrDrillTool.cs +++ b/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanRotorRpmAcceleration.cs @@ -5,8 +5,8 @@ using Microsoft.EntityFrameworkCore; namespace AsbCloudDb.Model.ProcessMaps; -[Table("t_process_map_plan_functions_jarr_drill_tool"), Comment("Встряхивание бурового инструмента")] -public class ProcessMapPlanFunctionsJarrDrillTool : ProcessMapPlanBase +[Table("t_process_map_plan_rotor_rpm_acceleration"), Comment("Выход на обороты перед ротором")] +public class ProcessMapPlanRotorRpmAcceleration : ProcessMapPlanBase { [Column("zenit_angle"), Comment("Зенитный угол, градусы")] [Range(0.0, 100.0)] @@ -22,5 +22,5 @@ public class ProcessMapPlanFunctionsJarrDrillTool : ProcessMapPlanBase public string Note { get; set; } = string.Empty; [ForeignKey(nameof(IdPrevious))] - public virtual ProcessMapPlanFunctionsJarrDrillTool? Previous { get; set; } + public virtual ProcessMapPlanRotorRpmAcceleration? Previous { get; set; } } \ No newline at end of file diff --git a/AsbCloudInfrastructure/DependencyInjection.cs b/AsbCloudInfrastructure/DependencyInjection.cs index 7500d2d3..5201ae94 100644 --- a/AsbCloudInfrastructure/DependencyInjection.cs +++ b/AsbCloudInfrastructure/DependencyInjection.cs @@ -237,11 +237,11 @@ namespace AsbCloudInfrastructure Item = src.Adapt() }); - TypeAdapterConfig>.NewConfig() - .Include>() - .Map(dest => dest, src => new ChangeLogDto() + TypeAdapterConfig>.NewConfig() + .Include>() + .Map(dest => dest, src => new ChangeLogDto() { - Item = src.Adapt() + Item = src.Adapt() }); TypeAdapterConfig>.NewConfig() @@ -442,7 +442,7 @@ namespace AsbCloudInfrastructure services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -468,7 +468,7 @@ namespace AsbCloudInfrastructure services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -547,8 +547,8 @@ namespace AsbCloudInfrastructure ProcessMapPlanBaseRepository>(); services.AddTransient< - IChangeLogRepository, - ProcessMapPlanBaseRepository>(); + IChangeLogRepository, + ProcessMapPlanBaseRepository>(); services.AddTransient< IChangeLogRepository, @@ -581,7 +581,7 @@ namespace AsbCloudInfrastructure services.AddTransient>(); services.AddTransient>(); services.AddTransient>(); - services.AddTransient>(); + services.AddTransient>(); services.AddTransient>(); services.AddTransient>(); services.AddTransient>(); diff --git a/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanFunctionsJarrDrillToolTemplate.cs b/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanFunctionsJarrDrillToolTemplate.cs deleted file mode 100644 index e675d8a4..00000000 --- a/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanFunctionsJarrDrillToolTemplate.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Collections.Generic; - -namespace AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates; - -public class ProcessMapPlanFunctionsJarrDrillToolTemplate : ITemplateParameters -{ - public string SheetName => "Встряхивание бурового инструмента"; - - public int HeaderRowsCount => 2; - - public string FileName => "ProcessMapPlanFunctionsJarrDrillToolTemplate.xlsx"; - - public IDictionary Cells => new Dictionary - { - - }; -} \ No newline at end of file diff --git a/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanRotorRpmAccelerationTemplate.cs b/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanRotorRpmAccelerationTemplate.cs new file mode 100644 index 00000000..d36bd7a6 --- /dev/null +++ b/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanRotorRpmAccelerationTemplate.cs @@ -0,0 +1,17 @@ +using System.Collections.Generic; + +namespace AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates; + +public class ProcessMapPlanRotorRpmAccelerationTemplate : ITemplateParameters +{ + public string SheetName => "Выход на обороты перед ротором"; + + public int HeaderRowsCount => 2; + + public string FileName => "ProcessMapPlanRotorRpmAccelerationTemplate.xlsx"; + + public IDictionary Cells => new Dictionary + { + + }; +} \ No newline at end of file diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanFunctionsJarrDrillToolExportService.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanRotorRpmAccelerationExportService.cs similarity index 62% rename from AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanFunctionsJarrDrillToolExportService.cs rename to AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanRotorRpmAccelerationExportService.cs index 169f00b1..2f9e8644 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanFunctionsJarrDrillToolExportService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanRotorRpmAccelerationExportService.cs @@ -10,21 +10,21 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Services.ProcessMapPlan.Export; -public class ProcessMapPlanFunctionsJarrDrillToolExportService : ProcessMapPlanExportService +public class ProcessMapPlanRotorRpmAccelerationExportService : ProcessMapPlanExportService { - public ProcessMapPlanFunctionsJarrDrillToolExportService( - IChangeLogRepository processMapPlanRepository, + public ProcessMapPlanRotorRpmAccelerationExportService( + IChangeLogRepository processMapPlanRepository, IWellService wellService) : base(processMapPlanRepository, wellService) { } - protected override ITemplateParameters TemplateParameters { get; } = new ProcessMapPlanFunctionsJarrDrillToolTemplate(); + protected override ITemplateParameters TemplateParameters { get; } = new ProcessMapPlanRotorRpmAccelerationTemplate(); protected override async Task BuildFileNameAsync(WellRelatedExportRequest options, CancellationToken token) { var caption = await wellService.GetWellCaptionByIdAsync(options.IdWell, token); - return $"{caption}_РТК_План_встряхивание_бурового_инструмента.xlsx"; + return $"{caption}_РТК_План_выход_на_обороты_перед_ротором.xlsx"; } } \ No newline at end of file diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanFunctionsJarrDrillToolParser.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanRotorRpmAccelerationParser.cs similarity index 72% rename from AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanFunctionsJarrDrillToolParser.cs rename to AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanRotorRpmAccelerationParser.cs index 53c7e831..3a7bbbc9 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanFunctionsJarrDrillToolParser.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanRotorRpmAccelerationParser.cs @@ -9,16 +9,16 @@ using AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemp namespace AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; -public class ProcessMapPlanFunctionsJarrDrillToolParser : ProcessMapPlanParser +public class ProcessMapPlanRotorRpmAccelerationParser : ProcessMapPlanParser { - public ProcessMapPlanFunctionsJarrDrillToolParser(IWellOperationRepository wellOperationRepository) + public ProcessMapPlanRotorRpmAccelerationParser(IWellOperationRepository wellOperationRepository) : base(wellOperationRepository) { } - protected override ITemplateParameters TemplateParameters => new ProcessMapPlanFunctionsJarrDrillToolTemplate(); + protected override ITemplateParameters TemplateParameters => new ProcessMapPlanRotorRpmAccelerationTemplate(); - protected override ProcessMapPlanFunctionsJarrDrillToolDto BuildDto(IDictionary row, int rowNumber) + protected override RotorRpmAccelerationDto BuildDto(IDictionary row, int rowNumber) { var dto = base.BuildDto(row, rowNumber); diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanFunctionsJarrDrillToolControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanRotorRpmAccelerationControllerTest.cs similarity index 56% rename from AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanFunctionsJarrDrillToolControllerTest.cs rename to AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanRotorRpmAccelerationControllerTest.cs index b9745f7d..cc43a2f0 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanFunctionsJarrDrillToolControllerTest.cs +++ b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanRotorRpmAccelerationControllerTest.cs @@ -10,18 +10,18 @@ using AsbCloudWebApi.IntegrationTests; using Microsoft.EntityFrameworkCore; using Xunit; -namespace AsbCloudWebApi.Controllers.ProcessMaps; +namespace AsbCloudWebApi.IntegrationTests.Controllers.ProcessMapPlan.Operations; /// /// РТК план встряхивание бурового инструмента /// -public class ProcessMapPlanFunctionsJarrDrillToolControllerTest : - ProcessMapPlanBaseControllerTest +public class ProcessMapPlanRotorRpmAccelerationControllerTest : + ProcessMapPlanBaseControllerTest { - public ProcessMapPlanFunctionsJarrDrillToolControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanFunctionsJarrDrillTool") + public ProcessMapPlanRotorRpmAccelerationControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanFunctionsJarrDrillTool") { } - private readonly ProcessMapPlanFunctionsJarrDrillToolDto dto = new ProcessMapPlanFunctionsJarrDrillToolDto() + private readonly RotorRpmAccelerationDto dto = new RotorRpmAccelerationDto() { IdWell = 1, DepthStart = 1, @@ -33,7 +33,7 @@ public class ProcessMapPlanFunctionsJarrDrillToolControllerTest : ZenithAngle = 1, }; - private readonly ProcessMapPlanFunctionsJarrDrillTool entity = new ProcessMapPlanFunctionsJarrDrillTool() + private readonly ProcessMapPlanRotorRpmAcceleration entity = new ProcessMapPlanRotorRpmAcceleration() { IdWell = 1, DepthEnd = 10, @@ -54,17 +54,17 @@ public class ProcessMapPlanFunctionsJarrDrillToolControllerTest : await Get(entity, dto); } - protected override ProcessMapPlanFunctionsJarrDrillTool GetByNote(DbSet dbSet, ProcessMapPlanFunctionsJarrDrillToolDto dto) + protected override ProcessMapPlanRotorRpmAcceleration GetByNote(DbSet dbSet, RotorRpmAccelerationDto dto) { throw new NotImplementedException(); } - protected override ProcessMapPlanFunctionsJarrDrillToolDto GetByNote(IEnumerable dtos, ProcessMapPlanFunctionsJarrDrillToolDto dto) + protected override RotorRpmAccelerationDto GetByNote(IEnumerable dtos, RotorRpmAccelerationDto dto) { throw new NotImplementedException(); } - protected override ProcessMapPlanFunctionsJarrDrillTool? GetByWellId() + protected override ProcessMapPlanRotorRpmAcceleration? GetByWellId() { throw new NotImplementedException(); } diff --git a/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanReamingSlideController.cs b/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanReamingSlideController.cs similarity index 90% rename from AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanReamingSlideController.cs rename to AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanReamingSlideController.cs index 2883b939..d440b854 100644 --- a/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanReamingSlideController.cs +++ b/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanReamingSlideController.cs @@ -6,12 +6,12 @@ using AsbCloudDb.Model.ProcessMaps; using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; -namespace AsbCloudWebApi.Controllers.ProcessMaps; +namespace AsbCloudWebApi.Controllers.ProcessMaps.Operations; /// /// РТК план проработка для слайда /// -public class ProcessMapPlanReamingSlideController : +public class ProcessMapPlanReamingSlideController : ProcessMapPlanBaseController { public ProcessMapPlanReamingSlideController( diff --git a/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanRotorRpmAccelerationController.cs b/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanRotorRpmAccelerationController.cs new file mode 100644 index 00000000..23bb6c09 --- /dev/null +++ b/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanRotorRpmAccelerationController.cs @@ -0,0 +1,28 @@ +using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Repositories; +using AsbCloudApp.Requests; +using AsbCloudApp.Services; +using AsbCloudDb.Model.ProcessMaps; +using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; +using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; + +namespace AsbCloudWebApi.Controllers.ProcessMaps.Operations; + +/// +/// РТК план выход на обороты перед ротором +/// +public class ProcessMapPlanRotorRpmAccelerationController : + ProcessMapPlanBaseController +{ + public ProcessMapPlanRotorRpmAccelerationController( + IChangeLogRepository repository, + IWellService wellService, + ProcessMapPlanRotorRpmAccelerationParser parserService, + ITelemetryService telemetryService, + ProcessMapPlanRotorRpmAccelerationExportService processMapPlanExportService) + : base(repository, wellService, parserService, processMapPlanExportService, telemetryService) + { + } + + protected override string TemplateFileName => "ЕЦП_шаблон_файла_РТК_план_выход_на_обороты_перед_ротором.xlsx"; +} \ No newline at end of file diff --git a/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanFunctionsJarrDrillToolController.cs b/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanFunctionsJarrDrillToolController.cs deleted file mode 100644 index 706c0ae2..00000000 --- a/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanFunctionsJarrDrillToolController.cs +++ /dev/null @@ -1,28 +0,0 @@ -using AsbCloudApp.Data.ProcessMaps; -using AsbCloudApp.Repositories; -using AsbCloudApp.Requests; -using AsbCloudApp.Services; -using AsbCloudDb.Model.ProcessMaps; -using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; -using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; - -namespace AsbCloudWebApi.Controllers.ProcessMaps; - -/// -/// РТК план встряхивание бурового инструмента -/// -public class ProcessMapPlanFunctionsJarrDrillToolController : - ProcessMapPlanBaseController -{ - public ProcessMapPlanFunctionsJarrDrillToolController( - IChangeLogRepository repository, - IWellService wellService, - ProcessMapPlanFunctionsJarrDrillToolParser parserService, - ITelemetryService telemetryService, - ProcessMapPlanFunctionsJarrDrillToolExportService processMapPlanExportService) - : base(repository, wellService, parserService, processMapPlanExportService, telemetryService) - { - } - - protected override string TemplateFileName => "ЕЦП_шаблон_файла_РТК_план_встряхивание_бурового_инструмента.xlsx"; -} \ No newline at end of file