#5996638 Подсвечивать не оптимальные режимы

AsbCloudApp/Data/DrillParamsDto.cs

@@ -42,6 +42,11 @@ namespace AsbCloudApp.Data
         /// </summary>
         public double AxialLoadMax { get; set; }
 
+        /// <summary>
+        /// axial load
+        /// </summary>
+        public MinMaxExtendedViewDto AxialLoad { get; set; }
+
         /// <summary>
         /// pressure min.
         /// </summary>
@@ -57,6 +62,11 @@ namespace AsbCloudApp.Data
         /// </summary>
         public double PressureMax { get; set; }
 
+        /// <summary>
+        /// pressure
+        /// </summary>
+        public MinMaxExtendedViewDto Pressure { get; set; }
+
         /// <summary>
         /// rotor torque min.
         /// </summary>
@@ -72,6 +82,11 @@ namespace AsbCloudApp.Data
         /// </summary>
         public double RotorTorqueMax { get; set; }
 
+        /// <summary>
+        /// rotor torque
+        /// </summary>
+        public MinMaxExtendedViewDto RotorTorque { get; set; }
+
         /// <summary>
         /// rotor speed min.
         /// </summary>
@@ -87,6 +102,11 @@ namespace AsbCloudApp.Data
         /// </summary>
         public double RotorSpeedMax { get; set; }
 
+        /// <summary>
+        /// rotor speed
+        /// </summary>
+        public MinMaxExtendedViewDto RotorSpeed { get; set; }
+
         /// <summary>
         /// flow min.
         /// </summary>
@@ -101,5 +121,10 @@ namespace AsbCloudApp.Data
         /// flow max.
         /// </summary>
         public double FlowMax { get; set; }
+
+        /// <summary>
+        /// flow
+        /// </summary>
+        public MinMaxExtendedViewDto Flow { get; set; }
     }
 }

AsbCloudApp/Data/MinMaxDto.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AsbCloudApp.Data
+{
+#nullable enable
+    /// <summary>
+    /// Минимальное и максимальное значение
+    /// </summary>
+    public class MinMaxDto
+    {
+        /// <summary>
+        /// Минимальное значение
+        /// </summary>
+        public double Min { get; set; }
+
+        /// <summary>
+        /// максимальное значение
+        /// </summary>
+        public double Max { get; set; }
+    }
+#nullable disable
+}

AsbCloudApp/Data/MinMaxExtendedViewDto.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AsbCloudApp.Data
+{
+#nullable enable
+    /// <summary>
+    /// Расширение для класса MinMaxDto
+    /// </summary>
+    public class MinMaxExtendedViewDto : MinMaxDto
+    {
+        /// <summary>
+        /// Среднее значение
+        /// </summary>
+        public double Avg { get; set; }
+
+        /// <summary>
+        /// Является максимальным 
+        /// </summary>
+        public bool IsMax { get; set; }
+
+        /// <summary>
+        /// Является минимальным
+        /// </summary>
+        public bool IsMin { get; set; }
+    }
+#nullable disable
+}

AsbCloudInfrastructure/Services/DrillParamsService.cs

@@ -4,6 +4,7 @@ using AsbCloudDb.Model;
 using AsbCloudInfrastructure.Repository;
 using Mapster;
 using Microsoft.EntityFrameworkCore;
+using Org.BouncyCastle.Crypto;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
@@ -85,6 +86,16 @@ namespace AsbCloudInfrastructure.Services
         public async Task<IEnumerable<DrillParamsDto>> GetCompositeAllAsync(int idWell,
             CancellationToken token = default)
         {
+            var allDrillParams =
+                await (from p in db.DrillParams
+                       from c in db.WellComposites
+                       where p.IdWell == c.IdWellSrc &&
+                           p.IdWellSectionType == c.IdWellSectionType
+                       select p)
+                       .AsNoTracking()
+                       .ToListAsync(token)
+                       .ConfigureAwait(false);
+
             var compositeWellDrillParams =
                 await (from p in db.DrillParams
                        from c in db.WellComposites
@@ -98,7 +109,8 @@ namespace AsbCloudInfrastructure.Services
 
             var compositeDrillParamsDtos = compositeWellDrillParams.Adapt<IEnumerable<DrillParamsDto>>();
 
-            return compositeDrillParamsDtos;
+            var result = compositeDrillParamsDtos.Select(x => Convert(x, allDrillParams));
+            return result;
         }
 
         public async Task<int> InsertAsync(int idWell, DrillParamsDto dto,
@@ -143,5 +155,49 @@ namespace AsbCloudInfrastructure.Services
             var result = await base.UpdateAsync(dto, token).ConfigureAwait(false);
             return result;
         }
+
+        private static DrillParamsDto Convert(DrillParamsDto dto, IEnumerable<DrillParams> drillParams)
+        {
+            return new DrillParamsDto
+            {
+                Id = dto.Id,
+                IdWellSectionType = dto.IdWellSectionType,
+                AxialLoad = GetMinMaxExtended(dto, drillParams.Select(x => (x.AxialLoadMin, x.AxialLoadMax))),
+                AxialLoadAvg = dto.AxialLoadAvg,
+                AxialLoadMax = dto.AxialLoadMax,
+                AxialLoadMin = dto.AxialLoadMin,
+                DepthEnd = dto.DepthEnd,
+                DepthStart = dto.DepthStart,
+                Flow = GetMinMaxExtended(dto, drillParams.Select(x => (x.FlowMin, x.FlowMax))),
+                FlowAvg = dto.FlowAvg,
+                FlowMax = dto.FlowMax,
+                FlowMin = dto.FlowMin,
+                IdWell = dto.IdWell,
+                Pressure = GetMinMaxExtended(dto, drillParams.Select(x => (x.PressureMin, x.PressureMax))),
+                PressureAvg = dto.PressureAvg,
+                PressureMax = dto.PressureMax,
+                PressureMin = dto.PressureMin,
+                RotorSpeed = GetMinMaxExtended(dto, drillParams.Select(x => (x.RotorSpeedMin, x.RotorSpeedMax))),
+                RotorSpeedAvg = dto.RotorSpeedAvg,
+                RotorSpeedMax = dto.RotorSpeedMax,
+                RotorSpeedMin = dto.RotorSpeedMin,
+                RotorTorque = GetMinMaxExtended(dto, drillParams.Select(x => (x.RotorTorqueMin, x.RotorTorqueMax))),
+                RotorTorqueAvg = dto.RotorTorqueAvg,
+                RotorTorqueMax = dto.RotorTorqueMax,
+                RotorTorqueMin = dto.RotorTorqueMin
+            };
+        }
+
+        private static MinMaxExtendedViewDto GetMinMaxExtended(DrillParamsDto x, IEnumerable<(double min, double max)> allDrillParams)
+        {
+            return new MinMaxExtendedViewDto
+            {
+                Avg = x.AxialLoadAvg,
+                Max = x.AxialLoadMax,
+                Min = x.AxialLoadMin,
+                IsMax = allDrillParams.Max(mx => mx.max) < x.AxialLoadMax,
+                IsMin = allDrillParams.Min(mn => mn.min) > x.AxialLoadMin
+            };
+        }
     }
 }