diff --git a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanDrillTestDto.cs b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanDrillTestDto.cs new file mode 100644 index 00000000..1a471c5c --- /dev/null +++ b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanDrillTestDto.cs @@ -0,0 +1,45 @@ +using System.ComponentModel.DataAnnotations; + +namespace AsbCloudApp.Data.ProcessMaps; + +/// +/// РТК план дрилтест +/// +public class ProcessMapPlanDrillTestDto : ProcessMapPlanBaseDto +{ + /// + /// Нагрузка минимальная, т + /// + [Range(1.0, 30.0, ErrorMessage = "Нагрузка минимальная, т., должно быть в пределах от 1 до 30")] + public double WeightOnBitMin { get; set; } + + /// + /// Количество шагов по нагрузке + /// + [Range(1, 5, ErrorMessage = "Количество шагов по нагрузке, должно быть в пределах от 1 до 5")] + public int WeightOnBitStepsCount { get; set; } + + /// + /// Минимальные обороты на ВСП, об/мин. + /// + [Range(5, 200, ErrorMessage = "Минимальные обороты на ВСП, об/мин., должно быть в пределах от 5 до 200")] + public int RpmMin { get; set; } + + /// + /// Количество шагов оборотов на ВСП, шт. + /// + [Range(1, 5, ErrorMessage = "Количество шагов оборотов на ВСП, шт., должно быть в пределах от 1 до 5")] + public int RpmStepsCount { get; set; } + + /// + /// Величина проходки шага, м. + /// + [Range(0.1, 2.0, ErrorMessage = "Величина проходки шага, м., должно быть в пределах от 0.1 до 2")] + public double LengthStep { 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/ProcessMapPlanFunctionsShockTestDto.cs b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanFunctionsShockTestDto.cs deleted file mode 100644 index 9b1670ea..00000000 --- a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanFunctionsShockTestDto.cs +++ /dev/null @@ -1,57 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace AsbCloudApp.Data.ProcessMaps; - -/// -/// РТК план shocktest -/// -public class ProcessMapPlanFunctionsShockTestDto : 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(1.0, 30.0, ErrorMessage = "Комбинированные вибрации, должно быть в пределах от 1 до 30")] - public double WeightOnBitMin { get; set; } - - /// - /// Минимальные обороты на ВСП, об/мин. - /// - [Range(5, 200, ErrorMessage = "Минимальные обороты на ВСП, об/мин., должно быть в пределах от 5 до 200")] - public int RevolutionPerMinuteMin { get; set; } - - /// - /// Автозапуск или Предупреждение - /// - [Required] - public bool IdAutostartOrWarning { 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 b9ef96eb..631e9ffc 100644 --- a/AsbCloudDb/Model/AsbCloudDbContext.cs +++ b/AsbCloudDb/Model/AsbCloudDbContext.cs @@ -32,7 +32,7 @@ namespace AsbCloudDb.Model public virtual DbSet ProcessMapPlanOperationSwitchPump => Set(); public virtual DbSet ProcessMapPlanOperationSwitchMode => Set(); public virtual DbSet ProcessMapPlanFunctionsDrillTest => Set(); - public virtual DbSet ProcessMapPlanFunctionsShockTest => Set(); + public virtual DbSet ProcessMapPlanFunctionsShockTest => Set(); public virtual DbSet ProcessMapPlanFunctionsDamper => Set(); public virtual DbSet ProcessMapPlanFunctionsAutoHold => Set(); public virtual DbSet ProcessMapPlanFunctionsJarrDrillTool => Set(); @@ -523,7 +523,7 @@ namespace AsbCloudDb.Model .WithMany() .OnDelete(DeleteBehavior.Restrict); - modelBuilder.Entity() + modelBuilder.Entity() .HasOne(p => p.Author) .WithMany() .OnDelete(DeleteBehavior.Restrict); @@ -623,7 +623,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 297f1204..19f5e2d9 100644 --- a/AsbCloudDb/Model/IAsbCloudDbContext.cs +++ b/AsbCloudDb/Model/IAsbCloudDbContext.cs @@ -93,7 +93,7 @@ namespace AsbCloudDb.Model DbSet ProcessMapPlanOperationSwitchPump { get; } DbSet ProcessMapPlanOperationSwitchMode { get; } DbSet ProcessMapPlanFunctionsDrillTest { get; } - DbSet ProcessMapPlanFunctionsShockTest { get; } + DbSet ProcessMapPlanFunctionsShockTest { get; } DbSet ProcessMapPlanFunctionsDamper { get; } DbSet ProcessMapPlanFunctionsAutoHold { get; } DbSet ProcessMapPlanFunctionsJarrDrillTool { get; } diff --git a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanFunctionsShockTest.cs b/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanShockTest.cs similarity index 64% rename from AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanFunctionsShockTest.cs rename to AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanShockTest.cs index 9683eb4b..3897b468 100644 --- a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanFunctionsShockTest.cs +++ b/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanShockTest.cs @@ -5,10 +5,10 @@ using Microsoft.EntityFrameworkCore; namespace AsbCloudDb.Model.ProcessMaps; -[Table("t_process_map_functions_shock_test"), Comment("ShockTest")] -public class ProcessMapPlanFunctionsShockTest : ProcessMapPlanBase +[Table("t_process_map_shock_test"), Comment("ShockTest")] +public class ProcessMapPlanShockTest : ProcessMapPlanBase { - [Column("stickslip"), Comment("StickSlip")] + [Column("stickSlip"), Comment("stickSlip")] [Range(0.0, 1000.0)] [Required] public double StickSlip { get; set; } @@ -29,22 +29,18 @@ public class ProcessMapPlanFunctionsShockTest : ProcessMapPlanBase public double CombinedVibrations { get; set; } [Column("weight_on_bit_min"), Comment("Нагрузка минимальная, т")] - [Range(1.0, 30.0)] + [Range(0.0, 30.0)] [Required] public double WeightOnBitMin { get; set; } - [Column("revolution_per_minute_min"), Comment("Минимальные обороты на ВСП, об/мин.")] + [Column("rpm_min"), Comment("Минимальные обороты на ВСП, об/мин.")] [Range(5, 200)] [Required] - public int RevolutionPerMinuteMin { get; set; } - - [Column("id_autostart_or_warning"), Comment("Автозапуск или Предупреждение")] - [Required] - public bool IdAutostartOrWarning { get; set; } + public double RpmMin { get; set; } [Column("note"), Comment("Примечание"), StringLength(1024)] public string Note { get; set; } = string.Empty; [ForeignKey(nameof(IdPrevious))] - public virtual ProcessMapPlanFunctionsShockTest? Previous { get; set; } + public virtual ProcessMapPlanShockTest? Previous { get; set; } } \ No newline at end of file diff --git a/AsbCloudInfrastructure/DependencyInjection.cs b/AsbCloudInfrastructure/DependencyInjection.cs index f4226d3a..cd9694b9 100644 --- a/AsbCloudInfrastructure/DependencyInjection.cs +++ b/AsbCloudInfrastructure/DependencyInjection.cs @@ -216,11 +216,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() @@ -439,7 +439,7 @@ namespace AsbCloudInfrastructure services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -465,7 +465,7 @@ namespace AsbCloudInfrastructure services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -535,8 +535,8 @@ namespace AsbCloudInfrastructure ProcessMapPlanBaseRepository>(); services.AddTransient< - IChangeLogRepository, - ProcessMapPlanBaseRepository>(); + IChangeLogRepository, + ProcessMapPlanBaseRepository>(); services.AddTransient< IChangeLogRepository, @@ -578,7 +578,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/ProcessMapPlanFunctionsShockTestTemplate.cs b/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanShockTestTemplate.cs similarity index 67% rename from AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanFunctionsShockTestTemplate.cs rename to AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanShockTestTemplate.cs index e110136a..013a6105 100644 --- a/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanFunctionsShockTestTemplate.cs +++ b/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanShockTestTemplate.cs @@ -2,13 +2,13 @@ using System.Collections.Generic; namespace AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates; -public class ProcessMapPlanFunctionsShockTestTemplate : ITemplateParameters +public class ProcessMapPlanShockTestTemplate : ITemplateParameters { public string SheetName => "Запись shock test"; public int HeaderRowsCount => 2; - public string FileName => "ProcessMapPlanFunctionsShockTestTemplate.xlsx"; + public string FileName => "ProcessMapPlanShockTestTemplate.xlsx"; public IDictionary Cells => new Dictionary { diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanFunctionsShockTestExportService.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanShockTestExportService.cs similarity index 70% rename from AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanFunctionsShockTestExportService.cs rename to AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanShockTestExportService.cs index fd5865f8..9a4157f1 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanFunctionsShockTestExportService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanShockTestExportService.cs @@ -10,16 +10,16 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Services.ProcessMapPlan.Export; -public class ProcessMapPlanFunctionsShockTestExportService : ProcessMapPlanExportService +public class ProcessMapPlanShockTestExportService : ProcessMapPlanExportService { - public ProcessMapPlanFunctionsShockTestExportService( - IChangeLogRepository processMapPlanRepository, + public ProcessMapPlanShockTestExportService( + IChangeLogRepository processMapPlanRepository, IWellService wellService) : base(processMapPlanRepository, wellService) { } - protected override ITemplateParameters TemplateParameters { get; } = new ProcessMapPlanFunctionsShockTestTemplate(); + protected override ITemplateParameters TemplateParameters { get; } = new ProcessMapPlanShockTestTemplate(); protected override async Task BuildFileNameAsync(WellRelatedExportRequest options, CancellationToken token) { diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanFunctionsShockTestParser.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanShockTestParser.cs similarity index 73% rename from AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanFunctionsShockTestParser.cs rename to AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanShockTestParser.cs index 5de14184..f3890ff5 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanFunctionsShockTestParser.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanShockTestParser.cs @@ -9,16 +9,16 @@ using AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemp namespace AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; -public class ProcessMapPlanFunctionsShockTestParser : ProcessMapPlanParser +public class ProcessMapPlanShockTestParser : ProcessMapPlanParser { - public ProcessMapPlanFunctionsShockTestParser(IWellOperationRepository wellOperationRepository) + public ProcessMapPlanShockTestParser(IWellOperationRepository wellOperationRepository) : base(wellOperationRepository) { } - protected override ITemplateParameters TemplateParameters => new ProcessMapPlanFunctionsShockTestTemplate(); + protected override ITemplateParameters TemplateParameters => new ProcessMapPlanShockTestTemplate(); - protected override ProcessMapPlanFunctionsShockTestDto BuildDto(IDictionary row, int rowNumber) + protected override ProcessMapPlanShockTestDto BuildDto(IDictionary row, int rowNumber) { var dto = base.BuildDto(row, rowNumber); diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanFunctionsShockTestControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanShockTestControllerTest.cs similarity index 58% rename from AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanFunctionsShockTestControllerTest.cs rename to AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanShockTestControllerTest.cs index 53ade4bf..32969202 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanFunctionsShockTestControllerTest.cs +++ b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanShockTestControllerTest.cs @@ -15,13 +15,13 @@ namespace AsbCloudWebApi.Controllers.ProcessMaps; /// /// РТК план shock test /// -public class ProcessMapPlanFunctionsShockTestControllerTest : - ProcessMapPlanBaseControllerTest +public class ProcessMapPlanShockTestControllerTest : + ProcessMapPlanBaseControllerTest { - public ProcessMapPlanFunctionsShockTestControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanFunctionsShockTest") + public ProcessMapPlanShockTestControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanFunctionsShockTest") { } - private readonly ProcessMapPlanFunctionsShockTestDto dto = new ProcessMapPlanFunctionsShockTestDto() + private readonly ProcessMapPlanShockTestDto dto = new ProcessMapPlanShockTestDto() { IdWell = 1, DepthStart = 1, @@ -30,15 +30,13 @@ public class ProcessMapPlanFunctionsShockTestControllerTest : IdWellSectionType = 1, AxialVibrations = 1, CombinedVibrations = 2, - IdAutostartOrWarning = true, Note = "1", - RevolutionPerMinuteMin = 1, StickSlip = 1, WeightOnBitMin = 1, Whirl = 1 }; - private readonly ProcessMapPlanFunctionsShockTest entity = new ProcessMapPlanFunctionsShockTest() + private readonly ProcessMapPlanShockTest entity = new ProcessMapPlanShockTest() { IdWell = 1, DepthEnd = 10, @@ -50,9 +48,7 @@ public class ProcessMapPlanFunctionsShockTestControllerTest : Creation = DateTimeOffset.UtcNow, AxialVibrations = 1, CombinedVibrations = 2, - IdAutostartOrWarning = true, Note = "1", - RevolutionPerMinuteMin = 1, StickSlip = 1, WeightOnBitMin = 1, Whirl = 1 @@ -64,17 +60,17 @@ public class ProcessMapPlanFunctionsShockTestControllerTest : await Get(entity, dto); } - protected override ProcessMapPlanFunctionsShockTest GetByNote(DbSet dbSet, ProcessMapPlanFunctionsShockTestDto dto) + protected override ProcessMapPlanShockTest GetByNote(DbSet dbSet, ProcessMapPlanShockTestDto dto) { throw new NotImplementedException(); } - protected override ProcessMapPlanFunctionsShockTestDto GetByNote(IEnumerable dtos, ProcessMapPlanFunctionsShockTestDto dto) + protected override ProcessMapPlanShockTestDto GetByNote(IEnumerable dtos, ProcessMapPlanShockTestDto dto) { throw new NotImplementedException(); } - protected override ProcessMapPlanFunctionsShockTest? GetByWellId() + protected override ProcessMapPlanShockTest? GetByWellId() { throw new NotImplementedException(); } diff --git a/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanFunctionsShockTestController.cs b/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanShockTestController.cs similarity index 59% rename from AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanFunctionsShockTestController.cs rename to AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanShockTestController.cs index 4ee12c1b..aa939c57 100644 --- a/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanFunctionsShockTestController.cs +++ b/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanShockTestController.cs @@ -11,15 +11,15 @@ namespace AsbCloudWebApi.Controllers.ProcessMaps; /// /// РТК план shock test /// -public class ProcessMapPlanFunctionsShockTestController : - ProcessMapPlanBaseController +public class ProcessMapPlanShockTestController : + ProcessMapPlanBaseController { - public ProcessMapPlanFunctionsShockTestController( - IChangeLogRepository repository, + public ProcessMapPlanShockTestController( + IChangeLogRepository repository, IWellService wellService, - ProcessMapPlanFunctionsShockTestParser parserService, + ProcessMapPlanShockTestParser parserService, ITelemetryService telemetryService, - ProcessMapPlanFunctionsShockTestExportService processMapPlanExportService) + ProcessMapPlanShockTestExportService processMapPlanExportService) : base(repository, wellService, parserService, processMapPlanExportService, telemetryService) { }