Замена базовых классов. Уточнения в задании по не заполненным целевым значениям.

AsbCloudApp/Data/DetectedOperationDto.cs

@@ -2,6 +2,7 @@
 
 namespace AsbCloudApp.Data
 {
+#nullable enable
     /// <summary>
     /// Автоматически определяемая операция
     /// </summary>
@@ -61,13 +62,17 @@ namespace AsbCloudApp.Data
         /// <summary>
         /// Бурильщик
         /// </summary>
-        public DrillerDto Driller { get; set; }
+        public DrillerDto? Driller { get; set; }
 
         /// <summary>
         /// Целевые/нормативные показатели
         /// </summary>
-        public OperationValueDto OperationValue { get; set; }
+        public OperationValueDto? OperationValue { get; set; }
 
+        /// <summary>
+        /// Ключевой параметр операции
+        /// </summary>
         public double Value { get; set; }
     }
+#nullable disable
 }

AsbCloudApp/Data/DetectedOperationListDto.cs

@@ -4,12 +4,16 @@ using System.Linq;
 
 namespace AsbCloudApp.Data
 {
+#nullable enable
+    /// <summary>
+    /// Статистика по операциям бурильщика
+    /// </summary>
     public class DetectedOperationStatDto
     {
         /// <summary>
-        /// Бурильцик
+        /// Бурильщик
         /// </summary>
-        public DrillerDto Driller { get; set; }
+        public DrillerDto? Driller { get; set; }
 
         /// <summary>
         /// Количество операции
@@ -17,24 +21,24 @@ namespace AsbCloudApp.Data
         public int Count { get; set; }
 
         /// <summary>
-        /// Среднее по целевым показателям 
+        /// Среднее по ключевому показателю
         /// </summary>
-        public double Average { get; set; }
+        public double AverageValue { get; set; }
+
+        /// <summary>
+        /// Среднее целевого показателя
+        /// </summary>
+        public double? AverageTargetValue { get; set; }
 
         /// <summary>
         /// Коэффициент эффективности
         /// </summary>
-        public double Efficiency { get; set; }
+        public double? Efficiency { get; set; }
-
-        /// <summary>
-        /// Среднее по ключевому показателю
-        /// </summary>
-        public double AverageByParam { get; set; }
 
         /// <summary>
         /// Коэффициент потерь
         /// </summary>
-        public double Loss { get; set; }
+        public double? Loss { get; set; }
     }
 
     /// <summary>
@@ -45,8 +49,9 @@ namespace AsbCloudApp.Data
         /// <summary>
         /// Список всех операций
         /// </summary>
-        public IEnumerable<DetectedOperationDto> List { get; set; }
+        public IEnumerable<DetectedOperationDto> Operations { get; set; }
 
-        public ICollection<DetectedOperationStatDto> Stats { get; set; }
+        public IEnumerable<DetectedOperationStatDto> Stats { get; set; }
     }
+#nullable disable
 }

AsbCloudApp/Data/OperationValueDto.cs

@@ -5,7 +5,7 @@ namespace AsbCloudApp.Data
     /// <summary>
     /// Описание целевых/нормативных показателей операций
     /// </summary>
-    public class OperationValueDto : IId
+    public class OperationValueDto : IId, IWellRelated
     {
         /// <summary>
         /// Идентификатор в БД

AsbCloudApp/Data/ScheduleDto.cs

@@ -37,5 +37,10 @@ namespace AsbCloudApp.Data
         /// Конец бурения
         /// </summary>
         public DateTime DrillEnd { get; set; }
+
+        /// <summary>
+        /// Бурильщик
+        /// </summary>
+        public DrillerDto Driller { get; set; }
     }
 }

AsbCloudApp/Data/TimeDto.cs

@@ -5,7 +5,7 @@ namespace AsbCloudApp.Data
     /// <summary>
     /// DTO времени
     /// </summary>
-    public class TimeDto
+    public class TimeDto: IComparable<TimeDto>
     {
         private int hour = 0;
         private int minute = 0;
@@ -51,6 +51,11 @@ namespace AsbCloudApp.Data
             }
         }
 
+        /// <summary>
+        /// Кол-во секунд с начала суток
+        /// </summary>
+        public int TotalSeconds => (Hour * 60 + minute) * 60 + second;
+
         /// <inheritdoc/>
         public TimeDto()
         { }
@@ -71,6 +76,14 @@ namespace AsbCloudApp.Data
             second = time.Second;
         }
 
