Merge branch 'feature/8103063' into dev

AsbCloudApp/Repositories/IProcessMapRepository.cs

@@ -1,11 +1,14 @@
 using AsbCloudApp.Data.ProcessMap;
+using AsbCloudApp.Requests;
+using AsbCloudApp.Services;
 using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudApp.Services
+namespace AsbCloudApp.Repositories
 {
+#nullable enable
     /// <summary>
     /// ÐÒÊ
     /// </summary>
@@ -20,5 +23,14 @@ namespace AsbCloudApp.Services
         /// <returns></returns>
         Task<IEnumerable<ProcessMapDto>> GetAllAsync(int idWell,
             DateTime? updateFrom, CancellationToken token = default);
+
+        /// <summary>
+        /// Ïîëó÷èòü ïàðàìåòðû áóðåíèÿ
+        /// </summary>
+        /// <param name="requests"></param>
+        /// <param name="token"></param>
+        /// <returns></returns>
+        Task<IEnumerable<ProcessMapDto>> GetProcessMapAsync(IEnumerable<ProcessMapRequest> requests, CancellationToken token);
     }
+#nullable disable
 }

AsbCloudApp/Repositories/IWellCompositeRepository.cs

@@ -1,4 +1,5 @@
 using AsbCloudApp.Data;
+using AsbCloudApp.Data.ProcessMap;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
@@ -27,6 +28,14 @@ namespace AsbCloudApp.Repositories
         /// <param name="token"></param>
         /// <returns></returns>
         Task<int> SaveAsync(int idWell, IEnumerable<WellCompositeDto> wellComposites, CancellationToken token);
+
+        /// <summary>
+        /// Получение РТК по композитной скважине
+        /// </summary>
+        /// <param name="idWell"></param>
+        /// <param name="token"></param>
+        /// <returns></returns>
+        Task<IEnumerable<ProcessMapDto>> GetCompositeProcessMap(int idWell, CancellationToken token);
     }
 #nullable disable
 }

AsbCloudApp/Requests/ProcessMapRequest.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+
+namespace AsbCloudApp.Requests
+{
+#nullable enable
+    /// <summary>
+    /// Параметры для запроса получения РТК
+    /// </summary>
+    public class ProcessMapRequest
+    {
+        /// <summary>
+        /// Идентификатор скважины
+        /// </summary>
+        public int IdWell { get; set; }
+
+        /// <summary>
+        /// Тип секции
+        /// </summary>
+        public int? IdWellSectionType { get; set; }
+
+        /// <summary>
+        /// Дата обновления
+        /// </summary>
+        public DateTime? UpdateFrom { get; set; }
+    }
+#nullable disable
+}

AsbCloudApp/Services/IProcessMapService.cs

@@ -1,6 +1,5 @@
 using AsbCloudApp.Data.ProcessMap;
 using System.Collections.Generic;
-using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 

AsbCloudInfrastructure/PredicateBuilder.cs

@@ -0,0 +1,80 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+
+namespace AsbCloudInfrastructure
+{
+#nullable enable
+    /// <summary>
+    /// stolen from https://github.com/lotosbin/BinbinPredicateBuilder
+    /// </summary>
+    public static class PredicateBuilder
+    {
+        /// <summary>
+        ///     Combines the first predicate with the second using the logical "and".
+        /// </summary>
+        public static Expression<Func<T, bool>> And<T>(this Expression<Func<T, bool>> first, Expression<Func<T, bool>> second)
+        {
+            return first.Compose(second, Expression.AndAlso);
+        }
+
+        /// <summary>
+        ///     Combines the first predicate with the second using the logical "or".
+        /// </summary>
+        public static Expression<Func<T, bool>> Or<T>(this Expression<Func<T, bool>> first, Expression<Func<T, bool>> second)
+        {
+            return first.Compose(second, Expression.OrElse);
+        }
+
+        /// <summary>
+        ///     Negates the predicate.
+        /// </summary>
+        public static Expression<Func<T, bool>> Not<T>(this Expression<Func<T, bool>> expression)
+        {
+            var negated = Expression.Not(expression.Body);
+            return Expression.Lambda<Func<T, bool>>(negated, expression.Parameters);
+        }
+
+        private static Expression<T> Compose<T>(this Expression<T> first, Expression<T> second, Func<Expression, Expression, Expression> merge)
+        {
+            var map = first.Parameters
+                .Select((f, i) => new { f, s = second.Parameters[i] })
+                .ToDictionary(p => p.s, p => p.f);
+
+            var tryReplaceParametr = (Expression node) => 
+            {
+                if (node is ParameterExpression parameter)
+                    if (map.TryGetValue(parameter, out ParameterExpression? replacement))
+                        return replacement;
+                return node;
+            };
+
+            var secondBody = ParameterRebinder.ReplaceParameters(map, second.Body);
+            return Expression.Lambda<T>(merge(first.Body, secondBody), first.Parameters);
+        }
+
+        class ParameterRebinder : ExpressionVisitor
+        {
+            private readonly Dictionary<ParameterExpression, ParameterExpression> map;
+
+            private ParameterRebinder(Dictionary<ParameterExpression, ParameterExpression> map)
+            {
+                this.map = map;
+            }
+
+            public static Expression ReplaceParameters(Dictionary<ParameterExpression, ParameterExpression> map, Expression exp)
+            {
+                return new ParameterRebinder(map).Visit(exp);
+            }
+
+            protected override Expression VisitParameter(ParameterExpression parametr)
+            {
+                if (map.TryGetValue(parametr, out ParameterExpression? replacement))
+                    parametr = replacement;
+                return parametr;
+            }
+        }
+    }
+}
+#nullable disable

