on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity

#20644813 ркфакторинг SubsystemOperationTimeService

Browse Source 
#20369896 Добавлены новые свойства статистики по наработке подсистем
This commit is contained in:
Frolov-Nikita 2023-10-04 16:41:19 +05:00
parent d2f6d468ab
commit ee22408225
No known key found for this signature in database
GPG Key ID: 719E3386D12B0760
8 changed files with 524 additions and 408 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
AsbCloudApp/Data/DetectedOperation/OperationsSummaryDto.cs Normal file
View File

@ -0,0 +1,32 @@
namespace AsbCloudApp.Data.DetectedOperation;
/// <summary>
/// Статистика по операциям
/// </summary>
public class OperationsSummaryDto
{
/// <summary>
/// Id телеметрии
/// </summary>
public int IdTelemetry { get; set; }
/// <summary>
/// Id названия/описания операции
/// </summary>
public int IdCategory { get; set; }
/// <summary>
/// Количество операций
/// </summary>
public int Count { get; set; }
/// <summary>
/// Cумма проходок операций
/// </summary>
public double SumDepthIntervals { get; set; }
/// <summary>
/// Cумма продолжительностей операций
/// </summary>
public double SumDurationHours { get; set; }
}

13
AsbCloudApp/Data/Subsystems/SubsystemStatDto.cs
View File

@ -23,13 +23,20 @@ namespace AsbCloudApp.Data.Subsystems
/// </summary> /// </summary>
public double KUsage { get; set; } public double KUsage { get; set; }
/// <summary> /// <summary>
/// сумма изменения глубин /// сумма изменения глубин при включеной подсистеме
/// </summary> /// </summary>
public double SumDepthInterval { get; set; } public double SumDepthInterval { get; set; }
/// <summary> /// <summary>
/// количество операций /// сумма проходок автоопределенных операций выполняемых подсистемой
/// </summary>
public double SumOperationDepthInterval { get; set; }
/// <summary>
/// сумма продолжительности автоопределенных операций выполняемых подсистемой
/// </summary>
public double SumOperationDurationHours { get; set; }
/// <summary>
/// количество включений подсистемы
/// </summary> /// </summary>
public int OperationCount { get; set; } public int OperationCount { get; set; }
} }
} }

53
AsbCloudApp/Requests/DetectedOperationSummaryRequest.cs Normal file
View File

@ -0,0 +1,53 @@
using System;
using System.Collections.Generic;
using System.Linq;
namespace AsbCloudApp.Requests;
/// <summary>
/// Запрос на получение обобщенных данных по операцим
/// </summary>
public class DetectedOperationSummaryRequest
{
/// <summary>
/// Список id телеметрий
/// пустой список - нет фильтрации
/// </summary>
public IEnumerable<int> IdsTelemetries { get;set;} = Enumerable.Empty<int>();
/// <summary>
/// Список id категорий операций
/// пустой список - нет фильтрации
/// </summary>
public IEnumerable<int> IdsOperationCategories { get; set; } = Enumerable.Empty<int>();
/// <summary>
/// Больше или равно даты начала операции
/// </summary>
public DateTimeOffset? GeDateStart {get;set;}
/// <summary>
/// Меньше или равно даты начала операции
/// </summary>
public DateTimeOffset? LeDateStart { get; set; }
/// <summary>
/// Меньше или равно даты окончания операции
/// </summary>
public DateTimeOffset? LeDateEnd { get; set; }
/// <summary>
/// Больше или равно глубины начала операции
/// </summary>
public double? GeDepthStart { get; set; }
/// <summary>
/// Меньше или равно глубины начала операции
/// </summary>
public double? LeDepthStart { get; set; }
/// <summary>
/// Меньше или равно глубины окончания операции
/// </summary>
public double? LeDepthEnd { get; set; }
}

3
AsbCloudApp/Requests/SubsystemOperationTimeRequest.cs
View File

@ -26,7 +26,7 @@ namespace AsbCloudApp.Requests
/// <summary> /// <summary>
/// Больше или равно дате /// Больше или равно дате
/// </summary> /// </summary>
public DateTime? GtDate { get; set; } public DateTime? GtDate { get; set; }//TODO: its Ge*
/// <summary> /// <summary>
/// Меньше или равно дате /// Меньше или равно дате
@ -43,6 +43,7 @@ namespace AsbCloudApp.Requests
/// </summary> /// </summary>
public double? LtDepth { get; set; } public double? LtDepth { get; set; }
//TODO: Replace modes by DateTimeOffset LeDateStart, LeDateEnd
/// <summary> /// <summary>
/// информация попадает в выборку, если интервал выборки частично или полностью пересекается с запрашиваемым интервалом /// информация попадает в выборку, если интервал выборки частично или полностью пересекается с запрашиваемым интервалом
/// </summary> /// </summary>

