diff --git a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanFunctionsDrillTestDto.cs b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanFunctionsDrillTestDto.cs deleted file mode 100644 index 3cd4ad19..00000000 --- a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanFunctionsDrillTestDto.cs +++ /dev/null @@ -1,51 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace AsbCloudApp.Data.ProcessMaps; - -/// -/// РТК план дрилтест -/// -public class ProcessMapPlanFunctionsDrillTestDto : ProcessMapPlanBaseDto -{ - /// - /// Нагрузка минимальная, т - /// - [Range(1.0, 30.0, ErrorMessage = "Нагрузка минимальная, т., должно быть в пределах от 1 до 30")] - public double WeightOnBitMin { get; set; } - - /// - /// Количество шагов по нагрузке - /// - [Range(1, 5, ErrorMessage = "Количество шагов по нагрузке, должно быть в пределах от 1 до 5")] - public int NumberOfStepsBit { get; set; } - - /// - /// Минимальные обороты на ВСП, об/мин. - /// - [Range(5, 200, ErrorMessage = "Минимальные обороты на ВСП, об/мин., должно быть в пределах от 5 до 200")] - public int RevolutionPerMinuteMin { get; set; } - - /// - /// Количество шагов оборотов на ВСП, шт. - /// - [Range(1, 5, ErrorMessage = "Количество шагов оборотов на ВСП, шт., должно быть в пределах от 1 до 5")] - public int NumberOfStepsRPM { get; set; } - - /// - /// Величина проходки шага, м. - /// - [Range(0.1, 2.0, ErrorMessage = "Величина проходки шага, м., должно быть в пределах от 0.1 до 2")] - public double LengthStep { 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/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanStaticMeasurementOutputDto.cs b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanStaticMeasurementOutputDto.cs new file mode 100644 index 00000000..d64366c0 --- /dev/null +++ b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanStaticMeasurementOutputDto.cs @@ -0,0 +1,15 @@ +using System.ComponentModel.DataAnnotations; + +namespace AsbCloudApp.Data.ProcessMaps; + +/// +/// РТК план выход статического замера +/// +public class ProcessMapPlanStaticMeasurementOutputDto : ProcessMapPlanBaseDto +{ + /// + /// Время ожидания выхода сигнала с ТМС, сек. + /// + [Range(0.0, 1800.0, ErrorMessage = "Время ожидания выхода сигнала с ТМС, сек., должно быть в пределах от 0 до 1800")] + public double SignalWaitingTime { get; set; } +} \ No newline at end of file diff --git a/AsbCloudDb/Model/AsbCloudDbContext.cs b/AsbCloudDb/Model/AsbCloudDbContext.cs index 0b5f0870..b9ef96eb 100644 --- a/AsbCloudDb/Model/AsbCloudDbContext.cs +++ b/AsbCloudDb/Model/AsbCloudDbContext.cs @@ -31,7 +31,7 @@ namespace AsbCloudDb.Model public virtual DbSet ProcessMapPlanOperationTFOrientation => Set(); public virtual DbSet ProcessMapPlanOperationSwitchPump => Set(); public virtual DbSet ProcessMapPlanOperationSwitchMode => Set(); - public virtual DbSet ProcessMapPlanFunctionsDrillTest => Set(); + public virtual DbSet ProcessMapPlanFunctionsDrillTest => Set(); public virtual DbSet ProcessMapPlanFunctionsShockTest => Set(); public virtual DbSet ProcessMapPlanFunctionsDamper => Set(); public virtual DbSet ProcessMapPlanFunctionsAutoHold => Set(); @@ -518,7 +518,7 @@ namespace AsbCloudDb.Model .WithMany() .OnDelete(DeleteBehavior.Restrict); - modelBuilder.Entity() + modelBuilder.Entity() .HasOne(p => p.Author) .WithMany() .OnDelete(DeleteBehavior.Restrict); @@ -618,7 +618,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 d58f878a..297f1204 100644 --- a/AsbCloudDb/Model/IAsbCloudDbContext.cs +++ b/AsbCloudDb/Model/IAsbCloudDbContext.cs @@ -92,7 +92,7 @@ namespace AsbCloudDb.Model DbSet ProcessMapPlanOperationTFOrientation { get; } DbSet ProcessMapPlanOperationSwitchPump { get; } DbSet ProcessMapPlanOperationSwitchMode { get; } - DbSet ProcessMapPlanFunctionsDrillTest { get; } + DbSet ProcessMapPlanFunctionsDrillTest { get; } DbSet ProcessMapPlanFunctionsShockTest { get; } DbSet ProcessMapPlanFunctionsDamper { get; } DbSet ProcessMapPlanFunctionsAutoHold { get; } diff --git a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanDrillTest.cs b/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanDrillTest.cs new file mode 100644 index 00000000..487c8a9c --- /dev/null +++ b/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanDrillTest.cs @@ -0,0 +1,41 @@ +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using AsbCloudDb.Model.ProcessMapPlan; +using Microsoft.EntityFrameworkCore; + +namespace AsbCloudDb.Model.ProcessMaps; + +[Table("t_process_map_plan_drilltest"), Comment("DrillTest")] +public class ProcessMapPlanDrillTest : ProcessMapPlanBase +{ + [Column("weight_on_bit_min"), Comment("Нагрузка минимальная, т")] + [Range(1.0, 30.0)] + [Required] + public double WeightOnBitMin { get; set; } + + [Column("weight_on_bit_steps_count"), Comment("Количество шагов по нагрузке")] + [Range(1, 5)] + [Required] + public int WeightOnBitStepsCount { get; set; } + + [Column("rpm_min"), Comment("Минимальные обороты на ВСП, об/мин.")] + [Range(5, 200)] + [Required] + public double RpmMin { get; set; } + + [Column("rpm_steps_count"), Comment("Количество шагов оборотов на ВСП, об/мин.")] + [Range(1, 5)] + [Required] + public int RpmStepsCount { get; set; } + + [Column("length_step"), Comment("Величина проходки шага, м.")] + [Range(0.1, 2.0)] + [Required] + public double LengthStep { get; set; } + + [Column("note"), Comment("Примечание"), StringLength(1024)] + public string Note { get; set; } = string.Empty; + + [ForeignKey(nameof(IdPrevious))] + public virtual ProcessMapPlanDrillTest? Previous { get; set; } +} \ No newline at end of file diff --git a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanFunctionsDrillTest.cs b/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanFunctionsDrillTest.cs deleted file mode 100644 index 810b4ec8..00000000 --- a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanFunctionsDrillTest.cs +++ /dev/null @@ -1,45 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using AsbCloudDb.Model.ProcessMapPlan; -using Microsoft.EntityFrameworkCore; - -namespace AsbCloudDb.Model.ProcessMaps; - -[Table("t_process_map_plan_functions_drilltest"), Comment("Дрилтест")] -public class ProcessMapPlanFunctionsDrillTest : ProcessMapPlanBase -{ - [Column("weight_on_bit_min"), Comment("Нагрузка минимальная, т")] - [Range(1.0, 30.0)] - [Required] - public double WeightOnBitMin { get; set; } - - [Column("number_of_steps_bit"), Comment("Количество шагов по нагрузке")] - [Range(1, 5)] - [Required] - public int NumberOfStepsBit { get; set; } - - [Column("revolution_per_minute_min"), Comment("Минимальные обороты на ВСП, об/мин.")] - [Range(5, 200)] - [Required] - public int RevolutionPerMinuteMin { get; set; } - - [Column("number_of_steps_rpm"), Comment("Количество шагов оборотов на ВСП, шт.")] - [Range(1, 5)] - [Required] - public int NumberOfStepsRPM { get; set; } - - [Column("length_step"), Comment("Величина проходки шага, м.")] - [Range(0.1, 2.0)] - [Required] - public double LengthStep { get; set; } - - [Column("id_autostart_or_warning"), Comment("Автозапуск или Предупреждение")] - [Required] - public bool IdAutostartOrWarning { get; set; } - - [Column("note"), Comment("Примечание"), StringLength(1024)] - public string Note { get; set; } = string.Empty; - - [ForeignKey(nameof(IdPrevious))] - public virtual ProcessMapPlanFunctionsDrillTest? Previous { get; set; } -} \ No newline at end of file diff --git a/AsbCloudInfrastructure/DependencyInjection.cs b/AsbCloudInfrastructure/DependencyInjection.cs index 9ed9a456..f4226d3a 100644 --- a/AsbCloudInfrastructure/DependencyInjection.cs +++ b/AsbCloudInfrastructure/DependencyInjection.cs @@ -209,11 +209,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() @@ -438,7 +438,7 @@ namespace AsbCloudInfrastructure services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -464,7 +464,7 @@ namespace AsbCloudInfrastructure services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -531,8 +531,8 @@ namespace AsbCloudInfrastructure ProcessMapPlanBaseRepository>(); services.AddTransient< - IChangeLogRepository, - ProcessMapPlanBaseRepository>(); + IChangeLogRepository, + ProcessMapPlanBaseRepository>(); services.AddTransient< IChangeLogRepository, @@ -577,7 +577,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/ProcessMapPlanFunctionsDrillTestTemplate.cs b/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanDrillTestTemplate.cs similarity index 66% rename from AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanFunctionsDrillTestTemplate.cs rename to AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanDrillTestTemplate.cs index 0a73fd9a..ffaa5413 100644 --- a/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanFunctionsDrillTestTemplate.cs +++ b/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanDrillTestTemplate.cs @@ -2,13 +2,13 @@ using System.Collections.Generic; namespace AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates; -public class ProcessMapPlanFunctionsDrillTestTemplate : ITemplateParameters +public class ProcessMapPlanDrillTestTemplate : ITemplateParameters { public string SheetName => "Дрилтест"; public int HeaderRowsCount => 2; - public string FileName => "ProcessMapPlanFunctionsDrillTestTemplate.xlsx"; + public string FileName => "ProcessMapPlanDrillTestTemplate.xlsx"; public IDictionary Cells => new Dictionary { diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanFunctionsDrillTestExportService.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanDrillTestExportService.cs similarity index 70% rename from AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanFunctionsDrillTestExportService.cs rename to AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanDrillTestExportService.cs index 40956dad..27d70979 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanFunctionsDrillTestExportService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanDrillTestExportService.cs @@ -10,16 +10,16 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Services.ProcessMapPlan.Export; -public class ProcessMapPlanFunctionsDrillTestExportService : ProcessMapPlanExportService +public class ProcessMapPlanDrillTestExportService : ProcessMapPlanExportService { - public ProcessMapPlanFunctionsDrillTestExportService( - IChangeLogRepository processMapPlanRepository, + public ProcessMapPlanDrillTestExportService( + IChangeLogRepository processMapPlanRepository, IWellService wellService) : base(processMapPlanRepository, wellService) { } - protected override ITemplateParameters TemplateParameters { get; } = new ProcessMapPlanFunctionsDrillTestTemplate(); + protected override ITemplateParameters TemplateParameters { get; } = new ProcessMapPlanDrillTestTemplate(); protected override async Task BuildFileNameAsync(WellRelatedExportRequest options, CancellationToken token) { diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanFunctionsDrillTestParser.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanDrillTestParser.cs similarity index 73% rename from AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanFunctionsDrillTestParser.cs rename to AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanDrillTestParser.cs index adbe8dac..dff5e67f 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanFunctionsDrillTestParser.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanDrillTestParser.cs @@ -9,16 +9,16 @@ using AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemp namespace AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; -public class ProcessMapPlanFunctionsDrillTestParser : ProcessMapPlanParser +public class ProcessMapPlanDrillTestParser : ProcessMapPlanParser { - public ProcessMapPlanFunctionsDrillTestParser(IWellOperationRepository wellOperationRepository) + public ProcessMapPlanDrillTestParser(IWellOperationRepository wellOperationRepository) : base(wellOperationRepository) { } - protected override ITemplateParameters TemplateParameters => new ProcessMapPlanFunctionsDrillTestTemplate(); + protected override ITemplateParameters TemplateParameters => new ProcessMapPlanDrillTestTemplate(); - protected override ProcessMapPlanFunctionsDrillTestDto BuildDto(IDictionary row, int rowNumber) + protected override ProcessMapPlanDrillTestDto BuildDto(IDictionary row, int rowNumber) { var dto = base.BuildDto(row, rowNumber); diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanFunctionsDrillTestControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanDrillTestControllerTest.cs similarity index 53% rename from AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanFunctionsDrillTestControllerTest.cs rename to AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanDrillTestControllerTest.cs index 83611d62..e6817953 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanFunctionsDrillTestControllerTest.cs +++ b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanDrillTestControllerTest.cs @@ -15,29 +15,25 @@ namespace AsbCloudWebApi.Controllers.ProcessMaps; /// /// РТК план дрилтест /// -public class ProcessMapPlanFunctionsDrillTestControllerTest : - ProcessMapPlanBaseControllerTest +public class ProcessMapPlanDrillTestControllerTest : + ProcessMapPlanBaseControllerTest { - public ProcessMapPlanFunctionsDrillTestControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanFunctionsDrillTest") + public ProcessMapPlanDrillTestControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanFunctionsDrillTest") { } - private readonly ProcessMapPlanFunctionsDrillTestDto dto = new ProcessMapPlanFunctionsDrillTestDto() + private readonly ProcessMapPlanDrillTestDto dto = new ProcessMapPlanDrillTestDto() { IdWell = 1, DepthStart = 1, DepthEnd = 2, Id = 0, IdWellSectionType = 1, - IdAutostartOrWarning = true, LengthStep = 1, Note = "1", - NumberOfStepsBit = 1, - NumberOfStepsRPM = 1, - RevolutionPerMinuteMin = 1, WeightOnBitMin = 1 }; - private readonly ProcessMapPlanFunctionsDrillTest entity = new ProcessMapPlanFunctionsDrillTest() + private readonly ProcessMapPlanDrillTest entity = new ProcessMapPlanDrillTest() { IdWell = 1, DepthEnd = 10, @@ -47,12 +43,8 @@ public class ProcessMapPlanFunctionsDrillTestControllerTest : IdAuthor = 1, IdEditor = 1, Creation = DateTimeOffset.UtcNow, - IdAutostartOrWarning = true, LengthStep = 1, Note = "1", - NumberOfStepsBit = 1, - NumberOfStepsRPM = 1, - RevolutionPerMinuteMin = 1, WeightOnBitMin = 1 }; @@ -62,17 +54,17 @@ public class ProcessMapPlanFunctionsDrillTestControllerTest : await Get(entity, dto); } - protected override ProcessMapPlanFunctionsDrillTest GetByNote(DbSet dbSet, ProcessMapPlanFunctionsDrillTestDto dto) + protected override ProcessMapPlanDrillTest GetByNote(DbSet dbSet, ProcessMapPlanDrillTestDto dto) { throw new NotImplementedException(); } - protected override ProcessMapPlanFunctionsDrillTestDto GetByNote(IEnumerable dtos, ProcessMapPlanFunctionsDrillTestDto dto) + protected override ProcessMapPlanDrillTestDto GetByNote(IEnumerable dtos, ProcessMapPlanDrillTestDto dto) { throw new NotImplementedException(); } - protected override ProcessMapPlanFunctionsDrillTest? GetByWellId() + protected override ProcessMapPlanDrillTest? GetByWellId() { throw new NotImplementedException(); } diff --git a/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanFunctionsDrillTestController.cs b/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanDrillTestController.cs similarity index 60% rename from AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanFunctionsDrillTestController.cs rename to AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanDrillTestController.cs index 5249495e..db67d0b5 100644 --- a/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanFunctionsDrillTestController.cs +++ b/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanDrillTestController.cs @@ -11,15 +11,15 @@ namespace AsbCloudWebApi.Controllers.ProcessMaps; /// /// РТК план дрилтест /// -public class ProcessMapPlanFunctionsDrillTestController : - ProcessMapPlanBaseController +public class ProcessMapPlanDrillTestController : + ProcessMapPlanBaseController { - public ProcessMapPlanFunctionsDrillTestController( - IChangeLogRepository repository, + public ProcessMapPlanDrillTestController( + IChangeLogRepository repository, IWellService wellService, - ProcessMapPlanFunctionsDrillTestParser parserService, + ProcessMapPlanDrillTestParser parserService, ITelemetryService telemetryService, - ProcessMapPlanFunctionsDrillTestExportService processMapPlanExportService) + ProcessMapPlanDrillTestExportService processMapPlanExportService) : base(repository, wellService, parserService, processMapPlanExportService, telemetryService) { }