From a8177fc0765bab833bd11d1525741e9a1c6c5670 Mon Sep 17 00:00:00 2001 From: Olga Nemt Date: Tue, 25 Jun 2024 17:11:30 +0500 Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=BE=D0=BD=D1=81=D1=82=D1=80=D1=83?= =?UTF-8?q?=D0=BA=D1=86=D0=B8=D1=8F=20=D1=81=D0=BA=D0=B2=D0=B0=D0=B6=D0=B8?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=B7=D0=B0=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B0?= =?UTF-8?q?=20=D0=BD=D0=B0=20"=D0=92=D1=8B=D1=85=D0=BE=D0=B4=20=D0=BD?= =?UTF-8?q?=D0=B0=20=D1=80=D0=B5=D0=B6=D0=B8=D0=BC"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AsbCloudDb/Model/AsbCloudDbContext.cs | 6 +++--- AsbCloudDb/Model/IAsbCloudDbContext.cs | 2 +- ...cs => ProcessMapPlanOperationSwitchMode.cs} | 4 ++-- AsbCloudInfrastructure/DependencyInjection.cs | 18 +++++++++--------- ...ocessMapPlanOperationSwitchModeTemplate.cs} | 6 +++--- ...MapPlanOperationSwitchModeExportService.cs} | 10 +++++----- ...ProcessMapPlanOperationSwitchModeParser.cs} | 8 ++++---- ...essMapPlanOperationSwitchModeController.cs} | 16 ++++++++-------- 8 files changed, 35 insertions(+), 35 deletions(-) rename AsbCloudDb/Model/ProcessMapPlan/{ProcessMapPlanSection.cs => ProcessMapPlanOperationSwitchMode.cs} (82%) rename AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/{ProcessMapPlanSectionTemplate.cs => ProcessMapPlanOperationSwitchModeTemplate.cs} (54%) rename AsbCloudInfrastructure/Services/ProcessMapPlan/Export/{ProcessMapPlanSectionExportService.cs => ProcessMapPlanOperationSwitchModeExportService.cs} (64%) rename AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/{ProcessMapPlanSectionParser.cs => ProcessMapPlanOperationSwitchModeParser.cs} (73%) rename AsbCloudWebApi/Controllers/ProcessMaps/{ProcessMapPlanSectionController.cs => ProcessMapPlanOperationSwitchModeController.cs} (51%) diff --git a/AsbCloudDb/Model/AsbCloudDbContext.cs b/AsbCloudDb/Model/AsbCloudDbContext.cs index a56b91e7..37bc58b2 100644 --- a/AsbCloudDb/Model/AsbCloudDbContext.cs +++ b/AsbCloudDb/Model/AsbCloudDbContext.cs @@ -30,7 +30,7 @@ namespace AsbCloudDb.Model public virtual DbSet ProcessMapPlanOperationDeterminationOfOscillationAngles => Set(); public virtual DbSet ProcessMapPlanOperationTFOrientation => Set(); public virtual DbSet ProcessMapPlanOperationSwitchPump => Set(); - public virtual DbSet ProcessMapPlanSection => Set(); + public virtual DbSet ProcessMapPlanSection => Set(); public virtual DbSet DrillingProgramParts => Set(); public virtual DbSet FileCategories => Set(); public virtual DbSet Files => Set(); @@ -502,7 +502,7 @@ namespace AsbCloudDb.Model .WithMany() .OnDelete(DeleteBehavior.Restrict); - modelBuilder.Entity() + modelBuilder.Entity() .HasOne(p => p.Author) .WithMany() .OnDelete(DeleteBehavior.Restrict); @@ -557,7 +557,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 577da8b8..e22fd544 100644 --- a/AsbCloudDb/Model/IAsbCloudDbContext.cs +++ b/AsbCloudDb/Model/IAsbCloudDbContext.cs @@ -91,7 +91,7 @@ namespace AsbCloudDb.Model DbSet ProcessMapPlanOperationDeterminationOfOscillationAngles { get; } DbSet ProcessMapPlanOperationTFOrientation { get; } DbSet ProcessMapPlanOperationSwitchPump { get; } - DbSet ProcessMapPlanSection { get; } + DbSet ProcessMapPlanSection { get; } Task RefreshMaterializedViewAsync(string mwName, CancellationToken token); Task RefreshMaterializedViewAsync(CancellationToken token) where TEntity : class; diff --git a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanSection.cs b/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanOperationSwitchMode.cs similarity index 82% rename from AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanSection.cs rename to AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanOperationSwitchMode.cs index 2c236aca..78351caf 100644 --- a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanSection.cs +++ b/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanOperationSwitchMode.cs @@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore; namespace AsbCloudDb.Model.ProcessMaps; [Table("t_process_map_plan_section"), Comment("Конструкция скважины")] -public class ProcessMapPlanSection : ProcessMapPlanBase +public class ProcessMapPlanOperationSwitchMode : ProcessMapPlanBase { [Column("outer_diameter"), Comment("Диаметр секции, мм., наружный")] [Range(0.0, 9999.9)] @@ -18,5 +18,5 @@ public class ProcessMapPlanSection : ProcessMapPlanBase [ForeignKey(nameof(IdPrevious))] - public virtual ProcessMapPlanSection? Previous { get; set; } + public virtual ProcessMapPlanOperationSwitchMode? Previous { get; set; } } \ No newline at end of file diff --git a/AsbCloudInfrastructure/DependencyInjection.cs b/AsbCloudInfrastructure/DependencyInjection.cs index 7ca58492..30caa355 100644 --- a/AsbCloudInfrastructure/DependencyInjection.cs +++ b/AsbCloudInfrastructure/DependencyInjection.cs @@ -202,11 +202,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() }); } @@ -310,8 +310,8 @@ namespace AsbCloudInfrastructure ProcessMapPlanBaseRepository>(); services.AddTransient< - IChangeLogRepository, - ProcessMapPlanBaseRepository>(); + IChangeLogRepository, + ProcessMapPlanBaseRepository>(); services.AddTransient(); @@ -368,7 +368,7 @@ namespace AsbCloudInfrastructure services.AddTransient>(); services.AddTransient>(); services.AddTransient>(); - services.AddTransient>(); + services.AddTransient>(); services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -433,7 +433,7 @@ namespace AsbCloudInfrastructure services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -450,7 +450,7 @@ namespace AsbCloudInfrastructure services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); diff --git a/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanSectionTemplate.cs b/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanOperationSwitchModeTemplate.cs similarity index 54% rename from AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanSectionTemplate.cs rename to AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanOperationSwitchModeTemplate.cs index 7a0237a6..f902678a 100644 --- a/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanSectionTemplate.cs +++ b/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanOperationSwitchModeTemplate.cs @@ -2,13 +2,13 @@ using System.Collections.Generic; namespace AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates; -public class ProcessMapPlanSectionTemplate : ITemplateParameters +public class ProcessMapPlanOperationSwitchModeTemplate : ITemplateParameters { - public string SheetName => "Конструкция скважины"; + public string SheetName => "Выход на режим"; public int HeaderRowsCount => 2; - public string FileName => "ProcessMapPlanSectionTemplate.xlsx"; + public string FileName => "ProcessMapPlanOperationSwitchModeTemplate.xlsx"; public IDictionary Cells => new Dictionary { diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanSectionExportService.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanOperationSwitchModeExportService.cs similarity index 64% rename from AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanSectionExportService.cs rename to AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanOperationSwitchModeExportService.cs index bcd29a08..fbf81245 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanSectionExportService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanOperationSwitchModeExportService.cs @@ -10,21 +10,21 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Services.ProcessMapPlan.Export; -public class ProcessMapPlanSectionExportService : ProcessMapPlanExportService +public class ProcessMapPlanOperationSwitchModeExportService : ProcessMapPlanExportService { - public ProcessMapPlanSectionExportService( - IChangeLogRepository processMapPlanRepository, + public ProcessMapPlanOperationSwitchModeExportService( + IChangeLogRepository processMapPlanRepository, IWellService wellService) : base(processMapPlanRepository, wellService) { } - protected override ITemplateParameters TemplateParameters { get; } = new ProcessMapPlanSectionTemplate(); + protected override ITemplateParameters TemplateParameters { get; } = new ProcessMapPlanOperationSwitchModeTemplate(); protected override async Task BuildFileNameAsync(WellRelatedExportRequest options, CancellationToken token) { var caption = await wellService.GetWellCaptionByIdAsync(options.IdWell, token); - return $"{caption}_РТК_План_конструкция_скважины.xlsx"; + return $"{caption}_РТК_План_выход_на_режим.xlsx"; } } \ No newline at end of file diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanSectionParser.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanOperationSwitchModeParser.cs similarity index 73% rename from AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanSectionParser.cs rename to AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanOperationSwitchModeParser.cs index 6164a153..b7ba441c 100644 --- a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanSectionParser.cs +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanOperationSwitchModeParser.cs @@ -9,16 +9,16 @@ using AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemp namespace AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; -public class ProcessMapPlanSectionParser : ProcessMapPlanParser +public class ProcessMapPlanOperationSwitchModeParser : ProcessMapPlanParser { - public ProcessMapPlanSectionParser(IWellOperationRepository wellOperationRepository) + public ProcessMapPlanOperationSwitchModeParser(IWellOperationRepository wellOperationRepository) : base(wellOperationRepository) { } - protected override ITemplateParameters TemplateParameters => new ProcessMapPlanSectionTemplate(); + protected override ITemplateParameters TemplateParameters => new ProcessMapPlanOperationSwitchModeTemplate(); - protected override ProcessMapPlanSectionDto BuildDto(IDictionary row, int rowNumber) + protected override ProcessMapPlanOperationSwitchModeDto BuildDto(IDictionary row, int rowNumber) { var dto = base.BuildDto(row, rowNumber); diff --git a/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanSectionController.cs b/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanOperationSwitchModeController.cs similarity index 51% rename from AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanSectionController.cs rename to AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanOperationSwitchModeController.cs index 361f44d9..91b5629f 100644 --- a/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanSectionController.cs +++ b/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanOperationSwitchModeController.cs @@ -9,20 +9,20 @@ using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; namespace AsbCloudWebApi.Controllers.ProcessMaps; /// -/// РТК план конструкция скважины +/// РТК план выход на режим /// -public class ProcessMapPlanSectionController : - ProcessMapPlanBaseController +public class ProcessMapPlanOperationSwitchModeController : + ProcessMapPlanBaseController { - public ProcessMapPlanSectionController( - IChangeLogRepository repository, + public ProcessMapPlanOperationSwitchModeController( + IChangeLogRepository repository, IWellService wellService, - ProcessMapPlanSectionParser parserService, + ProcessMapPlanOperationSwitchModeParser parserService, ITelemetryService telemetryService, - ProcessMapPlanSectionExportService processMapPlanExportService) + ProcessMapPlanOperationSwitchModeExportService processMapPlanExportService) : base(repository, wellService, parserService, processMapPlanExportService, telemetryService) { } - protected override string TemplateFileName => "ЕЦП_шаблон_файла_РТК_план_конструкция_скважины.xlsx"; + protected override string TemplateFileName => "ЕЦП_шаблон_файла_РТК_план_выход_на_режим.xlsx"; } \ No newline at end of file