6
AsbCloudApp/Services/IDetectedOperationService.cs
View File

@ -42,12 +42,10 @@ namespace AsbCloudApp.Services
/// <summary> /// <summary>
/// Получить интервалы глубин по всем скважинам /// Получить интервалы глубин по всем скважинам
/// </summary> /// </summary>
/// <param name="telemetryIds">список ИД телеметрий активных скважин</param> /// <param name="request"></param>
/// <param name="gtDate"></param>
/// <param name="ltDate"></param>
/// <param name="token"></param> /// <param name="token"></param>
/// <returns>кортеж - ид телеметрии, интервалы глубины забоя (ротор,слайд) </returns> /// <returns>кортеж - ид телеметрии, интервалы глубины забоя (ротор,слайд) </returns>
Task<IEnumerable<(int idTelemetry,double depthIntervalRotor, double depthIntervalSlide)>> GetDepthIntervalAllOperationsAsync(IEnumerable<int?> telemetryIds,DateTimeOffset gtDate, DateTimeOffset ltDate, CancellationToken token); Task<IEnumerable<OperationsSummaryDto>> GetOperationSummaryAsync(DetectedOperationSummaryRequest request, CancellationToken token);
/// <summary> /// <summary>
/// Удалить операции /// Удалить операции

4
AsbCloudApp/Services/Subsystems/ISubsystemOperationTimeService.cs
View File

@ -19,7 +19,7 @@ namespace AsbCloudApp.Services.Subsystems
/// <param name="request"></param> /// <param name="request"></param>
/// <param name="token"></param> /// <param name="token"></param>
/// <returns></returns> /// <returns></returns>
Task<IEnumerable<SubsystemStatDto>?> GetStatAsync(SubsystemOperationTimeRequest request, CancellationToken token); Task<IEnumerable<SubsystemStatDto>> GetStatAsync(SubsystemOperationTimeRequest request, CancellationToken token);
/// <summary> /// <summary>
/// Удаление наработки по подсистемам. /// Удаление наработки по подсистемам.
@ -37,7 +37,7 @@ namespace AsbCloudApp.Services.Subsystems
/// <param name="request"></param> /// <param name="request"></param>
/// <param name="token"></param> /// <param name="token"></param>
/// <returns></returns> /// <returns></returns>
Task<IEnumerable<SubsystemOperationTimeDto>?> GetOperationTimeAsync(SubsystemOperationTimeRequest request, CancellationToken token); Task<IEnumerable<SubsystemOperationTimeDto>> GetOperationTimeAsync(SubsystemOperationTimeRequest request, CancellationToken token);
/// <summary> /// <summary>
/// Временной диапазон за который есть статистика работы подсистем /// Временной диапазон за который есть статистика работы подсистем

67
AsbCloudInfrastructure/Services/DetectOperations/DetectedOperationService.cs
View File

