diff --git a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanFunctionsDamperDto.cs b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanFunctionsDamperDto.cs deleted file mode 100644 index 33649bad..00000000 --- a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanFunctionsDamperDto.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace AsbCloudApp.Data.ProcessMaps; - -/// -/// РТК план демпфер -/// -public class ProcessMapPlanFunctionsDamperDto : 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/AsbCloudDb/Model/AsbCloudDbContext.cs b/AsbCloudDb/Model/AsbCloudDbContext.cs index 631e9ffc..3673bff1 100644 --- a/AsbCloudDb/Model/AsbCloudDbContext.cs +++ b/AsbCloudDb/Model/AsbCloudDbContext.cs @@ -33,7 +33,7 @@ namespace AsbCloudDb.Model public virtual DbSet ProcessMapPlanOperationSwitchMode => Set(); public virtual DbSet ProcessMapPlanFunctionsDrillTest => Set(); public virtual DbSet ProcessMapPlanFunctionsShockTest => Set(); - public virtual DbSet ProcessMapPlanFunctionsDamper => Set(); + public virtual DbSet ProcessMapPlanFunctionsDamper => Set(); public virtual DbSet ProcessMapPlanFunctionsAutoHold => Set(); public virtual DbSet ProcessMapPlanFunctionsJarrDrillTool => Set(); public virtual DbSet ProcessMapPlanFunctionsUpgradeNoload => Set(); @@ -528,7 +528,7 @@ namespace AsbCloudDb.Model .WithMany() .OnDelete(DeleteBehavior.Restrict); - modelBuilder.Entity() + modelBuilder.Entity() .HasOne(p => p.Author) .WithMany() .OnDelete(DeleteBehavior.Restrict); @@ -628,7 +628,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 19f5e2d9..43f309d9 100644 --- a/AsbCloudDb/Model/IAsbCloudDbContext.cs +++ b/AsbCloudDb/Model/IAsbCloudDbContext.cs @@ -94,7 +94,7 @@ namespace AsbCloudDb.Model DbSet ProcessMapPlanOperationSwitchMode { get; } DbSet ProcessMapPlanFunctionsDrillTest { get; } DbSet ProcessMapPlanFunctionsShockTest { get; } - DbSet ProcessMapPlanFunctionsDamper { get; } + DbSet ProcessMapPlanFunctionsDamper { get; } DbSet ProcessMapPlanFunctionsAutoHold { get; } DbSet ProcessMapPlanFunctionsJarrDrillTool { get; } DbSet ProcessMapPlanFunctionsUpgradeNoload { get; } diff --git a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanFunctionsDamper.cs b/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanDamper.cs similarity index 74% rename from AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanFunctionsDamper.cs rename to AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanDamper.cs index 5a2f94f3..11f9547f 100644 --- a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanFunctionsDamper.cs +++ b/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanDamper.cs @@ -6,9 +6,9 @@ using Microsoft.EntityFrameworkCore; namespace AsbCloudDb.Model.ProcessMaps; [Table("t_process_map_plan_functions_damper"), Comment("Демпфер")] -public class ProcessMapPlanFunctionsDamper : ProcessMapPlanBase +public class ProcessMapPlanDamper : ProcessMapPlanBase { - [Column("stickslip"), Comment("StickSlip")] + [Column("stick_slip"), Comment("StickSlip")] [Range(0.0, 1000.0)] [Required] public double StickSlip { get; set; } @@ -17,5 +17,5 @@ public class ProcessMapPlanFunctionsDamper : ProcessMapPlanBase public string Note { get; set; } = string.Empty; [ForeignKey(nameof(IdPrevious))] - public virtual ProcessMapPlanFunctionsDamper? Previous { get; set; } + public virtual ProcessMapPlanDamper? Previous { get; set; } } \ No newline at end of file diff --git a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanShockTest.cs b/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanShockTest.cs index 3897b468..14a107ad 100644 --- a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanShockTest.cs +++ b/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanShockTest.cs @@ -8,7 +8,7 @@ namespace AsbCloudDb.Model.ProcessMaps; [Table("t_process_map_shock_test"), Comment("ShockTest")] public class ProcessMapPlanShockTest : ProcessMapPlanBase { - [Column("stickSlip"), Comment("stickSlip")] + [Column("stick_slip"), Comment("stickSlip")] [Range(0.0, 1000.0)] [Required] public double StickSlip { get; set; } diff --git a/AsbCloudInfrastructure/DependencyInjection.cs b/AsbCloudInfrastructure/DependencyInjection.cs index cd9694b9..07664bd8 100644 --- a/AsbCloudInfrastructure/DependencyInjection.cs +++ b/AsbCloudInfrastructure/DependencyInjection.cs @@ -223,11 +223,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() @@ -440,7 +440,7 @@ namespace AsbCloudInfrastructure services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -466,7 +466,7 @@ namespace AsbCloudInfrastructure services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -539,8 +539,8 @@ namespace AsbCloudInfrastructure ProcessMapPlanBaseRepository>(); services.AddTransient< - IChangeLogRepository, - ProcessMapPlanBaseRepository>(); + IChangeLogRepository, + ProcessMapPlanBaseRepository>(); services.AddTransient< IChangeLogRepository, @@ -579,7 +579,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/ProcessMapPlanFunctionsDamperTemplate.cs b/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanDamperTemplate.cs similarity index 67% rename from AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanFunctionsDamperTemplate.cs rename to AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanDamperTemplate.cs index e5bb03e5..6f74c38f 100644 --- a/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanFunctionsDamperTemplate.cs +++ b/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanDamperTemplate.cs @@ -2,13 +2,13 @@ using System.Collections.Generic; namespace AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates; -public class ProcessMapPlanFunctionsDamperTemplate : ITemplateParameters +public class ProcessMapPlanDamperTemplate : ITemplateParameters { public string SheetName => "Демпфер"; public int HeaderRowsCount => 2; - public string FileName => "ProcessMapPlanFunctionsDamperTemplate.xlsx"; + public string FileName => "ProcessMapPlanDamperTemplate.xlsx"; public IDictionary Cells => new Dictionary { diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanFunctionsDamperExportService.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanDamperExportService.cs similarity index 71% rename from AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanFunctionsDamperExportService.cs rename to AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanDamperExportService.cs index f05c130c..cf9f9b35 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanFunctionsDamperExportService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanDamperExportService.cs @@ -10,16 +10,16 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Services.ProcessMapPlan.Export; -public class ProcessMapPlanFunctionsDamperExportService : ProcessMapPlanExportService +public class ProcessMapPlanDamperExportService : ProcessMapPlanExportService { - public ProcessMapPlanFunctionsDamperExportService( - IChangeLogRepository processMapPlanRepository, + public ProcessMapPlanDamperExportService( + IChangeLogRepository processMapPlanRepository, IWellService wellService) : base(processMapPlanRepository, wellService) { } - protected override ITemplateParameters TemplateParameters { get; } = new ProcessMapPlanFunctionsDamperTemplate(); + protected override ITemplateParameters TemplateParameters { get; } = new ProcessMapPlanDamperTemplate(); protected override async Task BuildFileNameAsync(WellRelatedExportRequest options, CancellationToken token) { diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanFunctionsDamperParser.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanDamperParser.cs similarity index 74% rename from AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanFunctionsDamperParser.cs rename to AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanDamperParser.cs index d57c3055..c3add6de 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanFunctionsDamperParser.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanDamperParser.cs @@ -9,16 +9,16 @@ using AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemp namespace AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; -public class ProcessMapPlanFunctionsDamperParser : ProcessMapPlanParser +public class ProcessMapPlanDamperParser : ProcessMapPlanParser { - public ProcessMapPlanFunctionsDamperParser(IWellOperationRepository wellOperationRepository) + public ProcessMapPlanDamperParser(IWellOperationRepository wellOperationRepository) : base(wellOperationRepository) { } - protected override ITemplateParameters TemplateParameters => new ProcessMapPlanFunctionsDamperTemplate(); + protected override ITemplateParameters TemplateParameters => new ProcessMapPlanDamperTemplate(); - protected override ProcessMapPlanFunctionsDamperDto BuildDto(IDictionary row, int rowNumber) + protected override ProcessMapPlanDamperDto BuildDto(IDictionary row, int rowNumber) { var dto = base.BuildDto(row, rowNumber); diff --git a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanFunctionsDamperControllerTest.cs b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanDamperControllerTest.cs similarity index 59% rename from AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanFunctionsDamperControllerTest.cs rename to AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanDamperControllerTest.cs index c7146ed4..16b3755f 100644 --- a/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanFunctionsDamperControllerTest.cs +++ b/AsbCloudWebApi.IntegrationTests/Controllers/ProcessMapPlan/ProcessMapPlanDamperControllerTest.cs @@ -15,13 +15,13 @@ namespace AsbCloudWebApi.Controllers.ProcessMaps; /// /// РТК план демпфер /// -public class ProcessMapPlanFunctionsDamperControllerTest : - ProcessMapPlanBaseControllerTest +public class ProcessMapPlanDamperControllerTest : + ProcessMapPlanBaseControllerTest { - public ProcessMapPlanFunctionsDamperControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanFunctionsDamper") + public ProcessMapPlanDamperControllerTest(WebAppFactoryFixture factory) : base(factory, "ProcessMapPlanFunctionsDamper") { } - private readonly ProcessMapPlanFunctionsDamperDto dto = new ProcessMapPlanFunctionsDamperDto() + private readonly ProcessMapPlanDamperDto dto = new ProcessMapPlanDamperDto() { IdWell = 1, DepthStart = 1, @@ -32,7 +32,7 @@ public class ProcessMapPlanFunctionsDamperControllerTest : StickSlip = 1 }; - private readonly ProcessMapPlanFunctionsDamper entity = new ProcessMapPlanFunctionsDamper() + private readonly ProcessMapPlanDamper entity = new ProcessMapPlanDamper() { IdWell = 1, DepthEnd = 10, @@ -52,17 +52,17 @@ public class ProcessMapPlanFunctionsDamperControllerTest : await Get(entity, dto); } - protected override ProcessMapPlanFunctionsDamper GetByNote(DbSet dbSet, ProcessMapPlanFunctionsDamperDto dto) + protected override ProcessMapPlanDamper GetByNote(DbSet dbSet, ProcessMapPlanDamperDto dto) { throw new NotImplementedException(); } - protected override ProcessMapPlanFunctionsDamperDto GetByNote(IEnumerable dtos, ProcessMapPlanFunctionsDamperDto dto) + protected override ProcessMapPlanDamperDto GetByNote(IEnumerable dtos, ProcessMapPlanDamperDto dto) { throw new NotImplementedException(); } - protected override ProcessMapPlanFunctionsDamper? GetByWellId() + protected override ProcessMapPlanDamper? GetByWellId() { throw new NotImplementedException(); } diff --git a/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanFunctionsDamperController.cs b/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanDamperController.cs similarity index 61% rename from AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanFunctionsDamperController.cs rename to AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanDamperController.cs index f9a13a4f..2a12cd88 100644 --- a/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanFunctionsDamperController.cs +++ b/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanDamperController.cs @@ -11,15 +11,15 @@ namespace AsbCloudWebApi.Controllers.ProcessMaps; /// /// РТК план демпфер /// -public class ProcessMapPlanFunctionsDamperController : - ProcessMapPlanBaseController +public class ProcessMapPlanDamperController : + ProcessMapPlanBaseController { - public ProcessMapPlanFunctionsDamperController( - IChangeLogRepository repository, + public ProcessMapPlanDamperController( + IChangeLogRepository repository, IWellService wellService, - ProcessMapPlanFunctionsDamperParser parserService, + ProcessMapPlanDamperParser parserService, ITelemetryService telemetryService, - ProcessMapPlanFunctionsDamperExportService processMapPlanExportService) + ProcessMapPlanDamperExportService processMapPlanExportService) : base(repository, wellService, parserService, processMapPlanExportService, telemetryService) { }