diff --git a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanOperationPositioningOffTheBottomDto.cs b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanOperationPositioningOffTheBottomDto.cs deleted file mode 100644 index 0cd04f5c..00000000 --- a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanOperationPositioningOffTheBottomDto.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace AsbCloudApp.Data.ProcessMaps; - -/// -/// РТК план позиционирования над забоем -/// -public class ProcessMapPlanOperationPositioningOffTheBottomDto : ProcessMapPlanBaseDto -{ - /// - /// Остановка над забоем, м - /// - [Range(0.0, 30.0, ErrorMessage = "Остановка над забоем, м., должно быть в пределах от 0 до 30")] - public double StopOffTheBottom { get; set; } -} \ No newline at end of file diff --git a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanTFOrientationDto.cs b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanTFOrientationDto.cs new file mode 100644 index 00000000..24ab00da --- /dev/null +++ b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanTFOrientationDto.cs @@ -0,0 +1,93 @@ +using System.ComponentModel.DataAnnotations; + +namespace AsbCloudApp.Data.ProcessMaps; + +/// +/// РТК план выставление +/// +public class ProcessMapPlanTFOrientationDto : ProcessMapPlanBaseDto +{ + /// + /// Задание TF, град. + /// + [Range(0.0, 360.0, ErrorMessage = "Задание TF, град., должно быть в пределах от 0 до 360")] + public double TFSetpoint { get; set; } + + /// + /// Пружина, град. + /// + [Range(0.0, 10000.0, ErrorMessage = "Пружина, град., должно быть в пределах от 0 до 10000")] + public double Spring { get; set; } + + /// + /// Максимальное давление, атм. + /// + [Range(0.0, 400.0, ErrorMessage = "Максимальное давление, атм., должно быть в пределах от 0 до 400")] + public double PressureMax { get; set; } + + /// + /// Перепад давления, атм. + /// + [Range(0.0, 60.0, ErrorMessage = "Перепад давления, атм., должно быть в пределах от 0 до 60")] + public double DifferentialPressure { get; set; } + + /// + /// Затяжка, т. + /// + [Range(0.0, 20.0, ErrorMessage = "Затяжка, т., должно быть в пределах от 0 до 20")] + public double Tight { get; set; } + + /// + /// Посадка, т. + /// + [Range(0.0, 20.0, ErrorMessage = "Посадка, т., должно быть в пределах от 0 до 20")] + public double SlackingOff { get; set; } + + /// + /// Максимально допустимый момент, кН*м. + /// + [Range(0.0, 35.0, ErrorMessage = "Максимально допустимый момент, кН*м., должно быть в пределах от 0 до 35")] + public double TorqueMax { get; set; } + + /// + /// Количество расхаживаний, шт. + /// + [Range(0.0, 99.0, ErrorMessage = "Количество расхаживаний, шт., должно быть в пределах от 0 до 99")] + public int RepetitionsCount { get; set; } + + /// + /// Скорость вверх, м/ч. + /// + [Range(0.0, 999.0, ErrorMessage = "Скорость вверх, м/ч., должно быть в пределах от 0 до 999")] + public double RopUp { get; set; } + + /// + /// Скорость вниз, м/ч. + /// + [Range(0.0, 999.0, ErrorMessage = "Скорость вниз, м/ч., должно быть в пределах от 0 до 999")] + public double RopDown { get; set; } + + /// + /// Расход вверх, л/с. + /// + [Range(0.0, 100.0, ErrorMessage = "Расход вверх, л/с., должно быть в пределах от 0 до 100")] + public double FlowRateUp { get; set; } + + /// + /// Расход вниз, л/с. + /// + [Range(0.0, 100.0, ErrorMessage = "Расход вниз, л/с., должно быть в пределах от 0 до 100")] + public double FlowRateDown { get; set; } + + /// + /// Интервал расхаживания, м. + /// + [Range(0.0, 30.0, ErrorMessage = "Интервал расхаживания, м., должно быть в пределах от 0 до 30")] + public double Interval { get; set; } + + /// + /// Остановка над забоем, м. + /// + [Range(0.0, 10.0, ErrorMessage = "Остановка над забоем, м., должно быть в пределах от 0 до 10")] + public double StopPointOffBottom { get; set; } +} \ No newline at end of file diff --git a/AsbCloudDb/Model/AsbCloudDbContext.cs b/AsbCloudDb/Model/AsbCloudDbContext.cs index a52f8a02..cac346ad 100644 --- a/AsbCloudDb/Model/AsbCloudDbContext.cs +++ b/AsbCloudDb/Model/AsbCloudDbContext.cs @@ -26,7 +26,7 @@ namespace AsbCloudDb.Model public virtual DbSet ProcessMapPlanOperationReamingSlide => Set(); public virtual DbSet ProcessMapPlanOperationLoadCapacity => Set(); public virtual DbSet ProcessMapPlanSurvey => Set(); - public virtual DbSet ProcessMapPlanOperationPositioningOffTheBottom => Set(); + public virtual DbSet ProcessMapPlanOperationPositioningOffTheBottom => Set(); public virtual DbSet ProcessMapPlanOperationDeterminationOfOscillationAngles => Set(); public virtual DbSet ProcessMapPlanOperationTFOrientation => Set(); public virtual DbSet ProcessMapPlanOperationSwitchPump => Set(); @@ -493,7 +493,7 @@ namespace AsbCloudDb.Model .WithMany() .OnDelete(DeleteBehavior.Restrict); - modelBuilder.Entity() + modelBuilder.Entity() .HasOne(p => p.Author) .WithMany() .OnDelete(DeleteBehavior.Restrict); @@ -593,7 +593,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 4b4e6bb8..8e612025 100644 --- a/AsbCloudDb/Model/IAsbCloudDbContext.cs +++ b/AsbCloudDb/Model/IAsbCloudDbContext.cs @@ -87,7 +87,7 @@ namespace AsbCloudDb.Model DbSet ProcessMapPlanOperationReamingSlide { get; } DbSet ProcessMapPlanOperationLoadCapacity { get; } DbSet ProcessMapPlanSurvey { get; } - DbSet ProcessMapPlanOperationPositioningOffTheBottom { get; } + DbSet ProcessMapPlanOperationPositioningOffTheBottom { get; } DbSet ProcessMapPlanOperationDeterminationOfOscillationAngles { get; } DbSet ProcessMapPlanOperationTFOrientation { get; } DbSet ProcessMapPlanOperationSwitchPump { get; } diff --git a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanOperationPositioningOffTheBottom.cs b/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanPositioningOffTheBottom.cs similarity index 59% rename from AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanOperationPositioningOffTheBottom.cs rename to AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanPositioningOffTheBottom.cs index 424cac69..2adcaef7 100644 --- a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanOperationPositioningOffTheBottom.cs +++ b/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanPositioningOffTheBottom.cs @@ -5,8 +5,8 @@ using Microsoft.EntityFrameworkCore; namespace AsbCloudDb.Model.ProcessMaps; -[Table("t_process_map_plan_operation_positioning_off_the_bottom"), Comment("Позиционирование над забоем")] -public class ProcessMapPlanOperationPositioningOffTheBottom : ProcessMapPlanBase +[Table("t_process_map_plan_positioning_off_the_bottom"), Comment("Позиционирование над забоем")] +public class ProcessMapPlanPositioningOffTheBottom : ProcessMapPlanBase { [Column("stop_off_the_bottom"), Comment("Остановка над забоем, м")] [Range(0.0, 30.0)] @@ -14,5 +14,5 @@ public class ProcessMapPlanOperationPositioningOffTheBottom : ProcessMapPlanBase public double StopOffTheBottom { get; set; } [ForeignKey(nameof(IdPrevious))] - public virtual ProcessMapPlanOperationPositioningOffTheBottom? Previous { get; set; } + public virtual ProcessMapPlanPositioningOffTheBottom? Previous { get; set; } } \ No newline at end of file diff --git a/AsbCloudInfrastructure/DependencyInjection.cs b/AsbCloudInfrastructure/DependencyInjection.cs index 2a036053..a2b39a9b 100644 --- a/AsbCloudInfrastructure/DependencyInjection.cs +++ b/AsbCloudInfrastructure/DependencyInjection.cs @@ -174,11 +174,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() @@ -433,7 +433,7 @@ namespace AsbCloudInfrastructure services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -459,7 +459,7 @@ namespace AsbCloudInfrastructure services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -511,8 +511,8 @@ namespace AsbCloudInfrastructure ProcessMapPlanBaseRepository>(); services.AddTransient< - IChangeLogRepository, - ProcessMapPlanBaseRepository>(); + IChangeLogRepository, + ProcessMapPlanBaseRepository>(); services.AddTransient< IChangeLogRepository, @@ -572,7 +572,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/ProcessMapPlanOperationPositioningOffTheBottomTemplate.cs b/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanPositioningOffTheBottomTemplate.cs similarity index 65% rename from AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanOperationPositioningOffTheBottomTemplate.cs rename to AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanPositioningOffTheBottomTemplate.cs index 3cb9aadf..1766a5e0 100644 --- a/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanOperationPositioningOffTheBottomTemplate.cs +++ b/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanPositioningOffTheBottomTemplate.cs @@ -2,13 +2,13 @@ using System.Collections.Generic; namespace AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates; -public class ProcessMapPlanOperationPositioningOffTheBottomTemplate : ITemplateParameters +public class ProcessMapPlanPositioningOffTheBottomTemplate : ITemplateParameters { public string SheetName => "Позиционирование над забоем"; public int HeaderRowsCount => 2; - public string FileName => "ProcessMapPlanOperationPositioningOffTheBottomTemplate.xlsx"; + public string FileName => "ProcessMapPlanPositioningOffTheBottomTemplate.xlsx"; public IDictionary Cells => new Dictionary { diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanOperationPositioningOffTheBottomExportService.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanPositioningOffTheBottomExportService.cs similarity index 67% rename from AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanOperationPositioningOffTheBottomExportService.cs rename to AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanPositioningOffTheBottomExportService.cs index d1049e01..20f7fd92 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanOperationPositioningOffTheBottomExportService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanPositioningOffTheBottomExportService.cs @@ -10,16 +10,16 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Services.ProcessMapPlan.Export; -public class ProcessMapPlanOperationPositioningOffTheBottomExportService : ProcessMapPlanExportService +public class ProcessMapPlanPositioningOffTheBottomExportService : ProcessMapPlanExportService { - public ProcessMapPlanOperationPositioningOffTheBottomExportService( - IChangeLogRepository processMapPlanRepository, + public ProcessMapPlanPositioningOffTheBottomExportService( + IChangeLogRepository processMapPlanRepository, IWellService wellService) : base(processMapPlanRepository, wellService) { } - protected override ITemplateParameters TemplateParameters { get; } = new ProcessMapPlanOperationPositioningOffTheBottomTemplate(); + protected override ITemplateParameters TemplateParameters { get; } = new ProcessMapPlanPositioningOffTheBottomTemplate(); protected override async Task BuildFileNameAsync(WellRelatedExportRequest options, CancellationToken token) { diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanOperationPositioningOffTheBottomParser.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanPositioningOffTheBottomParser.cs similarity index 70% rename from AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanOperationPositioningOffTheBottomParser.cs rename to AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanPositioningOffTheBottomParser.cs index a921e0eb..919cd035 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanOperationPositioningOffTheBottomParser.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanPositioningOffTheBottomParser.cs @@ -9,16 +9,16 @@ using AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemp namespace AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; -public class ProcessMapPlanOperationPositioningOffTheBottomParser : ProcessMapPlanParser +public class ProcessMapPlanPositioningOffTheBottomParser : ProcessMapPlanParser { - public ProcessMapPlanOperationPositioningOffTheBottomParser(IWellOperationRepository wellOperationRepository) + public ProcessMapPlanPositioningOffTheBottomParser(IWellOperationRepository wellOperationRepository) : base(wellOperationRepository) { } - protected override ITemplateParameters TemplateParameters => new ProcessMapPlanOperationPositioningOffTheBottomTemplate(); + protected override ITemplateParameters TemplateParameters => new ProcessMapPlanPositioningOffTheBottomTemplate(); - protected override ProcessMapPlanOperationPositioningOffTheBottomDto BuildDto(IDictionary row, int rowNumber) + protected override ProcessMapPlanPositioningOffTheBottomDto BuildDto(IDictionary row, int rowNumber) { var dto = base.BuildDto(row, rowNumber); diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanOperationPositioningOffTheBottomControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanPositioningOffTheBottomControllerTest.cs similarity index 51% rename from AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanOperationPositioningOffTheBottomControllerTest.cs rename to AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanPositioningOffTheBottomControllerTest.cs index 6b35ec47..84d4b6b1 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanOperationPositioningOffTheBottomControllerTest.cs +++ b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/Operations/ProcessMapPlanPositioningOffTheBottomControllerTest.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 ProcessMapPlanOperationPositioningOffTheBottomControllerTest : - ProcessMapPlanBaseControllerTest +public class ProcessMapPlanPositioningOffTheBottomControllerTest : + ProcessMapPlanBaseControllerTest { - public ProcessMapPlanOperationPositioningOffTheBottomControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanOperationPositioningOffTheBottom") + public ProcessMapPlanPositioningOffTheBottomControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanOperationPositioningOffTheBottom") { } - private readonly ProcessMapPlanOperationPositioningOffTheBottomDto dto = new ProcessMapPlanOperationPositioningOffTheBottomDto() + private readonly ProcessMapPlanPositioningOffTheBottomDto dto = new ProcessMapPlanPositioningOffTheBottomDto() { IdWell = 1, DepthStart = 1, @@ -31,7 +31,7 @@ public class ProcessMapPlanOperationPositioningOffTheBottomControllerTest : StopOffTheBottom = 1 }; - private readonly ProcessMapPlanOperationPositioningOffTheBottom entity = new ProcessMapPlanOperationPositioningOffTheBottom() + private readonly ProcessMapPlanPositioningOffTheBottom entity = new ProcessMapPlanPositioningOffTheBottom() { IdWell = 1, DepthEnd = 10, @@ -50,17 +50,17 @@ public class ProcessMapPlanOperationPositioningOffTheBottomControllerTest : await Get(entity, dto); } - protected override ProcessMapPlanOperationPositioningOffTheBottom GetByNote(DbSet dbSet, ProcessMapPlanOperationPositioningOffTheBottomDto dto) + protected override ProcessMapPlanPositioningOffTheBottom GetByNote(DbSet dbSet, ProcessMapPlanPositioningOffTheBottomDto dto) { throw new NotImplementedException(); } - protected override ProcessMapPlanOperationPositioningOffTheBottomDto GetByNote(IEnumerable dtos, ProcessMapPlanOperationPositioningOffTheBottomDto dto) + protected override ProcessMapPlanPositioningOffTheBottomDto GetByNote(IEnumerable dtos, ProcessMapPlanPositioningOffTheBottomDto dto) { throw new NotImplementedException(); } - protected override ProcessMapPlanOperationPositioningOffTheBottom? GetByWellId() + protected override ProcessMapPlanPositioningOffTheBottom? GetByWellId() { throw new NotImplementedException(); } diff --git a/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanOperationPositioningOffTheBottomController.cs b/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanPositioningOffTheBottomController.cs similarity index 54% rename from AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanOperationPositioningOffTheBottomController.cs rename to AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanPositioningOffTheBottomController.cs index ba4c9e91..30264156 100644 --- a/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanOperationPositioningOffTheBottomController.cs +++ b/AsbCloudWebApi/Controllers/ProcessMaps/Operations/ProcessMapPlanPositioningOffTheBottomController.cs @@ -6,20 +6,20 @@ 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 ProcessMapPlanOperationPositioningOffTheBottomController : - ProcessMapPlanBaseController +public class ProcessMapPlanPositioningOffTheBottomController : + ProcessMapPlanBaseController { - public ProcessMapPlanOperationPositioningOffTheBottomController( - IChangeLogRepository repository, + public ProcessMapPlanPositioningOffTheBottomController( + IChangeLogRepository repository, IWellService wellService, - ProcessMapPlanOperationPositioningOffTheBottomParser parserService, + ProcessMapPlanPositioningOffTheBottomParser parserService, ITelemetryService telemetryService, - ProcessMapPlanOperationPositioningOffTheBottomExportService processMapPlanExportService) + ProcessMapPlanPositioningOffTheBottomExportService processMapPlanExportService) : base(repository, wellService, parserService, processMapPlanExportService, telemetryService) { }