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

Наработки по качеству

Browse Source
This commit is contained in:
Olga Nemt 2024-10-03 11:09:38 +05:00
parent 50f6c764ba
commit 7d369f8499
12 changed files with 267 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

135
AsbCloudApp/Data/DataSaubStatDto.cs
View File

@ -1,135 +0,0 @@
using System;
using AsbCloudApp.Data.WellOperation;
namespace AsbCloudApp.Data;
/// <summary>
/// dto для хранения данных статистики сауб
/// </summary>
public class DataSaubStatDto:IId
{
/// <summary>
///
/// </summary>
public int Id { get; set; }
/// <summary>
/// Дата и время начала
/// </summary>
public DateTimeOffset DateStart { get; set; }
/// <summary>
/// Дата и время окончания
/// </summary>
public DateTimeOffset DateEnd { get; set; }
/// <summary>
/// Глубина забоя по стволу начальная
/// </summary>
public double DepthStart { get; set; }
/// <summary>
/// Глубина забоя по стволу конечная
/// </summary>
public double DepthEnd { get; set; }
/// <summary>
/// Скорость бурения
/// </summary>
public double Speed { get; set; }
/// <summary>
/// Ограничение скорости блока
/// </summary>
public double? BlockSpeedSp { get; set; }
/// <summary>
/// Давление
/// </summary>
public double Pressure { get; set; }
/// <summary>
/// Давление холостого хода
/// </summary>
public double? PressureIdle { get; set; }
/// <summary>
/// Ограничение фактического давления
/// </summary>
public double? PressureSp { get; set; }
/// <summary>
/// Фактическая нагрузка
/// </summary>
public double AxialLoad { get; set; }
/// <summary>
/// Ограничение факт. нагрузки
/// </summary>
public double? AxialLoadSp { get; set; }
/// <summary>
/// Максимально допустимая нагрузка
/// </summary>
public double? AxialLoadLimitMax { get; set; }
/// <summary>
/// Фактический момент
/// </summary>
public double RotorTorque { get; set; }
/// <summary>
/// Ограничение факт. момента
/// </summary>
public double? RotorTorqueSp { get; set; }
/// <summary>
/// Максимально допустимый момент
/// </summary>
public double? RotorTorqueLimitMax { get; set; }
/// <summary>
/// Работа при достижении ограничения
/// </summary>
public short? IdFeedRegulator { get; set; }
/// <summary>
/// Фактическая скорость оборотов ВСП
/// </summary>
public double RotorSpeed { get; set; }
/// <summary>
/// Название автоопределённой операции
/// </summary>
public int IdCategory { get; set; }
/// <summary>
/// Флаги подсистем
/// </summary>
public int EnabledSubsystems { get; set; }
/// <summary>
/// Наличие или отсутствие осцилляции
/// </summary>
public bool HasOscillation { get; set; }
/// <summary>
/// Фактический расход
/// </summary>
public double Flow { get; set; }
/// <summary>
/// Ключ телеметрии
/// </summary>
public int IdTelemetry { get; set; }
/// <summary>
/// Телеметрия
/// </summary>
public TelemetryDto Telemetry { get; set; } = null!;
/// <summary>
/// Категория автоопределенной операции
/// </summary>
public WellOperationCategoryDto OperationCategory { get; set; } = null!;
}

2
AsbCloudApp/Repositories/IDataSaubStatRepository.cs
View File

@ -1,4 +1,4 @@
using AsbCloudApp.Data;
using AsbCloudApp.Data.DataSaubStat;
using AsbCloudApp.Services;
using System;
using System.Collections.Generic;

3
AsbCloudApp/Services/ITelemetryDataSaubService.cs
View File