AsbCloudInfrastructure/Repository/ProcessMapRepository.cs

@@ -1,12 +1,17 @@
 using AsbCloudApp.Data;
 using AsbCloudApp.Data.ProcessMap;
+using AsbCloudApp.Repositories;
+using AsbCloudApp.Requests;
 using AsbCloudApp.Services;
 using AsbCloudDb.Model;
+using DocumentFormat.OpenXml.Spreadsheet;
 using Mapster;
 using Microsoft.EntityFrameworkCore;
+using Org.BouncyCastle.Asn1.Ocsp;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Linq.Expressions;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -30,7 +35,15 @@ namespace AsbCloudInfrastructure.Repository
         public async Task<IEnumerable<ProcessMapDto>> GetAllAsync(int idWell,
             DateTime? updateFrom, CancellationToken token)
         {
-            var entities = await BuildQuery(idWell, updateFrom)
+            var requests = new[]
+            { 
+                new ProcessMapRequest { 
+                    IdWell = idWell,
+                    UpdateFrom = updateFrom
+                }
+            };
+
+            var entities = await BuildQuery(requests)
                             .OrderBy(e => e.DepthStart)
                             .ThenBy(e => e.Id)
                             .ToListAsync(token)
@@ -40,6 +53,15 @@ namespace AsbCloudInfrastructure.Repository
             return dtos;
         }
 
+        public async Task<IEnumerable<ProcessMapDto>> GetProcessMapAsync(IEnumerable<ProcessMapRequest> requests, CancellationToken token)
+        {
+            var entities = await BuildQuery(requests)
+               .ToListAsync(token)
+               .ConfigureAwait(false);
+            var dtos = entities.Select(Convert).ToList();
+            return dtos;
+        }
+
         public override async Task<int> InsertAsync(ProcessMapDto dto,
             CancellationToken token)
         {
@@ -56,18 +78,31 @@ namespace AsbCloudInfrastructure.Repository
             return result;
         }
 
-
+        private IQueryable<ProcessMap> BuildQuery(IEnumerable<ProcessMapRequest> requests)
-        private IQueryable<ProcessMap> BuildQuery(int idWell, DateTime? updateFrom)
         {
-            var query = GetQuery().Where(e => e.IdWell == idWell);
+            var query = GetQuery();
-
+            if (requests.Any())
-            if (updateFrom is not null)
             {
-                var timezone = wellService.GetTimezone(idWell);
+                Expression<Func<ProcessMap, bool>> predicate = map => false;
-                var updateFromUtc = updateFrom?.ToUtcDateTimeOffset(timezone.Hours);
+                foreach (var request in requests)
-                query.Where(e => e.LastUpdate >= updateFromUtc);
+                {
+                    Expression<Func<ProcessMap, bool>> predicate2 = map => map.IdWell == request.IdWell;
+
+                    if (request.IdWellSectionType is not null)
+                        predicate2 = predicate2.And(map => map.IdWellSectionType == request.IdWellSectionType);
+
+                    if (request.UpdateFrom is not null)
+                    {
+                        var timezone = wellService.GetTimezone(request.IdWell);
+                        var updateFromUtc = request.UpdateFrom?.ToUtcDateTimeOffset(timezone.Hours);
+                        predicate2 = predicate2.And(map => map.LastUpdate >= updateFromUtc);
                     }
 
+                    predicate = predicate.Or(predicate2);
+                }
+                query = query.Where(predicate);
+
+            }
             return query;
         }
         protected override ProcessMapDto Convert(ProcessMap entity)

AsbCloudInfrastructure/Repository/WellCompositeRepository.cs

@@ -1,8 +1,11 @@
 using AsbCloudApp.Data;
+using AsbCloudApp.Data.ProcessMap;
 using AsbCloudApp.Repositories;
+using AsbCloudApp.Requests;
 using AsbCloudDb.Model;
 using Mapster;
 using Microsoft.EntityFrameworkCore;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