+        /// <inheritdoc/>
+        public TimeDto(DateTime fullDate)
+        {
+            hour = fullDate.Hour;
+            minute = fullDate.Minute;
+            second = fullDate.Second;
+        }
+
         /// <summary>
         /// Makes System.TimeOnly
         /// </summary>
@@ -83,5 +96,27 @@ namespace AsbCloudApp.Data
             var str = $"{Hour:00}:{Minute:00}:{Second:00}";
             return str;
         }
+
+        /// <inheritdoc/>
+        public static bool operator ==(TimeDto a, TimeDto b) => a?.TotalSeconds == b?.TotalSeconds;
+
+        /// <inheritdoc/>
+        public static bool operator !=(TimeDto a, TimeDto b) => !(a == b);
+
+        /// <inheritdoc/>
+        public static bool operator <=(TimeDto a, TimeDto b) => a.TotalSeconds <= b.TotalSeconds;
+
+        /// <inheritdoc/>
+        public static bool operator >=(TimeDto a, TimeDto b) => a.TotalSeconds >= b.TotalSeconds;
+
+        /// <inheritdoc/>
+        public static bool operator <(TimeDto a, TimeDto b) => a.TotalSeconds < b.TotalSeconds;
+
+        /// <inheritdoc/>
+        public static bool operator >(TimeDto a, TimeDto b) => a.TotalSeconds > b.TotalSeconds;
+
+        /// <inheritdoc/>
+        public int CompareTo(TimeDto other)
+            => TotalSeconds - other.TotalSeconds;
     }
 }

AsbCloudApp/Services/ICrudWellRelatedService.cs

@@ -19,7 +19,7 @@ namespace AsbCloudApp.Services
         /// <param name="idWell">id скважины</param>
         /// <param name="token"></param>
         /// <returns>emptyList if nothing found</returns>
-        Task<IEnumerable<Tdto>> GetAllAsync(int idWell, CancellationToken token);
+        Task<IEnumerable<Tdto>> GetByIdWellAsync(int idWell, CancellationToken token);
 
         /// <summary>
         /// Получение всех записей по нескольким скважинам
@@ -27,7 +27,7 @@ namespace AsbCloudApp.Services
         /// <param name="idsWells">id скважин</param>
         /// <param name="token"></param>
         /// <returns>emptyList if nothing found</returns>
-        Task<IEnumerable<Tdto>> GetAllAsync(IEnumerable<int> idsWells, CancellationToken token);
+        Task<IEnumerable<Tdto>> GetByIdWellAsync(IEnumerable<int> idsWells, CancellationToken token);
     }
 #nullable disable
 }

AsbCloudApp/Services/IOperationValueService.cs

@@ -2,7 +2,7 @@
 
 namespace AsbCloudApp.Services
 {
-    public interface IOperationValueService : ICrudService<OperationValueDto>
+    public interface IOperationValueService : ICrudWellRelatedService<OperationValueDto>
     {
     }
 }

AsbCloudApp/Services/IScheduleService.cs

@@ -6,9 +6,8 @@ using System.Threading.Tasks;
 
 namespace AsbCloudApp.Services
 {
-    public interface IScheduleService : ICrudService<ScheduleDto>
+    public interface IScheduleService : ICrudWellRelatedService<ScheduleDto>
     {
-        Task<IEnumerable<ScheduleDto>> GetByIdWellAsync(int idWell, CancellationToken token = default);
+        Task<DrillerDto> GetDrillerAsync(int idWell, DateTime workTime, CancellationToken token);
-        Task<DrillerDto> GetDrillerAsync(int idWell, DateTime workTime, CancellationToken token = default);
     }
 }

AsbCloudDb/Model/OperationValue.cs

