From 65e8c7d8c1666ae7a5bedc4b7aeb9f6a1176c595 Mon Sep 17 00:00:00 2001 From: "ai.astrakhantsev" Date: Mon, 28 Nov 2022 11:54:02 +0500 Subject: [PATCH] =?UTF-8?q?#7887519=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5?= =?UTF-8?q?=D1=82=D1=80=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AsbCloudApp/Data/LimitingParameterDto.cs | 10 ++++++++++ .../Services/LimitingParameterService.cs | 12 +++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/AsbCloudApp/Data/LimitingParameterDto.cs b/AsbCloudApp/Data/LimitingParameterDto.cs index 2c03eb45..a1f03219 100644 --- a/AsbCloudApp/Data/LimitingParameterDto.cs +++ b/AsbCloudApp/Data/LimitingParameterDto.cs @@ -27,6 +27,16 @@ namespace AsbCloudApp.Data /// Идентификатор критерия бурения /// public short IdFeedRegulator { get; set; } + + /// + /// Наименование критерия бурения + /// + public string NameFeedRegulator { get; set; } = string.Empty; + + /// + /// Количество включений + /// + public int NumberInclusions { get; set; } } #nullable disable } diff --git a/AsbCloudInfrastructure/Services/LimitingParameterService.cs b/AsbCloudInfrastructure/Services/LimitingParameterService.cs index 34ebbd24..abf66978 100644 --- a/AsbCloudInfrastructure/Services/LimitingParameterService.cs +++ b/AsbCloudInfrastructure/Services/LimitingParameterService.cs @@ -15,6 +15,14 @@ namespace AsbCloudInfrastructure.Services { private readonly ILimitingParameterRepository limitingParameterRepository; private readonly IWellService wellService; + private readonly Dictionary feedRegulatorData = new Dictionary() + { + { 0, "Нет ограничения" }, + { 1, "МСП" }, + { 2, "Давление" }, + { 3, "Осевая нагрузка" }, + { 4, "Момент" } + }; public LimitingParameterService(ILimitingParameterRepository limitingParameterRepository, IWellService wellService) @@ -46,7 +54,9 @@ namespace AsbCloudInfrastructure.Services IdWell = well.Id, IdFeedRegulator = item.Key, Depth = allItemDepths, - TotalMinutes = (float)allItemDates + TotalMinutes = (float)allItemDates, + NumberInclusions = item.Count(), + NameFeedRegulator = feedRegulatorData.FirstOrDefault(x => x.Key == item.Key).Value }); }