@ -67,27 +67,58 @@ namespace AsbCloudInfrastructure.Services.DetectOperations
return dtos; return dtos;
} }
public async Task<IEnumerable<(int idTelemetry, double depthIntervalRotor, double depthIntervalSlide)>> GetDepthIntervalAllOperationsAsync(IEnumerable<int?> telemetryIds, DateTimeOffset gtDate, DateTimeOffset ltDate, CancellationToken token) public async Task<IEnumerable<OperationsSummaryDto>> GetOperationSummaryAsync(DetectedOperationSummaryRequest request, CancellationToken token)
{ {
var query = db.Set<DetectedOperation>() var query = db.Set<DetectedOperation>()
.Include(o => o.OperationCategory) .AsNoTracking();
.Where(o => o.DateStart >= gtDate)
.Where(o => o.DateEnd <= ltDate) if (request.IdsTelemetries.Any())
.Where(o => telemetryIds.Contains(o.IdTelemetry)) query = query.Where(operation => request.IdsTelemetries.Contains(operation.IdTelemetry));
.GroupBy(g => g.IdTelemetry)
.Select(g => new if (request.IdsOperationCategories.Any())
query = query.Where(operation => request.IdsOperationCategories.Contains(operation.IdCategory));
if (request.GeDateStart.HasValue)
{ {
IdTelemetry = g.Key, var geDateStart = request.GeDateStart.Value.ToUniversalTime();
RotorDepthInterval = g.Where(o => o.IdCategory == WellOperationCategory.IdRotor).Sum(o => o.DepthEnd - o.DepthStart), query = query.Where(operation => operation.DateStart >= geDateStart);
SlideDepthInterval = g.Where(o => o.IdCategory == WellOperationCategory.IdSlide).Sum(o => o.DepthEnd - o.DepthStart) }
});
var data = await query.ToArrayAsync(token); if (request.LeDateStart.HasValue)
var result = data.Select(g => {
( var leDateStart = request.LeDateStart.Value.ToUniversalTime();
g.IdTelemetry, query = query.Where(operation => operation.DateStart <= leDateStart);
g.RotorDepthInterval, }
g.SlideDepthInterval
)); if (request.LeDateEnd.HasValue)
{
var leDateEnd = request.LeDateEnd.Value.ToUniversalTime();
query = query.Where(operation => operation.DateEnd <= leDateEnd);
}
if (request.GeDepthStart.HasValue)
query = query.Where(operation => operation.DepthStart >= request.GeDepthStart.Value);
if (request.LeDepthStart.HasValue)
query = query.Where(operation => operation.DepthStart <= request.LeDepthStart.Value);
if (request.LeDepthEnd.HasValue)
query = query.Where(operation => operation.DepthEnd <= request.LeDepthEnd.Value);
var queryGroup = query
.GroupBy(operation => new { operation.IdTelemetry, operation.IdCategory })
.Select(group => new OperationsSummaryDto
{
IdTelemetry = group.Key.IdTelemetry,
IdCategory = group.Key.IdCategory,
Count = group.Count(),
SumDepthIntervals = group.Sum(operation => operation.DepthEnd - operation.DepthStart),
SumDurationHours = group.Sum(operation => (operation.DateEnd - operation.DateStart).TotalHours)
})
.OrderBy(summ => summ.IdTelemetry)
.ThenBy(summ => summ.IdCategory);
var result = await queryGroup.ToArrayAsync(token);
return result; return result;
} }

208
AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeService.cs
View File