@@ -1,16 +1,11 @@
 using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace AsbCloudDb.Model
 {
     [Table("t_operationvalue"), Comment("Целевые/нормативные показатели операции")]
-    public class OperationValue:IId
+    public class OperationValue: IId, IWellRelated
     {
         [Key]
         [Column("id"), Comment("Идентификатор")]

AsbCloudDb/Model/Schedule.cs

@@ -6,7 +6,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 namespace AsbCloudDb.Model
 {
     [Table("t_schedule"), Comment("График работы бурильщика")]
-    public class Schedule: IId
+    public class Schedule: IId, IWellRelated
     {
         [Key]
         [Column("id"),Comment("Идентификатор")]

AsbCloudInfrastructure/Services/CrudWellRelatedServiceBase.cs

@@ -23,7 +23,7 @@ namespace AsbCloudInfrastructure.Services
         public CrudWellRelatedServiceBase(IAsbCloudDbContext context, Func<DbSet<TEntity>, IQueryable<TEntity>> makeQuery) 
             : base(context, makeQuery) { }
 
-        public async Task<IEnumerable<TDto>> GetAllAsync(int idWell, CancellationToken token)
+        public async Task<IEnumerable<TDto>> GetByIdWellAsync(int idWell, CancellationToken token)
         {
             var entities = await GetQuery()
                .Where(e => e.IdWell == idWell)
@@ -32,7 +32,7 @@ namespace AsbCloudInfrastructure.Services
             return dtos;
         }
 
-        public async Task<IEnumerable<TDto>> GetAllAsync(IEnumerable<int> idsWells, CancellationToken token)
+        public async Task<IEnumerable<TDto>> GetByIdWellAsync(IEnumerable<int> idsWells, CancellationToken token)
         {
             if (!idsWells.Any())
                 return Enumerable.Empty<TDto>();

AsbCloudInfrastructure/Services/DetectOperations/DetectedOperationService.cs

@@ -15,6 +15,10 @@ namespace AsbCloudInfrastructure.Services.DetectOperations
 {
     public class DetectedOperationService: IDetectedOperationService
     {
+        public const int IdOperationRotor = 1;
+        public const int IdOperationSlide = 3;
+        public const int IdOperationSlipsTime = 14;
+
         private readonly IAsbCloudDbContext db;
         private readonly IWellService wellService;
         private readonly IOperationValueService operationValueService;
@@ -35,38 +39,43 @@ namespace AsbCloudInfrastructure.Services.DetectOperations
             if (well?.IdTelemetry is null || well.Timezone is null)
                 return null;
 
-            var res = new DetectedOperationListDto();
             var query = BuildQuery(well, request)
                 .AsNoTracking();
 
             var data = await query.ToListAsync(token);
             
-            var operationValues = await operationValueService.GetAllAsync(token);
+            var operationValues = await operationValueService.GetByIdWellAsync(idWell, token);
-            operationValues = operationValues.Where(o => o.IdWell == idWell);
+            var schedules = await scheduleService.GetByIdWellAsync(idWell, token);
-            var dtos = data.Select(o => Convert(o, well, operationValues));
+            var dtos = data.Select(o => Convert(o, well, operationValues, schedules));
-            foreach (var item in dtos)
+            var groups = dtos.GroupBy(o => o.Driller);
+
+            var stats = new List<DetectedOperationStatDto>(groups.Count());
+            foreach (var group in groups)
             {
-                item.Driller = await scheduleService.GetDrillerAsync(idWell, item.DateStart);
+                var itemsWithTarget = group.Where(i => i.OperationValue is not null);
+                var stat = new DetectedOperationStatDto
+                {
+                    Driller = group.Key,
+                    AverageValue = group.Sum(e => e.Value) / group.Count(),
+                    Count = group.Count(),
+                };
+                if (itemsWithTarget.Any())
+                {
+                    var itemsOutOfTarget = itemsWithTarget.Where(o => !IsTargetOk(o));
+                    stat.AverageTargetValue = itemsWithTarget.Average(e => e.OperationValue.TargetValue);
+                    stat.Efficiency = 100d * itemsOutOfTarget.Count() / itemsWithTarget.Count();
+                    stat.Loss = itemsOutOfTarget.Sum(DeltaToTarget);
+                }
+
+                stats.Add(stat);
             }
-            var group = dtos.GroupBy(o => o.Driller == null ? 0 : o.Driller.Id,
+
-                p => p,
+            var result = new DetectedOperationListDto
-                (key, gr) => (key, gr.ToList())).ToDictionary(e => e.key, e => e.Item2);
-            res.List = dtos;
-            res.Stats = new List<DetectedOperationStatDto>();
-            foreach (var item in group)
             {
-                var obj = new DetectedOperationStatDto();
+                Operations = dtos,
-                obj.Driller = item.Value.FirstOrDefault()?.Driller;
+                Stats = stats
-                obj.Count = item.Value.Count();
+            };
-                obj.Average = item.Value.Sum(e=>e.OperationValue?.TargetValue ?? 0)/obj.Count;
+            return result;
-                obj.Efficiency = 100d * item.Value.Count(e => PredicateTarget(e)(e.Value)) / obj.Count;
-                obj.AverageByParam = item.Value.Sum(e => e.Value) / obj.Count;
-                obj.Loss = item.Value
-                    .Where(e => !PredicateTarget(e)(e.Value))
-                    .Sum(p => Math.Abs(p.Value - p.OperationValue?.TargetValue ?? 0));
-                res.Stats.Add(obj);
-            }
-            return res;
         }
 
         public async Task<int> DeleteAsync(int idWell, DetectedOperationRequest request, CancellationToken token)
@@ -80,17 +89,25 @@ namespace AsbCloudInfrastructure.Services.DetectOperations
             return await db.SaveChangesAsync(token);
         }
 
-        /// <summary>
+        private static bool IsTargetOk(DetectedOperationDto op)
-        /// Определение применяемого предикат по типц операции
-        /// </summary>
-        /// <returns>Предикат для использования</returns>
-        private static Predicate<double> PredicateTarget(DetectedOperationDto op)
         {
-            return op.OperationValue.IdOperationCategory switch
+            return (op.IdCategory) switch
             {
-                1 => (x) => false,
+                IdOperationRotor => op.Value > op.OperationValue.TargetValue,
-                11 => (x) => x > op.OperationValue.TargetValue,
+                IdOperationSlide => op.Value > op.OperationValue.TargetValue,
-                _ => (x) => true
+                IdOperationSlipsTime => op.Value > op.OperationValue.TargetValue,
+                _ => op.Value > op.OperationValue.TargetValue,
+            };
+        }
+
+        private static double DeltaToTarget(DetectedOperationDto op)
+        {
+            return (op.IdCategory) switch
+            {
+                IdOperationRotor => 0,
+                IdOperationSlide => 0,
+                IdOperationSlipsTime => op.Value - op.OperationValue.TargetValue,
+                _ => 0,
             };
         }
 
@@ -142,14 +159,26 @@ namespace AsbCloudInfrastructure.Services.DetectOperations
             return query;
         }
 
-        private static DetectedOperationDto Convert(DetectedOperation operation, WellDto well, IEnumerable<OperationValueDto> operationValues)
+        private DetectedOperationDto Convert(DetectedOperation operation, WellDto well, IEnumerable<OperationValueDto> operationValues, IEnumerable<ScheduleDto> schedules)
         {
             var dto = operation.Adapt<DetectedOperationDto>();
             dto.IdWell = well.Id;
-            dto.DateStart = operation.DateStart.ToRemoteDateTime(well.Timezone.Hours);
+            var dateStart = operation.DateStart.ToRemoteDateTime(well.Timezone.Hours);
+            dto.DateStart = dateStart;
             dto.DateEnd = operation.DateEnd.ToRemoteDateTime(well.Timezone.Hours);
             dto.OperationValue = operationValues.FirstOrDefault(e => e.IdOperationCategory == dto.IdCategory
                   && e.DepthStart <= dto.DepthStart);
+
+            var timeStart = new TimeDto(dateStart);
+            var driller = schedules.FirstOrDefault(s => 
+                s.DrillStart <= dateStart &&
+                s.DrillEnd > dateStart && (
+                s.ShiftStart > s.ShiftEnd 
+                ) ^ (s.ShiftStart <= timeStart &&
+                s.ShiftEnd > timeStart
+                ))
+                ?.Driller;
+            dto.Driller = driller;
             return dto;
         }
 

AsbCloudInfrastructure/Services/DetectOperations/OperationDetectionBackgroundService.cs

@@ -97,15 +97,17 @@ namespace AsbCloudInfrastructure.Services.DetectOperations
                         IdTelemetry = outer,
                         LastDate = inner.SingleOrDefault()?.LastDate ,
                     });
-
+            var affected = 0;
             foreach (var item in JounedlastDetectedDates)
             {
                 var newOperations = await DetectOperationsAsync(item.IdTelemetry, item.LastDate??DateTimeOffset.MinValue, db, token);
                 if (newOperations.Any())
+                {
                     db.DetectedOperations.AddRange(newOperations);
+                    affected += await db.SaveChangesAsync(token);
+                }                    
             }
-
+            return affected;
-            return await db.SaveChangesAsync(token);
         }
 
         private async Task<IEnumerable<DetectedOperation>> DetectOperationsAsync(int idTelemetry, DateTimeOffset begin, IAsbCloudDbContext db, CancellationToken token)
