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..c50729f8 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.GetValueOrDefault(item.Key) ?? $"Id: {item.Key}" }); }