@ -21,8 +21,9 @@ public interface ITelemetryDataSaubService : ITelemetryDataService<TelemetryData
/// <param name="leDate"></param>
/// <param name="take"></param>
/// <param name="token"></param>
/// <param name="idsFeedRegulators"></param>
/// <returns></returns>
Task<IEnumerable<TelemetryDataSaubDto>> Get(IEnumerable<int> idsTelemetries, bool isBitOnBottom, DateTimeOffset geDate, DateTimeOffset leDate, int take, CancellationToken token);
Task<IEnumerable<TelemetryDataSaubDto>> Get(IEnumerable<int> idsTelemetries, bool isBitOnBottom, DateTimeOffset geDate, DateTimeOffset leDate, int take, CancellationToken token, IEnumerable<short>? idsFeedRegulators = null);
/// <summary>
/// усредненная статистика по 1м за весь период

2
AsbCloudInfrastructure.Tests/Services/DataSaubStatServiceTest.cs
View File

@ -1,4 +1,4 @@
using AsbCloudApp.Data;
using AsbCloudApp.Data.DataSaubStat;
using AsbCloudApp.Data.DetectedOperation;
using AsbCloudApp.Data.SAUB;
using AsbCloudApp.Repositories;

3
AsbCloudInfrastructure/DependencyInjection.cs
View File

@ -319,7 +319,8 @@ public static class DependencyInjection
services.AddTransient<IHelpPageService, HelpPageService>();
services.AddTransient<IScheduleReportService, ScheduleReportService>();
services.AddTransient<IDataSaubStatRepository, DataSaubStatRepository>();
services.AddTransient<IDataSaubStatService, DataSaubStatService>();
//services.AddTransient<IDataSaubStatService, DataSaubStatService>();
services.AddTransient<IDataSaubStatService, DataSaubStatDrillingQualityService>();
services.AddTransient<IWellOperationService, WellOperationService>();
services.AddTransient<

2
AsbCloudInfrastructure/Repository/DataSaubStatRepository.cs
View File

@ -1,4 +1,4 @@
using AsbCloudApp.Data;
using AsbCloudApp.Data.DataSaubStat;
using AsbCloudApp.Repositories;
using AsbCloudApp.Requests;
using AsbCloudApp.Services;

239
AsbCloudInfrastructure/Services/DataSaubStatDrillingQualityService.cs Normal file
View File

