diff --git a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanAntiCrashRotationDto.cs b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanAntiCrashRotationDto.cs new file mode 100644 index 00000000..e108dbb8 --- /dev/null +++ b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanAntiCrashRotationDto.cs @@ -0,0 +1,27 @@ +using System.ComponentModel.DataAnnotations; + +namespace AsbCloudApp.Data.ProcessMaps; + +/// +/// РТК план противоаварийное вращение +/// +public class ProcessMapPlanAntiCrashRotationDto : ProcessMapPlanBaseDto +{ + /// + /// Минимальные обороты ВСП, об/мин + /// + [Range(0.0, 250.0, ErrorMessage = "Минимальные обороты ВСП, об/мин., должно быть в пределах от 0 до 250")] + public double TopDriveRpmMin { get; set; } + + /// + /// Минимальный расход для запуска оборотов ВСП, л/сек + /// + [Range(0.0, 100.0, ErrorMessage = "Минимальный расход для запуска оборотов ВСП, л/сек., должно быть в пределах от 0 до 100")] + public double TopDriveStartMinFlowRate { get; set; } + + /// + /// Максимально допустимый момент на ВСП при противоаварийном вращении, кН*м + /// + [Range(1.0, 35.0, ErrorMessage = "Максимально допустимый момент на ВСП при противоаварийном вращении, кН*м., должно быть в пределах от 1 до 35")] + public double TopDriveTorqueMax { get; set; } +} \ No newline at end of file diff --git a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanFunctionsUpgradeNoloadDto.cs b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanFunctionsUpgradeNoloadDto.cs deleted file mode 100644 index f8199e8d..00000000 --- a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanFunctionsUpgradeNoloadDto.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace AsbCloudApp.Data.ProcessMaps; - -/// -/// РТК план обновление холостого хода -/// -public class ProcessMapPlanFunctionsUpgradeNoloadDto : ProcessMapPlanBaseDto -{ - /// - /// СПУСК ОК Да/Нет - /// - public bool IdDeclineSocketColumn { 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 81510bbd..95d51216 100644 --- a/AsbCloudDb/Model/AsbCloudDbContext.cs +++ b/AsbCloudDb/Model/AsbCloudDbContext.cs @@ -36,7 +36,7 @@ namespace AsbCloudDb.Model public virtual DbSet ProcessMapPlanFunctionsDamper => Set(); public virtual DbSet ProcessMapPlanFunctionsAutoHold => Set(); public virtual DbSet ProcessMapPlanFunctionsJarrDrillTool => Set(); - public virtual DbSet ProcessMapPlanFunctionsUpgradeNoload => Set(); + public virtual DbSet ProcessMapPlanFunctionsUpgradeNoload => Set(); public virtual DbSet ProcessMapPlanFunctionsOscillation => Set(); public virtual DbSet ProcessMapPlanFunctionsAnticrashRotation => Set(); public virtual DbSet ProcessMapPlanFunctionsStaticMeasure => Set(); @@ -543,7 +543,7 @@ namespace AsbCloudDb.Model .WithMany() .OnDelete(DeleteBehavior.Restrict); - modelBuilder.Entity() + modelBuilder.Entity() .HasOne(p => p.Author) .WithMany() .OnDelete(DeleteBehavior.Restrict); @@ -643,7 +643,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 7afd557a..5a764be3 100644 --- a/AsbCloudDb/Model/IAsbCloudDbContext.cs +++ b/AsbCloudDb/Model/IAsbCloudDbContext.cs @@ -97,7 +97,7 @@ namespace AsbCloudDb.Model DbSet ProcessMapPlanFunctionsDamper { get; } DbSet ProcessMapPlanFunctionsAutoHold { get; } DbSet ProcessMapPlanFunctionsJarrDrillTool { get; } - DbSet ProcessMapPlanFunctionsUpgradeNoload { get; } + DbSet ProcessMapPlanFunctionsUpgradeNoload { get; } DbSet ProcessMapPlanFunctionsOscillation { get; } DbSet ProcessMapPlanFunctionsAnticrashRotation { get; } DbSet ProcessMapPlanFunctionsStaticMeasure { get; } diff --git a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanFunctionsUpgradeNoload.cs b/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanUpdatingNoloadParameters.cs similarity index 65% rename from AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanFunctionsUpgradeNoload.cs rename to AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanUpdatingNoloadParameters.cs index 84f5a2b0..3be496df 100644 --- a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanFunctionsUpgradeNoload.cs +++ b/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanUpdatingNoloadParameters.cs @@ -5,8 +5,8 @@ using Microsoft.EntityFrameworkCore; namespace AsbCloudDb.Model.ProcessMaps; -[Table("t_process_map_plan_functions_upgrade_no_load"), Comment("Обновление холостого хода")] -public class ProcessMapPlanFunctionsUpgradeNoload : ProcessMapPlanBase +[Table("t_process_map_plan_updating_noload_parameters"), Comment("Обновление холостого хода")] +public class ProcessMapPlanUpdatingNoloadParameters : ProcessMapPlanBase { [Column("id_decline_socket_column"), Comment("СПУСК ОК Да/Нет")] public bool IdDeclineSocketColumn { get; set; } @@ -15,5 +15,5 @@ public class ProcessMapPlanFunctionsUpgradeNoload : ProcessMapPlanBase public string Note { get; set; } = string.Empty; [ForeignKey(nameof(IdPrevious))] - public virtual ProcessMapPlanFunctionsUpgradeNoload? Previous { get; set; } + public virtual ProcessMapPlanUpdatingNoloadParameters? Previous { get; set; } } \ No newline at end of file diff --git a/AsbCloudInfrastructure/DependencyInjection.cs b/AsbCloudInfrastructure/DependencyInjection.cs index 62172873..216354c3 100644 --- a/AsbCloudInfrastructure/DependencyInjection.cs +++ b/AsbCloudInfrastructure/DependencyInjection.cs @@ -244,11 +244,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() @@ -443,7 +443,7 @@ namespace AsbCloudInfrastructure services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -469,7 +469,7 @@ namespace AsbCloudInfrastructure services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -551,8 +551,8 @@ namespace AsbCloudInfrastructure ProcessMapPlanBaseRepository>(); services.AddTransient< - IChangeLogRepository, - ProcessMapPlanBaseRepository>(); + IChangeLogRepository, + ProcessMapPlanBaseRepository>(); services.AddTransient< IChangeLogRepository, @@ -582,7 +582,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/ProcessMapPlanFunctionsUpgradeNoloadTemplate.cs b/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanUpdatingNoloadParametersTemplate.cs similarity index 67% rename from AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanFunctionsUpgradeNoloadTemplate.cs rename to AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanUpdatingNoloadParametersTemplate.cs index c24bcb58..5082629c 100644 --- a/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanFunctionsUpgradeNoloadTemplate.cs +++ b/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanUpdatingNoloadParametersTemplate.cs @@ -2,13 +2,13 @@ using System.Collections.Generic; namespace AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates; -public class ProcessMapPlanFunctionsUpgradeNoloadTemplate : ITemplateParameters +public class ProcessMapPlanUpdatingNoloadParametersTemplate : ITemplateParameters { public string SheetName => "Обновление холостого хода"; public int HeaderRowsCount => 2; - public string FileName => "ProcessMapPlanFunctionsUpgradeNoloadTemplate.xlsx"; + public string FileName => "ProcessMapPlanUpdatingNoloadParametersTemplate.xlsx"; public IDictionary Cells => new Dictionary { diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanFunctionsUpgradeNoloadExportService.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanUpdatingNoloadParametersExportService.cs similarity index 69% rename from AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanFunctionsUpgradeNoloadExportService.cs rename to AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanUpdatingNoloadParametersExportService.cs index 234cc860..1d30dfb3 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanFunctionsUpgradeNoloadExportService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanUpdatingNoloadParametersExportService.cs @@ -10,16 +10,16 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Services.ProcessMapPlan.Export; -public class ProcessMapPlanFunctionsUpgradeNoloadExportService : ProcessMapPlanExportService +public class ProcessMapPlanUpdatingNoloadParametersExportService : ProcessMapPlanExportService { - public ProcessMapPlanFunctionsUpgradeNoloadExportService( - IChangeLogRepository processMapPlanRepository, + public ProcessMapPlanUpdatingNoloadParametersExportService( + IChangeLogRepository processMapPlanRepository, IWellService wellService) : base(processMapPlanRepository, wellService) { } - protected override ITemplateParameters TemplateParameters { get; } = new ProcessMapPlanFunctionsUpgradeNoloadTemplate(); + protected override ITemplateParameters TemplateParameters { get; } = new ProcessMapPlanUpdatingNoloadParametersTemplate(); protected override async Task BuildFileNameAsync(WellRelatedExportRequest options, CancellationToken token) { diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanFunctionsUpgradeNoloadParser.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanUpdatingNoloadParametersParser.cs similarity index 72% rename from AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanFunctionsUpgradeNoloadParser.cs rename to AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanUpdatingNoloadParametersParser.cs index ceb500a1..1ba6f743 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanFunctionsUpgradeNoloadParser.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanUpdatingNoloadParametersParser.cs @@ -9,16 +9,16 @@ using AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemp namespace AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; -public class ProcessMapPlanFunctionsUpgradeNoloadParser : ProcessMapPlanParser +public class ProcessMapPlanUpdatingNoloadParametersParser : ProcessMapPlanParser { - public ProcessMapPlanFunctionsUpgradeNoloadParser(IWellOperationRepository wellOperationRepository) + public ProcessMapPlanUpdatingNoloadParametersParser(IWellOperationRepository wellOperationRepository) : base(wellOperationRepository) { } - protected override ITemplateParameters TemplateParameters => new ProcessMapPlanFunctionsUpgradeNoloadTemplate(); + protected override ITemplateParameters TemplateParameters => new ProcessMapPlanUpdatingNoloadParametersTemplate(); - protected override ProcessMapPlanFunctionsUpgradeNoloadDto BuildDto(IDictionary row, int rowNumber) + protected override ProcessMapPlanUpdatingNoloadParametersDto BuildDto(IDictionary row, int rowNumber) { var dto = base.BuildDto(row, rowNumber); diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanFunctionsUpgradeNoloadControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanUpdatingNoloadParametersControllerTest.cs similarity index 57% rename from AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanFunctionsUpgradeNoloadControllerTest.cs rename to AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanUpdatingNoloadParametersControllerTest.cs index 12f73ddc..9850539d 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanFunctionsUpgradeNoloadControllerTest.cs +++ b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanUpdatingNoloadParametersControllerTest.cs @@ -15,13 +15,13 @@ namespace AsbCloudWebApi.Controllers.ProcessMaps; /// /// РТК план обновление холостого хода /// -public class ProcessMapPlanFunctionsUpgradeNoloadControllerTest : - ProcessMapPlanBaseControllerTest +public class ProcessMapPlanUpdatingNoloadParametersControllerTest : + ProcessMapPlanBaseControllerTest { - public ProcessMapPlanFunctionsUpgradeNoloadControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanFunctionsUpgradeNoload") + public ProcessMapPlanUpdatingNoloadParametersControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanFunctionsUpgradeNoload") { } - private readonly ProcessMapPlanFunctionsUpgradeNoloadDto dto = new ProcessMapPlanFunctionsUpgradeNoloadDto() + private readonly ProcessMapPlanUpdatingNoloadParametersDto dto = new ProcessMapPlanUpdatingNoloadParametersDto() { IdWell = 1, DepthStart = 1, @@ -32,7 +32,7 @@ public class ProcessMapPlanFunctionsUpgradeNoloadControllerTest : Note = "1" }; - private readonly ProcessMapPlanFunctionsUpgradeNoload entity = new ProcessMapPlanFunctionsUpgradeNoload() + private readonly ProcessMapPlanUpdatingNoloadParameters entity = new ProcessMapPlanUpdatingNoloadParameters() { IdWell = 1, DepthEnd = 10, @@ -52,17 +52,17 @@ public class ProcessMapPlanFunctionsUpgradeNoloadControllerTest : await Get(entity, dto); } - protected override ProcessMapPlanFunctionsUpgradeNoload GetByNote(DbSet dbSet, ProcessMapPlanFunctionsUpgradeNoloadDto dto) + protected override ProcessMapPlanUpdatingNoloadParameters GetByNote(DbSet dbSet, ProcessMapPlanUpdatingNoloadParametersDto dto) { throw new NotImplementedException(); } - protected override ProcessMapPlanFunctionsUpgradeNoloadDto GetByNote(IEnumerable dtos, ProcessMapPlanFunctionsUpgradeNoloadDto dto) + protected override ProcessMapPlanUpdatingNoloadParametersDto GetByNote(IEnumerable dtos, ProcessMapPlanUpdatingNoloadParametersDto dto) { throw new NotImplementedException(); } - protected override ProcessMapPlanFunctionsUpgradeNoload? GetByWellId() + protected override ProcessMapPlanUpdatingNoloadParameters? GetByWellId() { throw new NotImplementedException(); } diff --git a/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanFunctionsUpgradeNoloadController.cs b/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanUpdatingNoloadParametersController.cs similarity index 60% rename from AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanFunctionsUpgradeNoloadController.cs rename to AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanUpdatingNoloadParametersController.cs index 9d4200b2..3604f57a 100644 --- a/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanFunctionsUpgradeNoloadController.cs +++ b/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanUpdatingNoloadParametersController.cs @@ -11,15 +11,15 @@ namespace AsbCloudWebApi.Controllers.ProcessMaps; /// /// РТК план обновление холостого хода /// -public class ProcessMapPlanFunctionsUpgradeNoloadController : - ProcessMapPlanBaseController +public class ProcessMapPlanUpdatingNoloadParametersController : + ProcessMapPlanBaseController { - public ProcessMapPlanFunctionsUpgradeNoloadController( - IChangeLogRepository repository, + public ProcessMapPlanUpdatingNoloadParametersController( + IChangeLogRepository repository, IWellService wellService, - ProcessMapPlanFunctionsUpgradeNoloadParser parserService, + ProcessMapPlanUpdatingNoloadParametersParser parserService, ITelemetryService telemetryService, - ProcessMapPlanFunctionsUpgradeNoloadExportService processMapPlanExportService) + ProcessMapPlanUpdatingNoloadParametersExportService processMapPlanExportService) : base(repository, wellService, parserService, processMapPlanExportService, telemetryService) { }