@@ -14,10 +17,12 @@ namespace AsbCloudInfrastructure.Repository
     public class WellCompositeRepository : IWellCompositeRepository
     {
         private readonly IAsbCloudDbContext db;
+        private readonly IProcessMapRepository processMapRepository;
 
-        public WellCompositeRepository(IAsbCloudDbContext db)
+        public WellCompositeRepository(IAsbCloudDbContext db, IProcessMapRepository processMapRepository)
         {
             this.db = db;
+            this.processMapRepository = processMapRepository;
         }
 
         /// <inheritdoc/>
@@ -44,6 +49,51 @@ namespace AsbCloudInfrastructure.Repository
             return db.SaveChangesAsync(token);
         }
 
+        /// <inheritdoc/>
+        public async Task<IEnumerable<ProcessMapDto>> GetCompositeProcessMap(int idWell, CancellationToken token)
+        {
+            var dtos = await GetAsync(idWell, token);
+
+            var requests = dtos.Select(x => new ProcessMapRequest {
+                IdWell = x.IdWellSrc,
+                IdWellSectionType = x.IdWellSectionType
+            });
+
+            var processMap = await processMapRepository.GetProcessMapAsync(requests, token);
+
+            var result = processMap.Select(x => new ProcessMapDto
+            {
+                IdWell = x.IdWell,
+                IdWellSectionType = x.IdWellSectionType,
+                RopPlan = x.RopPlan,
+                DepthStart = x.DepthStart,
+                DepthEnd = x.DepthEnd,
+                AxialLoad = new PlanFactDto
+                {
+                    Plan = x.AxialLoad.Fact ?? x.AxialLoad.Plan,
+                },
+                Flow = new PlanFactDto
+                {
+                    Plan = x.Flow.Fact ?? x.Flow.Plan
+                },
+                Pressure = new PlanFactDto
+                {
+                    Plan = x.Pressure.Fact ?? x.Pressure.Plan
+                },
+                TopDriveSpeed = new PlanFactDto
+                {
+                    Plan = x.TopDriveSpeed.Fact ?? x.TopDriveSpeed.Plan
+                },
+                TopDriveTorque = new PlanFactDto
+                {
+                    Plan = x.TopDriveTorque.Fact ?? x.TopDriveTorque.Plan
+                },
+                LastUpdate = DateTime.UtcNow
+            });
+            
+            return result;
+        }
+
         private static WellComposite Convert(int idWell, WellCompositeDto dto)
         {
             var entity = dto.Adapt<WellComposite>();

AsbCloudInfrastructure/Services/ProcessMap/ProcessMapService.cs

@@ -43,6 +43,7 @@ namespace AsbCloudInfrastructure.Services.ProcessMap
             this.subsystemOperationTimeService = subsystemOperationTimeService;
         }
 
+        /// <inheritdoc/>
         public async Task<IEnumerable<ProcessMapReportDto>> GetProcessMapAsync(int idWell, CancellationToken token)
         {
             var well = wellService.GetOrDefault(idWell)

AsbCloudWebApi/Controllers/ProcessMapController.cs

@@ -1,4 +1,5 @@
 using AsbCloudApp.Data.ProcessMap;
+using AsbCloudApp.Repositories;
 using AsbCloudApp.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;

AsbCloudWebApi/Controllers/WellCompositeController.cs

@@ -1,4 +1,5 @@
 using AsbCloudApp.Data;
+using AsbCloudApp.Data.ProcessMap;
 using AsbCloudApp.Repositories;
 using AsbCloudApp.Services;
 using Microsoft.AspNetCore.Authorization;
@@ -21,7 +22,8 @@ namespace AsbCloudWebApi.Controllers
         private readonly IWellCompositeRepository wellCompositeRepository;
         private readonly IWellService wellService;
 
-        public WellCompositeController(IWellCompositeRepository wellCompositeRepository, IWellService wellService)
+        public WellCompositeController(IWellCompositeRepository wellCompositeRepository, 
+            IWellService wellService)
         {
             this.wellCompositeRepository = wellCompositeRepository;
             this.wellService = wellService;
@@ -63,6 +65,24 @@ namespace AsbCloudWebApi.Controllers
             return Ok(result);
         }
 
+        /// <summary>
+        /// Получение РТК по композитной скважине
+        /// </summary>
+        /// <param name="idWell"></param>
+        /// <param name="token"></param>
+        /// <returns></returns>
+        [HttpGet("getCompositeProcessMap")]
+        [Permission]
+        [ProducesResponseType(typeof(IEnumerable<ProcessMapDto>), (int)System.Net.HttpStatusCode.OK)]
+        public async Task<IActionResult> GetCompositeProcessMap(int idWell, CancellationToken token = default)
+        {
+            if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
+                return Forbid();
+
+            var result = await wellCompositeRepository.GetCompositeProcessMap(idWell, token).ConfigureAwait(false);
+            return Ok(result);
+        }
+
         private async Task<bool> CanUserAccessToWellAsync(int idWell, CancellationToken token = default)
         {
             int? idCompany = User.GetCompanyId();