@ -0,0 +1,239 @@
using AsbCloudApp.Data;
using AsbCloudApp.Data.DataSaubStat;
using AsbCloudApp.Data.DetectedOperation;
using AsbCloudApp.Data.SAUB;
using AsbCloudApp.Repositories;
using AsbCloudApp.Requests;
using AsbCloudApp.Services;
using AsbCloudDb.Model;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
namespace AsbCloudInfrastructure.Services;
public class DataSaubStatDrillingQualityService : IDataSaubStatService
{
private IDataSaubStatRepository dataSaubStatRepository;
private ITelemetryDataCache<TelemetryDataSaubDto> telemetryDataCache;
private ITelemetryDataSaubService dataSaubService;
private IDetectedOperationRepository detectedOperationRepository;
public DataSaubStatDrillingQualityService(
IDataSaubStatRepository dataSaubStatRepository,
ITelemetryDataCache<TelemetryDataSaubDto> telemetryDataCache,
ITelemetryDataSaubService dataSaubService,
IDetectedOperationRepository detectedOperationRepository)
{
this.dataSaubStatRepository = dataSaubStatRepository;
this.telemetryDataCache = telemetryDataCache;
this.dataSaubService = dataSaubService;
this.detectedOperationRepository = detectedOperationRepository;
}
public async Task CreateStatAsync(int lastDaysFilter, Action<string, double?> onProgressCallback, CancellationToken token)
{
//to do
var cacheRequest = new TelemetryDataRequest()
{
GeDate = DateTime.UtcNow.AddDays(-5000)
};
var idTelemetries = telemetryDataCache.GetIds(cacheRequest).ToArray();
if (!idTelemetries.Any())
return;
var stats = new List<DataSaubStatDto>();
//await dataSaubStatRepository.GetLastsAsync(idTelemetries, token);
//for (var i = 0; i < idTelemetries.Length; i++)
//{
// var idTelemetry = idTelemetries[i];
// var lastDate = stats.FirstOrDefault(s => s.IdTelemetry == idTelemetry)?.DateEnd.ToUniversalTime() ?? DateTimeOffset.UnixEpoch;
// var statsCount = await CreateStatForTelemetryFromDate(idTelemetry, lastDate, token);
// if(onProgressCallback != null)
// onProgressCallback($"Calculate stat for telemetry: {idTelemetry}; from {lastDate}; results count: {statsCount};", 1d * i / idTelemetries.Length);
//}
}
private async Task<int> CreateStatForTelemetryFromDate(
int idTelemetry,
DateTimeOffset geDate,
CancellationToken token)
{
var leDate = DateTimeOffset.UtcNow;
var dataSaub = await dataSaubService.Get([idTelemetry], true, geDate, leDate, 100_000, token);
if (!dataSaub.Any())
return 0;
if (dataSaub is not TelemetryDataSaubDto[] dataSaubArray)
dataSaubArray = dataSaub.ToArray();
var dataSaubStats = CreateDataSaubStat(dataSaubArray);
return 0;
//return await dataSaubStatRepository.InsertRangeAsync(dataSaubStats, token);
}
private static IEnumerable<DataSaubStatDrillingQualityDto> CreateDataSaubStat2(int idFeedRegulator, TelemetryDataSaubDto[] dataSaub)
{
var result = new List<DataSaubStatDrillingQualityDto>();
var indexStart = 0;
var indexEnd = 0;
while (indexEnd < dataSaub.Count())
{
indexStart = Array.FindIndex(dataSaub, indexEnd, t => t.IdFeedRegulator == idFeedRegulator);
if (indexStart < 0)
break;
indexEnd = Array.FindIndex(dataSaub, indexStart, t => t.IdFeedRegulator != idFeedRegulator);
if (indexEnd < 0)
indexEnd = dataSaub.Length - 1;
if (indexEnd == indexStart)
{
continue;
}
var length = indexEnd - indexStart + 1;
var subset = dataSaub.AsSpan(indexStart, length);
if (length <= 2 || (subset[^1].WellDepth - subset[0].WellDepth) < 0.001)
continue; // мелкие выборки не учитываем.
var stats = CalcStats(subset);
result.Add(stats);
}
return result;
}
private static Dictionary<int, List<DataSaubStatDrillingQualityDto>> CreateDataSaubStat(TelemetryDataSaubDto[] dataSaub)
{
var dict = new Dictionary<int, List<DataSaubStatDrillingQualityDto>>() {
{ 1, new List<DataSaubStatDrillingQualityDto>() },
{ 2, new List<DataSaubStatDrillingQualityDto>() },
{ 3, new List<DataSaubStatDrillingQualityDto>() },
{ 4, new List<DataSaubStatDrillingQualityDto>() },
};
foreach (var item in dict)
{
var data = CreateDataSaubStat2(item.Key, dataSaub);
item.Value.AddRange(data);
}
return dict;
}
private static DataSaubStatDrillingQualityDto CalcStats(Span<TelemetryDataSaubDto> dataSaub)
{
var depthDrillingQuality = CalcAggregate(dataSaub);
var result = new DataSaubStatDrillingQualityDto();
result.DepthStart = dataSaub[0].WellDepth;
result.DepthEnd = dataSaub[^1].WellDepth;
result.DateStart = dataSaub[0].DateTime;
result.DateEnd = dataSaub[^1].DateTime;
result.DepthDrillingQuality = depthDrillingQuality;
return result;
}
private static DataSaubStatDto CalcStat(DetectedOperationDto operation, Span<TelemetryDataSaubDto> span)
{
var aggregatedValues = CalcAggregate(span);
var dateStart = span[0].DateTime;
var dateEnd = span[^1].DateTime;
var depthStart = span[0].WellDepth;
var depthEnd = span[^1].WellDepth;
var speed = ((depthEnd - depthStart) / (dateEnd - dateStart).TotalHours);
var processMapDrillingCacheItem = new DataSaubStatDto
{
DateStart = dateStart,
DateEnd = dateEnd,
DepthStart = depthStart,
DepthEnd = depthEnd,
Speed = speed,
BlockSpeedSp = span[0].BlockSpeedSp,
Pressure = aggregatedValues.Pressure,
PressureIdle = span[0].PressureIdle,
PressureSp = span[0].PressureSp,
AxialLoad = aggregatedValues.AxialLoad,
AxialLoadSp = span[0].AxialLoadSp,
AxialLoadLimitMax = span[0].AxialLoadLimitMax,
RotorTorque = aggregatedValues.RotorTorque,
RotorTorqueSp = span[0].RotorTorqueSp,
RotorTorqueLimitMax = span[0].RotorTorqueLimitMax,
IdFeedRegulator = span[0].IdFeedRegulator,
RotorSpeed = aggregatedValues.RotorSpeed,
IdCategory = operation.IdCategory,
EnabledSubsystems = operation.EnabledSubsystems,
HasOscillation = operation.EnabledSubsystems.IsAutoOscillation,
IdTelemetry = operation.IdTelemetry,
Flow = aggregatedValues.Flow
};
return processMapDrillingCacheItem;
}
private static (
double Pressure,
double AxialLoad,
double RotorTorque,
double RotorSpeed,
double Flow
) CalcAggregate(Span<TelemetryDataSaubDto> span)
{
var sumPressure = 0.0;
var sumAxialLoad = 0.0;
var sumRotorTorque = 0.0;
var sumRotorSpeed = 0.0;
var flow = span[0].Flow ?? 0.0;
var diffDepthTotal = span[^1].WellDepth - span[0].WellDepth;
for (var i = 0; i < span.Length - 1; i++)
{
var diffDepth = span[i + 1].WellDepth - span[i].WellDepth;
sumPressure += diffDepth * span[i].Pressure;
sumAxialLoad += diffDepth * span[i].AxialLoad;
sumRotorTorque += diffDepth * span[i].RotorTorque;
sumRotorSpeed += diffDepth * span[i].RotorSpeed;
flow = span[i + 1].Flow > flow ? span[i + 1].Flow ?? 0.0 : flow;
}
return (
Pressure: sumPressure / diffDepthTotal,
AxialLoad: sumAxialLoad / diffDepthTotal,
RotorTorque: sumRotorTorque / diffDepthTotal,
RotorSpeed: sumRotorSpeed / diffDepthTotal,
Flow: flow
);
}
private static bool IsNewCacheItem(TelemetryDataSaubDto previous, TelemetryDataSaubDto current)
{
return !(current.Mode == previous.Mode)
|| !(current.WellDepth >= previous.WellDepth)
|| !(current.BlockSpeedSp == previous.BlockSpeedSp)
|| !(current.PressureIdle == previous.PressureIdle)
|| !(current.PressureSp == previous.PressureSp)
|| !(current.AxialLoadSp == previous.AxialLoadSp)
|| !(current.AxialLoadLimitMax == previous.AxialLoadLimitMax)
|| !(current.HookWeightIdle == previous.HookWeightIdle)
|| !(current.RotorTorqueIdle == previous.RotorTorqueIdle)
|| !(current.RotorTorqueSp == previous.RotorTorqueSp)
|| !(current.RotorTorqueLimitMax == previous.RotorTorqueLimitMax)
|| !(current.IdFeedRegulator == previous.IdFeedRegulator);
}
}

