From 3266f9f2074e4fe679e8d572cac275704eacf950 Mon Sep 17 00:00:00 2001 From: Olga Nemt Date: Wed, 26 Jun 2024 15:43:16 +0500 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=A2=D0=9A=20=D0=BF=D0=BB=D0=B0=D0=BD?= =?UTF-8?q?=20=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5?= =?UTF-8?q?=20=D1=85=D0=BE=D0=BB=D0=BE=D1=81=D1=82=D0=BE=D0=B3=D0=BE=20?= =?UTF-8?q?=D1=85=D0=BE=D0=B4=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ProcessMapPlanFunctionsJarrDrillToolDto.cs | 28 +++++++++++++ AsbCloudDb/Model/AsbCloudDbContext.cs | 11 +++++ AsbCloudDb/Model/IAsbCloudDbContext.cs | 1 + .../ProcessMapPlanFunctionsUpgradeNoload.cs | 19 +++++++++ AsbCloudInfrastructure/DependencyInjection.cs | 14 +++++++ ...ssMapPlanFunctionsUpgradeNoloadTemplate.cs | 17 ++++++++ ...PlanFunctionsUpgradeNoloadExportService.cs | 30 +++++++++++++ ...cessMapPlanFunctionsUpgradeNoloadParser.cs | 42 +++++++++++++++++++ ...MapPlanFunctionsUpgradeNoloadController.cs | 28 +++++++++++++ 9 files changed, 190 insertions(+) create mode 100644 AsbCloudApp/Data/ProcessMaps/ProcessMapPlanFunctionsJarrDrillToolDto.cs create mode 100644 AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanFunctionsUpgradeNoload.cs create mode 100644 AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanFunctionsUpgradeNoloadTemplate.cs create mode 100644 AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanFunctionsUpgradeNoloadExportService.cs create mode 100644 AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanFunctionsUpgradeNoloadParser.cs create mode 100644 AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanFunctionsUpgradeNoloadController.cs diff --git a/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanFunctionsJarrDrillToolDto.cs b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanFunctionsJarrDrillToolDto.cs new file mode 100644 index 00000000..6d125f79 --- /dev/null +++ b/AsbCloudApp/Data/ProcessMaps/ProcessMapPlanFunctionsJarrDrillToolDto.cs @@ -0,0 +1,28 @@ +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; + +namespace AsbCloudApp.Data.ProcessMaps; + +/// +/// РТК план встряхивание бурового инструмента +/// +public class ProcessMapPlanFunctionsJarrDrillToolDto : ProcessMapPlanBaseDto +{ + /// + /// Зенитный угол, градусы + /// + [Range(0.0, 100.0)] + public double ZenithAngle { get; set; } + + /// + /// Складывание, м + /// + [Range(0.0, 20.0)] + public double Buckling { get; set; } + + /// + /// Примечание + /// + [StringLength(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 bf990013..ec6a444a 100644 --- a/AsbCloudDb/Model/AsbCloudDbContext.cs +++ b/AsbCloudDb/Model/AsbCloudDbContext.cs @@ -36,6 +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 DrillingProgramParts => Set(); public virtual DbSet FileCategories => Set(); public virtual DbSet Files => Set(); @@ -538,6 +539,11 @@ namespace AsbCloudDb.Model .WithMany() .OnDelete(DeleteBehavior.Restrict); + modelBuilder.Entity() + .HasOne(p => p.Author) + .WithMany() + .OnDelete(DeleteBehavior.Restrict); + modelBuilder.Entity() .HasOne(p => p.Editor) .WithMany() @@ -618,6 +624,11 @@ namespace AsbCloudDb.Model .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 4fc8d3ef..4938f956 100644 --- a/AsbCloudDb/Model/IAsbCloudDbContext.cs +++ b/AsbCloudDb/Model/IAsbCloudDbContext.cs @@ -97,6 +97,7 @@ namespace AsbCloudDb.Model DbSet ProcessMapPlanFunctionsDamper { get; } DbSet ProcessMapPlanFunctionsAutoHold { get; } DbSet ProcessMapPlanFunctionsJarrDrillTool { get; } + DbSet ProcessMapPlanFunctionsUpgradeNoload { get; } Task RefreshMaterializedViewAsync(string mwName, CancellationToken token); Task RefreshMaterializedViewAsync(CancellationToken token) where TEntity : class; diff --git a/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanFunctionsUpgradeNoload.cs b/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanFunctionsUpgradeNoload.cs new file mode 100644 index 00000000..7cb4f7c0 --- /dev/null +++ b/AsbCloudDb/Model/ProcessMapPlan/ProcessMapPlanFunctionsUpgradeNoload.cs @@ -0,0 +1,19 @@ +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_upgrade_no_load"), Comment("Обновление холостого хода")] +public class ProcessMapPlanFunctionsUpgradeNoload : ProcessMapPlanBase +{ + [Column("id_decline_socket_column"), Comment("СПУСК ОК Да/Нет")] + public double IdDeclineSocketColumn { get; set; } + + [Column("note"), Comment("Примечание"), StringLength(1024)] + public string Note { get; set; } = string.Empty; + + [ForeignKey(nameof(IdPrevious))] + public virtual ProcessMapPlanFunctionsUpgradeNoload? Previous { get; set; } +} \ No newline at end of file diff --git a/AsbCloudInfrastructure/DependencyInjection.cs b/AsbCloudInfrastructure/DependencyInjection.cs index 730382d4..ba779461 100644 --- a/AsbCloudInfrastructure/DependencyInjection.cs +++ b/AsbCloudInfrastructure/DependencyInjection.cs @@ -243,6 +243,13 @@ namespace AsbCloudInfrastructure { Item = src.Adapt() }); + + TypeAdapterConfig>.NewConfig() + .Include>() + .Map(dest => dest, src => new ChangeLogDto() + { + Item = src.Adapt() + }); } public static IServiceCollection AddInfrastructure(this IServiceCollection services, IConfiguration configuration) @@ -368,6 +375,10 @@ namespace AsbCloudInfrastructure IChangeLogRepository, ProcessMapPlanBaseRepository>(); + services.AddTransient< + IChangeLogRepository, + ProcessMapPlanBaseRepository>(); + services.AddTransient(); services.AddTransient(); @@ -429,6 +440,7 @@ namespace AsbCloudInfrastructure services.AddTransient>(); services.AddTransient>(); services.AddTransient>(); + services.AddTransient>(); services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -499,6 +511,7 @@ namespace AsbCloudInfrastructure services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -521,6 +534,7 @@ namespace AsbCloudInfrastructure 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/ProcessMapPlanFunctionsUpgradeNoloadTemplate.cs new file mode 100644 index 00000000..c24bcb58 --- /dev/null +++ b/AsbCloudInfrastructure/Services/ExcelServices/Templates/ProcessMapPlanTemplates/ProcessMapPlanFunctionsUpgradeNoloadTemplate.cs @@ -0,0 +1,17 @@ +using System.Collections.Generic; + +namespace AsbCloudInfrastructure.Services.ExcelServices.Templates.ProcessMapPlanTemplates; + +public class ProcessMapPlanFunctionsUpgradeNoloadTemplate : ITemplateParameters +{ + public string SheetName => "Обновление холостого хода"; + + public int HeaderRowsCount => 2; + + public string FileName => "ProcessMapPlanFunctionsUpgradeNoloadTemplate.xlsx"; + + public IDictionary Cells => new Dictionary + { + + }; +} \ No newline at end of file diff --git a/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanFunctionsUpgradeNoloadExportService.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanFunctionsUpgradeNoloadExportService.cs new file mode 100644 index 00000000..234cc860 --- /dev/null +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Export/ProcessMapPlanFunctionsUpgradeNoloadExportService.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 ProcessMapPlanFunctionsUpgradeNoloadExportService : ProcessMapPlanExportService +{ + public ProcessMapPlanFunctionsUpgradeNoloadExportService( + IChangeLogRepository processMapPlanRepository, + IWellService wellService) + : base(processMapPlanRepository, wellService) + { + } + + protected override ITemplateParameters TemplateParameters { get; } = new ProcessMapPlanFunctionsUpgradeNoloadTemplate(); + + 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/ProcessMapPlanFunctionsUpgradeNoloadParser.cs b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanFunctionsUpgradeNoloadParser.cs new file mode 100644 index 00000000..ceb500a1 --- /dev/null +++ b/AsbCloudInfrastructure/Services/ProcessMapPlan/Parser/ProcessMapPlanFunctionsUpgradeNoloadParser.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 ProcessMapPlanFunctionsUpgradeNoloadParser : ProcessMapPlanParser +{ + public ProcessMapPlanFunctionsUpgradeNoloadParser(IWellOperationRepository wellOperationRepository) + : base(wellOperationRepository) + { + } + + protected override ITemplateParameters TemplateParameters => new ProcessMapPlanFunctionsUpgradeNoloadTemplate(); + + protected override ProcessMapPlanFunctionsUpgradeNoloadDto 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/ProcessMapPlanFunctionsUpgradeNoloadController.cs b/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanFunctionsUpgradeNoloadController.cs new file mode 100644 index 00000000..9d4200b2 --- /dev/null +++ b/AsbCloudWebApi/Controllers/ProcessMaps/ProcessMapPlanFunctionsUpgradeNoloadController.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 ProcessMapPlanFunctionsUpgradeNoloadController : + ProcessMapPlanBaseController +{ + public ProcessMapPlanFunctionsUpgradeNoloadController( + IChangeLogRepository repository, + IWellService wellService, + ProcessMapPlanFunctionsUpgradeNoloadParser parserService, + ITelemetryService telemetryService, + ProcessMapPlanFunctionsUpgradeNoloadExportService processMapPlanExportService) + : base(repository, wellService, parserService, processMapPlanExportService, telemetryService) + { + } + + protected override string TemplateFileName => "ЕЦП_шаблон_файла_РТК_план_обновление_холостого_хода.xlsx"; +} \ No newline at end of file