@@ -131,7 +133,7 @@ namespace AsbCloudInfrastructure.Services.DetectOperations
 
             var dbRequests_ = 0;
             var dbTime_ = 0d;
-            var sw_ = new System.Diagnostics.Stopwatch();
+            var sw_ = new Stopwatch();
             var otherTime_ = 0d;
             
             while (true)

AsbCloudInfrastructure/Services/OperationValueService.cs

@@ -4,7 +4,7 @@ using AsbCloudDb.Model;
 
 namespace AsbCloudInfrastructure.Services
 {
-    public class OperationValueService : CrudServiceBase<OperationValueDto, OperationValue>, IOperationValueService
+    public class OperationValueService : CrudWellRelatedServiceBase<OperationValueDto, OperationValue>, IOperationValueService
     {
         public OperationValueService(IAsbCloudDbContext context) : base(context)
         {

AsbCloudInfrastructure/Services/ScheduleService.cs

@@ -12,7 +12,7 @@ using System.Threading.Tasks;
 namespace AsbCloudInfrastructure.Services
 {
 #nullable enable
-    public class ScheduleService : CrudServiceBase<ScheduleDto, Schedule>, IScheduleService
+    public class ScheduleService : CrudWellRelatedServiceBase<ScheduleDto, Schedule>, IScheduleService
     {
         private readonly IWellService wellService;
 
@@ -22,16 +22,7 @@ namespace AsbCloudInfrastructure.Services
             this.wellService = wellService;
         }
 
-        public async Task<IEnumerable<ScheduleDto>> GetByIdWellAsync(int idWell, CancellationToken token = default)
+        public async Task<DrillerDto?> GetDrillerAsync(int idWell, DateTime workTime, CancellationToken token)
-        {
-            var entities = await GetQuery()
-                .Where(s => s.IdWell == idWell)
-                .ToListAsync(token);
-            var dtos = entities.Select(Convert);
-            return dtos;
-        }
-
-        public async Task<DrillerDto?> GetDrillerAsync(int idWell, DateTime workTime, CancellationToken token = default)
         {
             var hoursOffset = wellService.GetTimezone(idWell).Hours;
             var date = workTime.ToUtcDateTimeOffset(hoursOffset);

AsbCloudWebApi/Controllers/CrudWellRelatedController.cs

@@ -48,7 +48,7 @@ namespace AsbCloudWebApi.Controllers
                 return NoContent();
 
             var idsWells = wells.Select(w => w.Id);
-            var result = await service.GetAllAsync(idsWells, token);
+            var result = await service.GetByIdWellAsync(idsWells, token);
             return Ok(result);
         }
 
@@ -59,12 +59,12 @@ namespace AsbCloudWebApi.Controllers
         /// <param name="token"></param>
         /// <returns></returns>
         [HttpGet("well/{idWell}")]
-        public async Task<ActionResult<IEnumerable<T>>> GetAllAsync(int idWell, CancellationToken token)
+        public async Task<ActionResult<IEnumerable<T>>> GetByIdWellAsync(int idWell, CancellationToken token)
         {
             if (!await UserHasAccesToWellAsync(idWell, token))
                 return Forbid();
 
-            var result = await service.GetAllAsync(idWell, token);
+            var result = await service.GetByIdWellAsync(idWell, token);
             return Ok(result);
         }
 
@@ -108,6 +108,7 @@ namespace AsbCloudWebApi.Controllers
             return await base.UpdateAsync(value, token);
         }
 
+        /// <inheritdoc/>
         [HttpDelete("{id}")]
         public override async Task<ActionResult<int>> DeleteAsync(int id, CancellationToken token)
         {

AsbCloudWebApi/Controllers/OperationValueController.cs

@@ -5,12 +5,12 @@ using Microsoft.AspNetCore.Mvc;
 
 namespace AsbCloudWebApi.Controllers
 {
-    [Route("api/operationvalue")]
+    [Route("api/operationValue")]
     [ApiController]
     [Authorize]
-    public class OperationValueController : CrudController<OperationValueDto, IOperationValueService>
+    public class OperationValueController : CrudWellRelatedController<OperationValueDto, IOperationValueService>
     {
-        public OperationValueController(IOperationValueService service) : base(service)
+        public OperationValueController(IOperationValueService service, IWellService wellService) : base(wellService, service)
         {
         }
     }

AsbCloudWebApi/Controllers/SAUB/DetectedOperationController.cs

@@ -45,7 +45,7 @@ namespace AsbCloudWebApi.Controllers.SAUB
         /// <param name="token"></param>
         /// <returns></returns>
         [HttpGet]
-        [ProducesResponseType(typeof(IEnumerable<DetectedOperationDto>), (int)System.Net.HttpStatusCode.OK)]
+        [ProducesResponseType(typeof(DetectedOperationListDto), (int)System.Net.HttpStatusCode.OK)]
         public async Task<IActionResult> GetAsync(
             int idWell,
             [FromQuery] DetectedOperationRequest request,