2
AsbCloudInfrastructure/Services/DataSaubStatService.cs
View File

@ -1,4 +1,4 @@
using AsbCloudApp.Data;
using AsbCloudApp.Data.DataSaubStat;
using AsbCloudApp.Data.DetectedOperation;
using AsbCloudApp.Data.SAUB;
using AsbCloudApp.Repositories;

1
AsbCloudInfrastructure/Services/ProcessMaps/Report/ProcessMapReportDrillingService.cs
View File

@ -1,4 +1,5 @@
using AsbCloudApp.Data;
using AsbCloudApp.Data.DataSaubStat;
using AsbCloudApp.Data.ProcessMaps;
using AsbCloudApp.Data.ProcessMaps.Operations;
using AsbCloudApp.Data.ProcessMaps.Report;

14
AsbCloudInfrastructure/Services/SAUB/TelemetryDataSaubService.cs
View File

@ -37,7 +37,14 @@ public class TelemetryDataSaubService : TelemetryDataBaseService<TelemetryDataSa
this.telemetryUserService = telemetryUserService;
}
public async Task<IEnumerable<TelemetryDataSaubDto>> Get(IEnumerable<int> idsTelemetries, bool isBitOnBottom, DateTimeOffset geDate, DateTimeOffset leDate, int take, CancellationToken token)
public async Task<IEnumerable<TelemetryDataSaubDto>> Get(
IEnumerable<int> idsTelemetries,
bool isBitOnBottom,
DateTimeOffset geDate,
DateTimeOffset leDate,
int take,
CancellationToken token,
IEnumerable<short>? idsFeedRegulators)
{
var offsetDict = new Dictionary<int, TimeSpan>();
foreach (var idTelemetry in idsTelemetries)
@ -56,6 +63,11 @@ public class TelemetryDataSaubService : TelemetryDataBaseService<TelemetryDataSa
if (isBitOnBottom)
query = query.Where(t => Math.Abs(t.BitDepth - t.WellDepth) < 0.0001);
if (idsFeedRegulators != null && idsFeedRegulators.Any())
query = query
.Where(t => t.IdFeedRegulator.HasValue)
.Where(t => idsFeedRegulators.Contains(t.IdFeedRegulator!.Value));
query = query
.OrderBy(t => t.DateTime)
.Take(take);

2
AsbCloudWebApi.IntegrationTests/Repository/DataSaubStatRepositoryTest.cs
View File

@ -1,4 +1,4 @@
using AsbCloudApp.Data;
using AsbCloudApp.Data.DataSaubStat;
using AsbCloudApp.Repositories;
using AsbCloudDb.Model;
using Mapster;

10
AsbCloudWebApi/appsettings.json
View File

@ -7,10 +7,10 @@
}
},
"ConnectionStrings": {
"DefaultConnection": "Host=localhost;Database=postgres;Username=postgres;Password=q;Persist Security Info=True",
"DebugConnection": "Host=localhost;Database=postgres;Username=postgres;Password=q;Persist Security Info=True;Include Error Detail=True",
"TestConnection": "Host=localhost;Database=test;Username=postgres;Password=q;Persist Security Info=True;Include Error Detail=True",
"LocalConnection": "Host=localhost;Database=postgres;Username=postgres;Password=q;Persist Security Info=True"
"DefaultConnection": "Host=192.168.0.10;Database=postgres;Username=postgres;Password=q;Persist Security Info=True",
"DebugConnection": "Host=192.168.0.10;Database=postgres;Username=postgres;Password=q;Persist Security Info=True;Include Error Detail=True",
"TestConnection": "Host=192.168.0.10;Database=test;Username=postgres;Password=q;Persist Security Info=True;Include Error Detail=True",
"LocalConnection": "Host=192.168.0.10;Database=postgres;Username=postgres;Password=q;Persist Security Info=True"
},
"AllowedHosts": "*",
"ContentPath": "../data",
@ -26,5 +26,5 @@
},
"DirectoryNameHelpPageFiles": "helpPages",
"DirectoryManualFiles": "manuals",
"Urls": "http://0.0.0.0:5000"
"Urls": "http://0.0.0.0:5010"
}