From 328f580100fef44fd7e5bd7b06646e7997b8ab64 Mon Sep 17 00:00:00 2001 From: Olga Nemt Date: Mon, 24 Jun 2024 16:05:45 +0500 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D1=80=D0=B0=D0=B1=D0=BE?= =?UTF-8?q?=D1=82=D0=BA=D0=B0=20=D1=81=D0=BB=D0=B0=D0=B9=D0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AsbCloudDb/Model/AsbCloudDbContext.cs | 21 +++ AsbCloudDb/Model/IAsbCloudDbContext.cs | 3 + .../ProcessMapPlanOperationReamingSlide.cs | 158 ++++++++++++++++++ AsbCloudInfrastructure/DependencyInjection.cs | 21 +++ ...essMapPlanOperationReamingSlideTemplate.cs | 17 ++ ...pPlanOperationReamingSlideExportService.cs | 30 ++++ ...ocessMapPlanOperationReamingSlideParser.cs | 42 +++++ ...sMapPlanOperationReamingRotorController.cs | 2 +- ...sMapPlanOperationReamingSlideController.cs | 28 ++++ 9 files changed, 321 insertions(+), 1 deletion(-) create mode 100644 AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanOperationReamingSlide.cs create mode 100644 AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanOperationReamingSlideTemplate.cs create mode 100644 AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanOperationReamingSlideExportService.cs create mode 100644 AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanOperationReamingSlideParser.cs create mode 100644 AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanOperationReamingSlideController.cs diff --git a/AsbCloudDb/Model/AsbCloudDbContext.cs b/AsbCloudDb/Model/AsbCloudDbContext.cs index 87438528..21f1da7a 100644 --- a/AsbCloudDb/Model/AsbCloudDbContext.cs +++ b/AsbCloudDb/Model/AsbCloudDbContext.cs @@ -23,6 +23,7 @@ namespace AsbCloudDb.Model public virtual DbSet ProcessMapPlanSlide => Set(); public virtual DbSet ProcessMapPlanReams => Set(); public virtual DbSet ProcessMapPlanOperationReamingRotor => Set(); + public virtual DbSet ProcessMapPlanOperationReamingSlide => Set(); public virtual DbSet DrillingProgramParts => Set(); public virtual DbSet FileCategories => Set(); public virtual DbSet Files => Set(); @@ -454,6 +455,16 @@ namespace AsbCloudDb.Model .WithMany() .OnDelete(DeleteBehavior.Restrict); + modelBuilder.Entity() + .HasOne(p => p.Author) + .WithMany() + .OnDelete(DeleteBehavior.Restrict); + + modelBuilder.Entity() + .HasOne(p => p.Author) + .WithMany() + .OnDelete(DeleteBehavior.Restrict); + modelBuilder.Entity() .HasOne(p => p.Editor) .WithMany() @@ -464,6 +475,16 @@ namespace AsbCloudDb.Model .WithMany() .OnDelete(DeleteBehavior.Restrict); + modelBuilder.Entity() + .HasOne(p => p.Editor) + .WithMany() + .OnDelete(DeleteBehavior.Restrict); + + modelBuilder.Entity() + .HasOne(p => p.Editor) + .WithMany() + .OnDelete(DeleteBehavior.Restrict); + DefaultData.DefaultContextData.Fill(modelBuilder); } diff --git a/AsbCloudDb/Model/IAsbCloudDbContext.cs b/AsbCloudDb/Model/IAsbCloudDbContext.cs index b34be878..612e900f 100644 --- a/AsbCloudDb/Model/IAsbCloudDbContext.cs +++ b/AsbCloudDb/Model/IAsbCloudDbContext.cs @@ -81,7 +81,10 @@ namespace AsbCloudDb.Model DbSet DataSaubStat { get; } DatabaseFacade Database { get; } DbSet ProcessMapPlanReams { get; } + DbSet ProcessMapPlanRotor { get; } + DbSet ProcessMapPlanSlide { get; } DbSet ProcessMapPlanOperationReamingRotor { get; } + DbSet ProcessMapPlanOperationReamingSlide { get; } Task RefreshMaterializedViewAsync(string mwName, CancellationToken token); Task RefreshMaterializedViewAsync(CancellationToken token) where TEntity : class; diff --git a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanOperationReamingSlide.cs b/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanOperationReamingSlide.cs new file mode 100644 index 00000000..c2038304 --- /dev/null +++ b/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanOperationReamingSlide.cs @@ -0,0 +1,158 @@ +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_operation_reaming_slide"), Comment("РТК проработка слайд")] +public class ProcessMapPlanOperationReamingSlide : ProcessMapPlanBase +{ + [Column("max_pressure"), Comment("Максимальное давление, атм")] + [Range(0.0, 400.0)] + [Required] + public double MaxPressure { get; set; } + + [Column("differential_pressure"), Comment("Перепад давления, атм.")] + [Range(0.0, 60.0)] + [Required] + public double DifferentialPressure { get; set; } + + [Column("setpoints_tight"), Comment("Уставки, т., затяжка")] + [Range(0.0, 20.0)] + [Required] + public double SetpointsTight { get; set; } + + [Column("setpoints_slacking_off"), Comment("Уставки, т., посадка")] + [Range(0.0, 20.0)] + [Required] + public double SetpointsSlackingOff { get; set; } + + [Column("max_torque"), Comment("Максимально допустимый момент, кН*м.")] + [Range(0.0, 35.0)] + [Required] + public double MaxTorque { get; set; } + + [Column("reaming1_number_of_ repetitions"), Comment("Проработка 1, Количество повторений, шт.")] + [Range(0.0, 99.0)] + [Required] + public double Reaming1NumberOfRepetitions { get; set; } + + [Column("reaming1_rop_up"), Comment("Проработка 1, Скорость, м/ч., Вверх")] + [Range(0.0, 999.0)] + [Required] + public double Reaming1ROPUp { get; set; } + + [Column("reaming1_rop_down"), Comment("Проработка 1, Скорость, м/ч., Вниз")] + [Range(0.0, 999.0)] + [Required] + public double Reaming1ROPDown { get; set; } + + [Column("reaming1_rpm_up"), Comment("Проработка 1, Обороты, об/мин., Вверх")] + [Range(0.0, 270.0)] + [Required] + public double Reaming1RPMUp { get; set; } + + [Column("reaming1_rpm_down"), Comment("Проработка 1, Обороты, об/мин., Вниз")] + [Range(0.0, 270.0)] + [Required] + public double Reaming1RPMDown { get; set; } + + [Column("reaming1_flow_rate_up"), Comment("Проработка 1, Расход, л/с., Вверх")] + [Range(0.0, 100.0)] + [Required] + public double Reaming1FlowRateUp { get; set; } + + [Column("reaming1_flow_rate_down"), Comment("Проработка 1, Расход, л/с., Вниз")] + [Range(0.0, 100.0)] + [Required] + public double Reaming1FlowRateDown { get; set; } + + [Column("reaming1_interval"), Comment("Проработка 1, Интервал проработки, м.")] + [Range(0.0, 30.0)] + [Required] + public double Reaming1Interval { get; set; } + + [Column("reaming1_stop_point_off_bottom"), Comment("Остановка над забоем, м.")] + [Range(0.0, 10.0)] + [Required] + public double Reaming1StopPointOffBottom { get; set; } + + [Column("reaming2_number_of_ repetitions"), Comment("Проработка 2, Количество повторений, шт.")] + [Range(0.0, 99.0)] + public double Reaming2NumberOfRepetitions { get; set; } + + [Column("reaming2_rop_up"), Comment("Проработка 2, Скорость, м/ч., Вверх")] + [Range(0.0, 999.0)] + public double Reaming2ROPUp { get; set; } + + [Column("reaming2_rop_down"), Comment("Проработка 2, Скорость, м/ч., Вниз")] + [Range(0.0, 999.0)] + public double Reaming2ROPDown { get; set; } + + [Column("reaming2_rpm_up"), Comment("Проработка 2, Обороты, об/мин., Вверх")] + [Range(0.0, 270.0)] + public double Reaming2RPMUp { get; set; } + + [Column("reaming2_rpm_down"), Comment("Проработка 2, Обороты, об/мин., Вниз")] + [Range(0.0, 270.0)] + public double Reaming2RPMDown { get; set; } + + [Column("reaming2_flow_rate_up"), Comment("Проработка 2, Расход, л/с., Вверх")] + [Range(0.0, 100.0)] + public double Reaming2FlowRateUp { get; set; } + + [Column("reaming2_flow_rate_down"), Comment("Проработка 2, Расход, л/с., Вниз")] + [Range(0.0, 100.0)] + public double Reaming2FlowRateDown { get; set; } + + [Column("reaming2_interval"), Comment("Проработка 2, Интервал проработки, м.")] + [Range(0.0, 30.0)] + public double Reaming2Interval { get; set; } + + [Column("reaming2_stop_point_off_bottom"), Comment("Остановка над забоем, м.")] + [Range(0.0, 10.0)] + public double Reaming2StopPointOffBottom { get; set; } + + [Column("reaming3_number_of_ repetitions"), Comment("Проработка 3, Количество повторений, шт.")] + [Range(0.0, 99.0)] + public double Reaming3NumberOfRepetitions { get; set; } + + [Column("reaming3_rop_up"), Comment("Проработка 3, Скорость, м/ч., Вверх")] + [Range(0.0, 999.0)] + public double Reaming3ROPUp { get; set; } + + [Column("reaming3_rop_down"), Comment("Проработка 3, Скорость, м/ч., Вниз")] + [Range(0.0, 999.0)] + public double Reaming3ROPDown { get; set; } + + [Column("reaming3_rpm_up"), Comment("Проработка 3, Обороты, об/мин., Вверх")] + [Range(0.0, 270.0)] + public double Reaming3RPMUp { get; set; } + + [Column("reaming3_rpm_down"), Comment("Проработка 3, Обороты, об/мин., Вниз")] + [Range(0.0, 270.0)] + public double Reaming3RPMDown { get; set; } + + [Column("reaming3_flow_rate_up"), Comment("Проработка 3, Расход, л/с., Вверх")] + [Range(0.0, 100.0)] + public double Reaming3FlowRateUp { get; set; } + + [Column("reaming3_flow_rate_down"), Comment("Проработка 3, Расход, л/с., Вниз")] + [Range(0.0, 100.0)] + public double Reaming3FlowRateDown { get; set; } + + [Column("reaming3_interval"), Comment("Проработка 3, Интервал проработки, м.")] + [Range(0.0, 30.0)] + public double Reaming3Interval { get; set; } + + [Column("reaming3_stop_point_off_bottom"), Comment("Остановка над забоем, м.")] + [Range(0.0, 10.0)] + public double Reaming3StopPointOffBottom { get; set; } + + [Column("note"), Comment("Примечание"), StringLength(1024)] + public string Note { get; set; } = string.Empty; + + [ForeignKey(nameof(IdPrevious))] + public virtual ProcessMapPlanOperationReamingSlide? Previous { get; set; } +} \ No newline at end of file diff --git a/AsbCloudInfrastructure/DependencyInjection.cs b/AsbCloudInfrastructure/DependencyInjection.cs index 64d800b2..3aee40c5 100644 --- a/AsbCloudInfrastructure/DependencyInjection.cs +++ b/AsbCloudInfrastructure/DependencyInjection.cs @@ -145,6 +145,20 @@ namespace AsbCloudInfrastructure { Item = src.Adapt() }); + + TypeAdapterConfig>.NewConfig() + .Include>() + .Map(dest => dest, src => new ChangeLogDto() + { + Item = src.Adapt() + }); + + TypeAdapterConfig>.NewConfig() + .Include>() + .Map(dest => dest, src => new ChangeLogDto() + { + Item = src.Adapt() + }); } public static IServiceCollection AddInfrastructure(this IServiceCollection services, IConfiguration configuration) @@ -218,6 +232,10 @@ namespace AsbCloudInfrastructure IChangeLogRepository, ProcessMapPlanBaseRepository>(); + services.AddTransient< + IChangeLogRepository, + ProcessMapPlanBaseRepository>(); + services.AddTransient(); services.AddTransient(); @@ -266,6 +284,7 @@ namespace AsbCloudInfrastructure services.AddTransient>(); services.AddTransient>(); services.AddTransient>(); + services.AddTransient>(); services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -323,6 +342,7 @@ namespace AsbCloudInfrastructure services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -332,6 +352,7 @@ namespace AsbCloudInfrastructure services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); diff --git a/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanOperationReamingSlideTemplate.cs b/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanOperationReamingSlideTemplate.cs new file mode 100644 index 00000000..b670bc4e --- /dev/null +++ b/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanOperationReamingSlideTemplate.cs @@ -0,0 +1,17 @@ +using System.Collections.Generic; + +namespace AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates; + +public class ProcessMapPlanOperationReamingSlideTemplate : ITemplateParameters +{ + public string SheetName => "Проработка слайд"; + + public int HeaderRowsCount => 2; + + public string FileName => "ProcessMapPlanOperationReamingSlideTemplate.xlsx"; + + public IDictionary Cells => new Dictionary + { + + }; +} \ No newline at end of file diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanOperationReamingSlideExportService.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanOperationReamingSlideExportService.cs new file mode 100644 index 00000000..d6e4ba73 --- /dev/null +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanOperationReamingSlideExportService.cs @@ -0,0 +1,30 @@ +using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Repositories; +using AsbCloudApp.Requests; +using AsbCloudApp.Requests.ExportOptions; +using AsbCloudApp.Services; +using AsbCloudInfrastructure.Services.ExcelServices.Templates; +using AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates; +using System.Threading; +using System.Threading.Tasks; + +namespace AsbCloudInfrastructure.Services.ProcessMapPlan.Export; + +public class ProcessMapPlanOperationReamingSlideExportService : ProcessMapPlanExportService +{ + public ProcessMapPlanOperationReamingSlideExportService( + IChangeLogRepository processMapPlanRepository, + IWellService wellService) + : base(processMapPlanRepository, wellService) + { + } + + protected override ITemplateParameters TemplateParameters { get; } = new ProcessMapPlanOperationReamingSlideTemplate(); + + protected override async Task BuildFileNameAsync(WellRelatedExportRequest options, CancellationToken token) + { + var caption = await wellService.GetWellCaptionByIdAsync(options.IdWell, token); + + return $"{caption}_РТК_План_проработка_слайд.xlsx"; + } +} \ No newline at end of file diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanOperationReamingSlideParser.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanOperationReamingSlideParser.cs new file mode 100644 index 00000000..5db156c1 --- /dev/null +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanOperationReamingSlideParser.cs @@ -0,0 +1,42 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Repositories; +using AsbCloudInfrastructure.Services.ExcelServices.Templates; +using AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates; + +namespace AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; + +public class ProcessMapPlanOperationReamingSlideParser : ProcessMapPlanParser +{ + public ProcessMapPlanOperationReamingSlideParser(IWellOperationRepository wellOperationRepository) + : base(wellOperationRepository) + { + } + + protected override ITemplateParameters TemplateParameters => new ProcessMapPlanOperationReamingSlideTemplate(); + + protected override ProcessMapPlanOperationReamingSlideDto BuildDto(IDictionary row, int rowNumber) + { + var dto = base.BuildDto(row, rowNumber); + + var section = sections.FirstOrDefault(s => + string.Equals(s.Caption.Trim(), dto.Section?.Trim(), StringComparison.CurrentCultureIgnoreCase)); + + if (section is null) + { + var message = string.Format(XLExtentions.ProblemDetailsTemplate, + TemplateParameters.SheetName, + rowNumber, + TemplateParameters.Cells[nameof(ProcessMapPlanBaseDto.Section)], + "Указана некорректная секция"); + throw new FileFormatException(message); + } + + dto.IdWellSectionType = section.Id; + + return dto; + } +} \ No newline at end of file diff --git a/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanOperationReamingRotorController.cs b/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanOperationReamingRotorController.cs index 01b6eebc..5b48d92b 100644 --- a/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanOperationReamingRotorController.cs +++ b/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanOperationReamingRotorController.cs @@ -12,7 +12,7 @@ namespace AsbCloudWebApi.Controllers.ProcessMaps; /// РТК план проработка для ротора /// public class ProcessMapPlanOperationReamingRotorController : - ProcessMapPlanBaseController + ProcessMapPlanBaseController { public ProcessMapPlanOperationReamingRotorController( IChangeLogRepository repository, diff --git a/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanOperationReamingSlideController.cs b/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanOperationReamingSlideController.cs new file mode 100644 index 00000000..007d0844 --- /dev/null +++ b/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanOperationReamingSlideController.cs @@ -0,0 +1,28 @@ +using AsbCloudApp.Data.ProcessMaps; +using AsbCloudApp.Repositories; +using AsbCloudApp.Requests; +using AsbCloudApp.Services; +using AsbCloudDb.Model.ProcessMaps; +using AsbCloudInfrastructure.Services.ProcessMapPlan.Export; +using AsbCloudInfrastructure.Services.ProcessMapPlan.Parser; + +namespace AsbCloudWebApi.Controllers.ProcessMaps; + +/// +/// РТК план проработка для слайда +/// +public class ProcessMapPlanOperationReamingSlideController : + ProcessMapPlanBaseController +{ + public ProcessMapPlanOperationReamingSlideController( + IChangeLogRepository repository, + IWellService wellService, + ProcessMapPlanOperationReamingSlideParser parserService, + ITelemetryService telemetryService, + ProcessMapPlanOperationReamingSlideExportService processMapPlanExportService) + : base(repository, wellService, parserService, processMapPlanExportService, telemetryService) + { + } + + protected override string TemplateFileName => "ЕЦП_шаблон_файла_РТК_план_проработка_слайд.xlsx"; +} \ No newline at end of file