diff --git a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanDamperDto.cs b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanDamperDto.cs new file mode 100644 index 00000000..c9022f43 --- /dev/null +++ b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanDamperDto.cs @@ -0,0 +1,21 @@ +using System.ComponentModel.DataAnnotations; + +namespace AsbCloudApp.Data.ProcessMaps; + +/// +/// РТК план демпфер +/// +public class ProcessMapPlanDamperDto : ProcessMapPlanBaseDto +{ + /// + /// StickSlip + /// + [Range(0.0, 1000.0, ErrorMessage = "StickSlip, должно быть в пределах от 0 до 1000")] + public double StickSlip { get; set; } + + /// + /// Примечание + /// + [StringLength(1024, ErrorMessage = "Примечание, должно быть не более 1024 символов")] + public string Note { get; set; } = string.Empty; +} \ No newline at end of file diff --git a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanOperationSwitchPumpDto.cs b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanOperationSwitchPumpDto.cs deleted file mode 100644 index bd4422b5..00000000 --- a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanOperationSwitchPumpDto.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace AsbCloudApp.Data.ProcessMaps; - -/// -/// РТК план выключение насоса -/// -public class ProcessMapPlanOperationSwitchPumpDto : ProcessMapPlanBaseDto -{ - /// - /// Продолжительность, сек. - /// - [Range(0.0, 1800.0, ErrorMessage = "Продолжительность, сек., должно быть в пределах от 0 до 1800")] - public double Duration { get; set; } - - /// - /// Лимит остаточного давления, атм. - /// - [Range(0.0, 100.0, ErrorMessage = "Лимит остаточного давления, атм., должно быть в пределах от 0 до 100")] - public double ResidualPressureLimit { get; set; } -} \ No newline at end of file diff --git a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanShockTestDto.cs b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanShockTestDto.cs new file mode 100644 index 00000000..ada3f844 --- /dev/null +++ b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanShockTestDto.cs @@ -0,0 +1,51 @@ +using System.ComponentModel.DataAnnotations; + +namespace AsbCloudApp.Data.ProcessMaps; + +/// +/// РТК план shocktest +/// +public class ProcessMapPlanShockTestDto : ProcessMapPlanBaseDto +{ + /// + /// StickSlip + /// + [Range(0.0, 1000.0, ErrorMessage = "StickSlip, должно быть в пределах от 0 до 1000")] + public double StickSlip { get; set; } + + /// + /// Whirl + /// + [Range(0.0, 1000.0, ErrorMessage = "Whirl, должно быть в пределах от 0 до 1000")] + public double Whirl { get; set; } + + /// + /// Осевые вибрации + /// + [Range(0.0, 1000.0, ErrorMessage = "Осевые вибрации, должно быть в пределах от 0 до 1000")] + public double AxialVibrations { get; set; } + + /// + /// Комбинированные вибрации + /// + [Range(0.0, 1000.0, ErrorMessage = "Комбинированные вибрации, должно быть в пределах от 0 до 1000")] + public double CombinedVibrations { get; set; } + + /// + /// Нагрузка минимальная, т + /// + [Range(0.0, 30.0, ErrorMessage = "Комбинированные вибрации, должно быть в пределах от 1 до 30")] + public double WeightOnBitMin { get; set; } + + /// + /// Минимальные обороты на ВСП, об/мин. + /// + [Range(5, 200, ErrorMessage = "Минимальные обороты на ВСП, об/мин., должно быть в пределах от 5 до 200")] + public double RpmMin { 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 3673bff1..3d7b4451 100644 --- a/AsbCloudDb/Model/AsbCloudDbContext.cs +++ b/AsbCloudDb/Model/AsbCloudDbContext.cs @@ -29,7 +29,7 @@ namespace AsbCloudDb.Model public virtual DbSet ProcessMapPlanOperationPositioningOffTheBottom => Set(); public virtual DbSet ProcessMapPlanOperationDeterminationOfOscillationAngles => Set(); public virtual DbSet ProcessMapPlanOperationTFOrientation => Set(); - public virtual DbSet ProcessMapPlanOperationSwitchPump => Set(); + public virtual DbSet ProcessMapPlanOperationSwitchPump => Set(); public virtual DbSet ProcessMapPlanOperationSwitchMode => Set(); public virtual DbSet ProcessMapPlanFunctionsDrillTest => Set(); public virtual DbSet ProcessMapPlanFunctionsShockTest => Set(); @@ -508,7 +508,7 @@ namespace AsbCloudDb.Model .WithMany() .OnDelete(DeleteBehavior.Restrict); - modelBuilder.Entity() + modelBuilder.Entity() .HasOne(p => p.Author) .WithMany() .OnDelete(DeleteBehavior.Restrict); @@ -608,7 +608,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 43f309d9..0e9df4d9 100644 --- a/AsbCloudDb/Model/IAsbCloudDbContext.cs +++ b/AsbCloudDb/Model/IAsbCloudDbContext.cs @@ -90,7 +90,7 @@ namespace AsbCloudDb.Model DbSet ProcessMapPlanOperationPositioningOffTheBottom { get; } DbSet ProcessMapPlanOperationDeterminationOfOscillationAngles { get; } DbSet ProcessMapPlanOperationTFOrientation { get; } - DbSet ProcessMapPlanOperationSwitchPump { get; } + DbSet ProcessMapPlanOperationSwitchPump { get; } DbSet ProcessMapPlanOperationSwitchMode { get; } DbSet ProcessMapPlanFunctionsDrillTest { get; } DbSet ProcessMapPlanFunctionsShockTest { get; } diff --git a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanOperationSwitchPump.cs b/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanSwitchingOffThePump.cs similarity index 72% rename from AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanOperationSwitchPump.cs rename to AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanSwitchingOffThePump.cs index d547eb61..724603dd 100644 --- a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanOperationSwitchPump.cs +++ b/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanSwitchingOffThePump.cs @@ -5,8 +5,8 @@ using Microsoft.EntityFrameworkCore; namespace AsbCloudDb.Model.ProcessMaps; -[Table("t_process_map_plan_operation_switch_pump"), Comment("Выключение насоса")] -public class ProcessMapPlanOperationSwitchPump : ProcessMapPlanBase +[Table("t_process_map_plan_operation_switching_off_the_pump"), Comment("Выключение насоса")] +public class ProcessMapPlanSwitchingOffThePump : ProcessMapPlanBase { [Column("duration"), Comment("Продолжительность, сек.")] [Range(0.0, 1800.0)] @@ -18,5 +18,5 @@ public class ProcessMapPlanOperationSwitchPump : ProcessMapPlanBase public double ResidualPressureLimit { get; set; } [ForeignKey(nameof(IdPrevious))] - public virtual ProcessMapPlanOperationSwitchPump? Previous { get; set; } + public virtual ProcessMapPlanSwitchingOffThePump? Previous { get; set; } } \ No newline at end of file diff --git a/AsbCloudInfrastructure/DependencyInjection.cs b/AsbCloudInfrastructure/DependencyInjection.cs index 07664bd8..4cdc6805 100644 --- a/AsbCloudInfrastructure/DependencyInjection.cs +++ b/AsbCloudInfrastructure/DependencyInjection.cs @@ -195,11 +195,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() @@ -436,7 +436,7 @@ namespace AsbCloudInfrastructure services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -462,7 +462,7 @@ namespace AsbCloudInfrastructure services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -523,8 +523,8 @@ namespace AsbCloudInfrastructure ProcessMapPlanBaseRepository>(); services.AddTransient< - IChangeLogRepository, - ProcessMapPlanBaseRepository>(); + IChangeLogRepository, + ProcessMapPlanBaseRepository>(); services.AddTransient< IChangeLogRepository, @@ -575,7 +575,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/ProcessMapPlanOperationSwitchPumpTemplate.cs b/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanSwitchingOffThePumpTemplate.cs similarity index 73% rename from AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanOperationSwitchPumpTemplate.cs rename to AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanSwitchingOffThePumpTemplate.cs index 396c4234..5ab5c14f 100644 --- a/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanOperationSwitchPumpTemplate.cs +++ b/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanSwitchingOffThePumpTemplate.cs @@ -2,13 +2,13 @@ using System.Collections.Generic; namespace AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates; -public class ProcessMapPlanOperationSwitchPumpTemplate : ITemplateParameters +public class ProcessMapPlanSwitchingOffThePumpTemplate : ITemplateParameters { public string SheetName => "Выключение насоса"; public int HeaderRowsCount => 2; - public string FileName => "ProcessMapPlanOperationSwitchPumpTemplate.xlsx"; + public string FileName => "ProcessMapPlanSwitchingOffThePumpTemplate.xlsx"; public IDictionary Cells => new Dictionary { diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanOperationSwitchPumpExportService.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanSwitchingOffThePumpExportService.cs similarity index 75% rename from AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanOperationSwitchPumpExportService.cs rename to AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanSwitchingOffThePumpExportService.cs index bb848e3f..252a9587 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanOperationSwitchPumpExportService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanSwitchingOffThePumpExportService.cs @@ -10,16 +10,16 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Services.ProcessMapPlan.Export; -public class ProcessMapPlanOperationSwitchPumpExportService : ProcessMapPlanExportService +public class ProcessMapPlanSwitchingOffThePumpExportService : ProcessMapPlanExportService { - public ProcessMapPlanOperationSwitchPumpExportService( - IChangeLogRepository processMapPlanRepository, + public ProcessMapPlanSwitchingOffThePumpExportService( + IChangeLogRepository processMapPlanRepository, IWellService wellService) : base(processMapPlanRepository, wellService) { } - protected override ITemplateParameters TemplateParameters { get; } = new ProcessMapPlanOperationSwitchPumpTemplate(); + protected override ITemplateParameters TemplateParameters { get; } = new ProcessMapPlanSwitchingOffThePumpTemplate(); protected override async Task BuildFileNameAsync(WellRelatedExportRequest options, CancellationToken token) { diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanOperationSwitchPumpParser.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanSwitchingOffThePumpParser.cs similarity index 79% rename from AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanOperationSwitchPumpParser.cs rename to AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanSwitchingOffThePumpParser.cs index ac54d139..7272810c 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanOperationSwitchPumpParser.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanSwitchingOffThePumpParser.cs @@ -9,16 +9,16 @@ using AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemp namespace AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; -public class ProcessMapPlanOperationSwitchPumpParser : ProcessMapPlanParser +public class ProcessMapPlanSwitchingOffThePumpParser : ProcessMapPlanParser { - public ProcessMapPlanOperationSwitchPumpParser(IWellOperationRepository wellOperationRepository) + public ProcessMapPlanSwitchingOffThePumpParser(IWellOperationRepository wellOperationRepository) : base(wellOperationRepository) { } - protected override ITemplateParameters TemplateParameters => new ProcessMapPlanOperationSwitchPumpTemplate(); + protected override ITemplateParameters TemplateParameters => new ProcessMapPlanSwitchingOffThePumpTemplate(); - protected override ProcessMapPlanOperationSwitchPumpDto BuildDto(IDictionary row, int rowNumber) + protected override ProcessMapPlanSwitchingOffThePumpDto BuildDto(IDictionary row, int rowNumber) { var dto = base.BuildDto(row, rowNumber); diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanOperationSwitchPumpControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanSwitchingOffThePumpControllerTest.cs similarity index 62% rename from AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanOperationSwitchPumpControllerTest.cs rename to AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanSwitchingOffThePumpControllerTest.cs index 4b9f34d3..71ec142a 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanOperationSwitchPumpControllerTest.cs +++ b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanSwitchingOffThePumpControllerTest.cs @@ -15,13 +15,13 @@ namespace AsbCloudWebApi.Controllers.ProcessMaps; /// /// РТК план выключение насоса /// -public class ProcessMapPlanOperationSwitchPumpControllerTest : - ProcessMapPlanBaseControllerTest +public class ProcessMapPlanSwitchingOffThePumpControllerTest : + ProcessMapPlanBaseControllerTest { - public ProcessMapPlanOperationSwitchPumpControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanOperationSwitchPump") + public ProcessMapPlanSwitchingOffThePumpControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanOperationSwitchPump") { } - private readonly ProcessMapPlanOperationSwitchPumpDto dto = new ProcessMapPlanOperationSwitchPumpDto() + private readonly ProcessMapPlanSwitchingOffThePumpDto dto = new ProcessMapPlanSwitchingOffThePumpDto() { IdWell = 1, DepthStart = 1, @@ -32,7 +32,7 @@ public class ProcessMapPlanOperationSwitchPumpControllerTest : ResidualPressureLimit = 1, }; - private readonly ProcessMapPlanOperationSwitchPump entity = new ProcessMapPlanOperationSwitchPump() + private readonly ProcessMapPlanSwitchingOffThePump entity = new ProcessMapPlanSwitchingOffThePump() { IdWell = 1, DepthEnd = 10, @@ -52,17 +52,17 @@ public class ProcessMapPlanOperationSwitchPumpControllerTest : await Get(entity, dto); } - protected override ProcessMapPlanOperationSwitchPump GetByNote(DbSet dbSet, ProcessMapPlanOperationSwitchPumpDto dto) + protected override ProcessMapPlanSwitchingOffThePump GetByNote(DbSet dbSet, ProcessMapPlanSwitchingOffThePumpDto dto) { throw new NotImplementedException(); } - protected override ProcessMapPlanOperationSwitchPumpDto GetByNote(IEnumerable dtos, ProcessMapPlanOperationSwitchPumpDto dto) + protected override ProcessMapPlanSwitchingOffThePumpDto GetByNote(IEnumerable dtos, ProcessMapPlanSwitchingOffThePumpDto dto) { throw new NotImplementedException(); } - protected override ProcessMapPlanOperationSwitchPump? GetByWellId() + protected override ProcessMapPlanSwitchingOffThePump? GetByWellId() { throw new NotImplementedException(); } diff --git a/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanOperationSwitchPumpController.cs b/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanSwitchingOffThePumpController.cs similarity index 66% rename from AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanOperationSwitchPumpController.cs rename to AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanSwitchingOffThePumpController.cs index bb55b039..71f226f3 100644 --- a/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanOperationSwitchPumpController.cs +++ b/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanSwitchingOffThePumpController.cs @@ -11,15 +11,15 @@ namespace AsbCloudWebApi.Controllers.ProcessMaps; /// /// РТК план выключение насоса /// -public class ProcessMapPlanOperationSwitchPumpController : - ProcessMapPlanBaseController +public class ProcessMapPlanSwitchingOffThePumpController : + ProcessMapPlanBaseController { - public ProcessMapPlanOperationSwitchPumpController( - IChangeLogRepository repository, + public ProcessMapPlanSwitchingOffThePumpController( + IChangeLogRepository repository, IWellService wellService, - ProcessMapPlanOperationSwitchPumpParser parserService, + ProcessMapPlanSwitchingOffThePumpParser parserService, ITelemetryService telemetryService, - ProcessMapPlanOperationSwitchPumpExportService processMapPlanExportService) + ProcessMapPlanSwitchingOffThePumpExportService processMapPlanExportService) : base(repository, wellService, parserService, processMapPlanExportService, telemetryService) { }