@ -16,10 +16,10 @@ using System.Linq;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace AsbCloudInfrastructure.Services.Subsystems namespace AsbCloudInfrastructure.Services.Subsystems;
internal class SubsystemOperationTimeService : ISubsystemOperationTimeService
{ {
internal class SubsystemOperationTimeService : ISubsystemOperationTimeService
{
private readonly IAsbCloudDbContext db; private readonly IAsbCloudDbContext db;
private readonly IWellService wellService; private readonly IWellService wellService;
private readonly ICrudRepository<SubsystemDto> subsystemService; private readonly ICrudRepository<SubsystemDto> subsystemService;
@ -30,6 +30,7 @@ namespace AsbCloudInfrastructure.Services.Subsystems
public const int IdSubsystemMSE = 2; public const int IdSubsystemMSE = 2;
public const int IdSubsystemSpin = 65536; public const int IdSubsystemSpin = 65536;
public const int IdSubsystemTorque = 65537; public const int IdSubsystemTorque = 65537;
public SubsystemOperationTimeService(IAsbCloudDbContext db, IWellService wellService, ICrudRepository<SubsystemDto> subsystemService, IDetectedOperationService detectedOperationService) public SubsystemOperationTimeService(IAsbCloudDbContext db, IWellService wellService, ICrudRepository<SubsystemDto> subsystemService, IDetectedOperationService detectedOperationService)
{ {
this.db = db; this.db = db;
@ -41,28 +42,27 @@ namespace AsbCloudInfrastructure.Services.Subsystems
/// <inheritdoc/> /// <inheritdoc/>
public async Task<int> DeleteAsync(SubsystemOperationTimeRequest request, CancellationToken token) public async Task<int> DeleteAsync(SubsystemOperationTimeRequest request, CancellationToken token)
{ {
var well = await wellService.GetOrDefaultAsync(request.IdWell, token); var well = await wellService.GetOrDefaultAsync(request.IdWell, token)
if (well?.IdTelemetry is null || well.Timezone is null) ?? throw new ArgumentInvalidException(nameof(request.IdWell), $"Well Id: {request.IdWell} does not exist");
return 0;
var query = BuildQuery(request); var query = BuildQuery(request, well);
if (query is null)
return 0;
db.SubsystemOperationTimes.RemoveRange(query); db.SubsystemOperationTimes.RemoveRange(query);
return await db.SaveChangesAsync(token); return await db.SaveChangesAsync(token);
} }
/// <inheritdoc/> /// <inheritdoc/>
public async Task<IEnumerable<SubsystemOperationTimeDto>?> GetOperationTimeAsync(SubsystemOperationTimeRequest request, CancellationToken token) public async Task<IEnumerable<SubsystemOperationTimeDto>> GetOperationTimeAsync(SubsystemOperationTimeRequest request, CancellationToken token)
{ {
var well = await wellService.GetOrDefaultAsync(request.IdWell, token); var well = await wellService.GetOrDefaultAsync(request.IdWell, token)
if (well?.IdTelemetry is null || well.Timezone is null) ?? throw new ArgumentInvalidException(nameof(request.IdWell), $"Well Id: {request.IdWell} does not exist");
return null;
var query = BuildQuery(request); var dtos = await GetOperationTimeAsync(request, well, token);
return dtos;
if (query is null) }
return null;
private async Task<IEnumerable<SubsystemOperationTimeDto>> GetOperationTimeAsync(SubsystemOperationTimeRequest request, WellDto well, CancellationToken token)
{
var query = BuildQuery(request, well);
IEnumerable<SubsystemOperationTime> data = await query.ToListAsync(token); IEnumerable<SubsystemOperationTime> data = await query.ToListAsync(token);
if (request.SelectMode == SubsystemOperationTimeRequest.SelectModeInner) if (request.SelectMode == SubsystemOperationTimeRequest.SelectModeInner)
@ -85,28 +85,32 @@ namespace AsbCloudInfrastructure.Services.Subsystems
} }
/// <inheritdoc/> /// <inheritdoc/>
public async Task<IEnumerable<SubsystemStatDto>?> GetStatAsync(SubsystemOperationTimeRequest request, CancellationToken token) public async Task<IEnumerable<SubsystemStatDto>> GetStatAsync(SubsystemOperationTimeRequest request, CancellationToken token)
{ {
var well = await wellService.GetOrDefaultAsync(request.IdWell, token)
?? throw new ArgumentInvalidException(nameof(request.IdWell), $"Well Id: {request.IdWell} does not exist");
request.SelectMode = SubsystemOperationTimeRequest.SelectModeTrim; request.SelectMode = SubsystemOperationTimeRequest.SelectModeTrim;
var data = await GetOperationTimeAsync(request, token); var subsystemsTimes = await GetOperationTimeAsync(request, well, token);
if (data is null) if (subsystemsTimes is null)
return null; return Enumerable.Empty<SubsystemStatDto>();
var detectedOperationsRequest = new DetectedOperationRequest() var detectedOperationSummaryRequest = new DetectedOperationSummaryRequest()
{ {
IdWell = request.IdWell, IdsTelemetries = new[] {well.IdTelemetry!.Value},
IdsCategories = new int[] { IdsOperationCategories = WellOperationCategory.MechanicalDrillingSubIds,
WellOperationCategory.IdRotor, WellOperationCategory.IdSlide,
},
LtDate = request.LtDate,
GtDate = request.GtDate,
};
var detectedOperations = await detectedOperationService.GetOperationsAsync(detectedOperationsRequest, token);
if(detectedOperations?.Any() != true)
return null;
var depthInterval = GetDepthInterval(detectedOperations);
var statList = CalcStat(data,depthInterval); GeDateStart = request.GtDate,
LeDateStart = request.LtDate,
GeDepthStart = request.GtDepth,
LeDepthStart = request.LtDepth,
};
var operationsSummaries = await detectedOperationService.GetOperationSummaryAsync(detectedOperationSummaryRequest, token);
if(!operationsSummaries.Any())
return Enumerable.Empty<SubsystemStatDto>();
var statList = CalcStat(subsystemsTimes, operationsSummaries);
return statList; return statList;
} }
@ -145,28 +149,29 @@ namespace AsbCloudInfrastructure.Services.Subsystems
} }
private IEnumerable<SubsystemStatDto> CalcStat( private IEnumerable<SubsystemStatDto> CalcStat(
IEnumerable<SubsystemOperationTimeDto> dtos, IEnumerable<SubsystemOperationTimeDto> subsystemsTimes,
(double depthIntervalRotor, double depthIntervalSlide) depthInterval) IEnumerable<OperationsSummaryDto> operationsSummaries)
{ {
var groupedDataSubsystems = dtos var groupedSubsystemsTimes = subsystemsTimes
.OrderBy(o => o.Id) .OrderBy(o => o.Id)
.GroupBy(o => o.IdSubsystem); .GroupBy(o => o.IdSubsystem);
var periodGroupTotal = dtos.Sum(o => (o.DateEnd - o.DateStart).TotalHours);
var result = groupedDataSubsystems.Select(g => var periodGroupTotal = subsystemsTimes.Sum(o => (o.DateEnd - o.DateStart).TotalHours);
var result = groupedSubsystemsTimes.Select(g =>
{ {
var depthIntervalSubsystem = GetDepthIntervalSubsystem(g.Key, depthInterval);
var periodGroup = g.Sum(o => (o.DateEnd - o.DateStart).TotalHours); var periodGroup = g.Sum(o => (o.DateEnd - o.DateStart).TotalHours);
var periodGroupDepth = g.Sum(o => o.DepthEnd - o.DepthStart); var periodGroupDepth = g.Sum(o => o.DepthEnd - o.DepthStart);
var (sumOprationsDepth, sumOprationsDurationHours) = AggregateOperationsSummaries(g.Key, operationsSummaries);
var subsystemStat = new SubsystemStatDto() var subsystemStat = new SubsystemStatDto()
{ {
IdSubsystem = g.Key, IdSubsystem = g.Key,
SubsystemName = subsystemService.GetOrDefault(g.Key)?.Name ?? "unknown", SubsystemName = subsystemService.GetOrDefault(g.Key)?.Name ?? "unknown",
UsedTimeHours = periodGroup, UsedTimeHours = periodGroup,
//% использования = суммарная проходка АПД в слайде SumOperationDepthInterval = sumOprationsDepth,
/// суммарную проходку автоопределенных операций в слайде. SumOperationDurationHours = sumOprationsDurationHours,
KUsage = periodGroupDepth / depthIntervalSubsystem,
SumDepthInterval = periodGroupDepth, SumDepthInterval = periodGroupDepth,
KUsage = periodGroupDepth / sumOprationsDepth,
OperationCount = g.Count(), OperationCount = g.Count(),
}; };
if (subsystemStat.KUsage > 1) if (subsystemStat.KUsage > 1)
@ -182,57 +187,37 @@ namespace AsbCloudInfrastructure.Services.Subsystems
IdSubsystem = IdSubsystemAKB, IdSubsystem = IdSubsystemAKB,
SubsystemName = "АПД", SubsystemName = "АПД",
UsedTimeHours = apdParts.Sum(part => part.UsedTimeHours), UsedTimeHours = apdParts.Sum(part => part.UsedTimeHours),
KUsage = apdParts.Sum(part => part.SumDepthInterval) / GetDepthIntervalSubsystem(IdSubsystemAKB, depthInterval), SumOperationDepthInterval = apdParts.Sum(part => part.SumOperationDepthInterval),
SumOperationDurationHours = apdParts.Sum(part => part.SumOperationDurationHours),
SumDepthInterval = apdParts.Sum(part => part.SumDepthInterval), SumDepthInterval = apdParts.Sum(part => part.SumDepthInterval),
OperationCount = apdParts.Sum(part => part.OperationCount), OperationCount = apdParts.Sum(part => part.OperationCount),
}; };
apdSum.KUsage = apdSum.SumDepthInterval / apdSum.SumOperationDepthInterval;
if (apdSum.KUsage > 1)
apdSum.KUsage = 1;
result = result.Append(apdSum).OrderBy(m => m.IdSubsystem); result = result.Append(apdSum).OrderBy(m => m.IdSubsystem);
} }
return result; return result;
} }
private static (double depthIntervalRotor, double depthIntervalSlide) GetDepthInterval (IEnumerable<DetectedOperationDto> detectedOperations) private static (double SumDepth, double SumDurationHours) AggregateOperationsSummaries(int idSubsystem, IEnumerable<OperationsSummaryDto> operationsSummaries)
=> idSubsystem switch
{ {
var depthIntervalRotor = detectedOperations.Where(o => o.IdCategory == WellOperationCategory.IdRotor) IdSubsystemAKBRotor or IdSubsystemTorque => CalcOperationSummariesByCategories(operationsSummaries, WellOperationCategory.IdRotor),
.Sum(o => o.DepthEnd - o.DepthStart); IdSubsystemAKBSlide or IdSubsystemSpin => CalcOperationSummariesByCategories(operationsSummaries, WellOperationCategory.IdSlide),
var depthIntervalSlide = detectedOperations.Where(o => o.IdCategory == WellOperationCategory.IdSlide) IdSubsystemAKB or IdSubsystemMSE => CalcOperationSummariesByCategories(operationsSummaries, WellOperationCategory.IdRotor, WellOperationCategory.IdSlide),
.Sum(o => o.DepthEnd - o.DepthStart); _ => throw new ArgumentException($"idSubsystem: {idSubsystem} does not supported in this method", nameof(idSubsystem)),
var depthInterval = (depthIntervalRotor, depthIntervalSlide); };
return depthInterval; private static (double SumDepth, double SumDurationHours) CalcOperationSummariesByCategories(
} IEnumerable<OperationsSummaryDto> operationsSummaries,
params int[] idsOperationCategories)
private static double GetDepthIntervalSubsystem(int idSubsystem, (double depthIntervalRotor, double depthIntervalSlide) depthInterval)
{ {
var depthIntervalSubsystem = 0d; var filtered = operationsSummaries.Where(sum => idsOperationCategories.Contains(sum.IdCategory));
//AKB - MSE var sumDepth = filtered.Sum(summ => summ.SumDepthIntervals);
if (idSubsystem == IdSubsystemAKB || idSubsystem == IdSubsystemMSE) var sumDurationHours = filtered.Sum(summ => summ.SumDurationHours);
{ return (sumDepth, sumDurationHours);
depthIntervalSubsystem = depthInterval.depthIntervalRotor + depthInterval.depthIntervalSlide;
}
//AKB - Rotor
if (idSubsystem == IdSubsystemAKBRotor)
{
depthIntervalSubsystem = depthInterval.depthIntervalRotor;
}
//AKB - Slide
if (idSubsystem == IdSubsystemAKBSlide)
{
depthIntervalSubsystem = depthInterval.depthIntervalSlide;
}
//Spin
if (idSubsystem == IdSubsystemSpin)
{
depthIntervalSubsystem = depthInterval.depthIntervalSlide;
}
//Torque
if (idSubsystem == IdSubsystemTorque)
{
depthIntervalSubsystem = depthInterval.depthIntervalRotor;
}
return depthIntervalSubsystem;
} }
/// <inheritdoc/> /// <inheritdoc/>
@ -273,21 +258,27 @@ namespace AsbCloudInfrastructure.Services.Subsystems
.DateTime .DateTime
.ToUtcDateTimeOffset(hoursOffset); .ToUtcDateTimeOffset(hoursOffset);
var telemetryIds = wells IEnumerable<int> idsTelemetries = wells
.Where(w => w.IdTelemetry is not null) .Where(w => w.IdTelemetry is not null)
.Select(w => w.IdTelemetry) .Select(w => w.IdTelemetry!.Value)
.Distinct(); .Distinct();
var query = db.SubsystemOperationTimes var query = db.SubsystemOperationTimes
.Where(o => telemetryIds.Contains(o.IdTelemetry) && .Where(o => idsTelemetries.Contains(o.IdTelemetry) &&
o.DateStart >= beginUTC && o.DateStart >= beginUTC &&
o.DateEnd <= endUTC) o.DateEnd <= endUTC)
.AsNoTracking(); .AsNoTracking();
var subsystemsOperationTime = await query.ToListAsync(token); var subsystemsOperationTime = await query.ToArrayAsync(token);
var depthIntervals = await detectedOperationService var operationSummaries = await detectedOperationService
.GetDepthIntervalAllOperationsAsync(telemetryIds, beginUTC, endUTC, token); .GetOperationSummaryAsync(new ()
{
IdsTelemetries = idsTelemetries,
IdsOperationCategories = WellOperationCategory.MechanicalDrillingSubIds,
GeDateStart = beginUTC,
LeDateEnd = endUTC,
}, token);
var result = wells var result = wells
.Select(well => { .Select(well => {
@ -295,21 +286,22 @@ namespace AsbCloudInfrastructure.Services.Subsystems
.Where(s => s.IdTelemetry == well.IdTelemetry) .Where(s => s.IdTelemetry == well.IdTelemetry)
.Select(s => Convert(s, well.Timezone.Hours)); .Select(s => Convert(s, well.Timezone.Hours));
var (idTelemetry, depthIntervalRotor, depthIntervalSlide) = depthIntervals var wellStat = new SubsystemActiveWellStatDto{ Well = well };
.FirstOrDefault(i => i.idTelemetry == well.IdTelemetry);
var subsystemStat = idTelemetry > 0 && dtos.Any() var telemetryOperationSummaries = operationSummaries.Where(summ => summ.IdTelemetry == well.IdTelemetry);
? CalcStat(dtos, (depthIntervalRotor, depthIntervalSlide)) if (telemetryOperationSummaries.Any())
: Enumerable.Empty<SubsystemStatDto>();
return new SubsystemActiveWellStatDto
{ {
Well = well, var subsystemStat = CalcStat(dtos, telemetryOperationSummaries);
SubsystemAKB = subsystemStat.FirstOrDefault(s => s.IdSubsystem == IdSubsystemAKB), if (subsystemStat.Any())
SubsystemMSE = subsystemStat.FirstOrDefault(s => s.IdSubsystem == IdSubsystemMSE), {
SubsystemSpinMaster = subsystemStat.FirstOrDefault(s => s.IdSubsystem == IdSubsystemSpin), wellStat.SubsystemAKB = subsystemStat.FirstOrDefault(s => s.IdSubsystem == IdSubsystemAKB);
SubsystemTorqueMaster = subsystemStat.FirstOrDefault(s => s.IdSubsystem == IdSubsystemTorque), wellStat.SubsystemMSE = subsystemStat.FirstOrDefault(s => s.IdSubsystem == IdSubsystemMSE);
}; wellStat.SubsystemSpinMaster = subsystemStat.FirstOrDefault(s => s.IdSubsystem == IdSubsystemSpin);
wellStat.SubsystemTorqueMaster = subsystemStat.FirstOrDefault(s => s.IdSubsystem == IdSubsystemTorque);
}
}
return wellStat;
}); });
return result; return result;
@ -318,7 +310,10 @@ namespace AsbCloudInfrastructure.Services.Subsystems
/// <inheritdoc/> /// <inheritdoc/>
public async Task<DatesRangeDto?> GetDateRangeOperationTimeAsync(SubsystemOperationTimeRequest request, CancellationToken token) public async Task<DatesRangeDto?> GetDateRangeOperationTimeAsync(SubsystemOperationTimeRequest request, CancellationToken token)
{ {
var query = BuildQuery(request); var well = await wellService.GetOrDefaultAsync(request.IdWell, token)
?? throw new ArgumentInvalidException(nameof(request.IdWell), $"Well Id: {request.IdWell} does not exist");
var query = BuildQuery(request, well);
if (query is null) if (query is null)
{ {
return null; return null;
@ -334,14 +329,14 @@ namespace AsbCloudInfrastructure.Services.Subsystems
return result; return result;
} }
private IQueryable<SubsystemOperationTime> BuildQuery(SubsystemOperationTimeRequest request) private IQueryable<SubsystemOperationTime> BuildQuery(SubsystemOperationTimeRequest request, WellDto well)
{ {
var well = wellService.GetOrDefault(request.IdWell) var idTelemetry = well.IdTelemetry
?? throw new ArgumentInvalidException(nameof(request.IdWell), $"Not valid IdWell = {request.IdWell}"); ?? throw new ArgumentInvalidException(nameof(request.IdWell), $"Well Id: {request.IdWell} has no telemetry");
var query = db.SubsystemOperationTimes var query = db.SubsystemOperationTimes
.Include(o => o.Subsystem) .Include(o => o.Subsystem)
.Where(o => o.IdTelemetry == well.IdTelemetry) .Where(o => o.IdTelemetry == idTelemetry)
.AsNoTracking(); .AsNoTracking();
if (request.IdsSubsystems.Any()) if (request.IdsSubsystems.Any())
@ -396,5 +391,4 @@ namespace AsbCloudInfrastructure.Services.Subsystems
dto.DateEnd = operationTime.DateEnd.ToRemoteDateTime(hours); dto.DateEnd = operationTime.DateEnd.ToRemoteDateTime(hours);
return dto; return dto;
} }
}
} }