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

fix WorkDataSaubStat

Browse Source
This commit is contained in:
ngfrolov 2024-02-02 15:54:56 +05:00
parent ba56bfe274
commit f043dbe4c9
Signed by: ng.frolov
GPG Key ID: E99907A0357B29A7
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
AsbCloudInfrastructure/Background/PeriodicWorks/WorkDataSaubStat.cs
View File

@ -35,7 +35,7 @@ namespace AsbCloudInfrastructure.Background.PeriodicWorks
{ {
GeDate = DateTime.UtcNow.AddDays(-Gap) GeDate = DateTime.UtcNow.AddDays(-Gap)
}; };
var idTelemetries = telemetryDataCache.GetIds(cacheRequest); var idTelemetries = telemetryDataCache.GetIds(cacheRequest).ToArray();
if (!idTelemetries.Any()) if (!idTelemetries.Any())
return; return;
@ -50,25 +50,27 @@ namespace AsbCloudInfrastructure.Background.PeriodicWorks
}) })
.ToArrayAsync(token); .ToArrayAsync(token);
foreach ( var idTelemetry in idTelemetries) for( var i =0; i < idTelemetries.Length; i++)
{ {
var idTelemetry = idTelemetries[i];
var lastDate = stats.FirstOrDefault(s => s.IdTelemetry == idTelemetry)?.DateEnd ?? DateTimeOffset.UnixEpoch; var lastDate = stats.FirstOrDefault(s => s.IdTelemetry == idTelemetry)?.DateEnd ?? DateTimeOffset.UnixEpoch;
await CreateStatForTelemetryFromDate(db, idTelemetry, lastDate, token); var statsCount = await CreateStatForTelemetryFromDate(db, idTelemetry, lastDate, token);
onProgressCallback($"Calculate stat for telemetry: {idTelemetry}; from {lastDate}; results count: {statsCount};", 100*i / idTelemetries.Length);
} }
} }
private async Task CreateStatForTelemetryFromDate(IAsbCloudDbContext db, int idTelemetry, DateTimeOffset begin, CancellationToken token) private async Task<int> CreateStatForTelemetryFromDate(IAsbCloudDbContext db, int idTelemetry, DateTimeOffset begin, CancellationToken token)
{ {
var detectedOperations = await db.Set<DetectedOperation>() var detectedOperations = await db.Set<DetectedOperation>()
.Where(o => o.IdTelemetry == idTelemetry) .Where(o => o.IdTelemetry == idTelemetry)
.Where(o => o.DateStart > begin) .Where(o => o.DateStart > begin)
.Where(o => o.OperationCategory.IdParent == MechanicalDrillingCategoryId) .Where(o => o.OperationCategory.IdParent == MechanicalDrillingCategoryId)
.OrderBy(o => o.DateStart) .OrderBy(o => o.DateStart)
.Take(500) .Take(250)
.ToArrayAsync(token); .ToArrayAsync(token);
if (!detectedOperations.Any()) if (!detectedOperations.Any())
return; return 0;
var minDate = detectedOperations.First().DateStart; var minDate = detectedOperations.First().DateStart;
var maxDate = detectedOperations.OrderByDescending(d => d.DateEnd).First().DateEnd; var maxDate = detectedOperations.OrderByDescending(d => d.DateEnd).First().DateEnd;
@ -79,15 +81,16 @@ namespace AsbCloudInfrastructure.Background.PeriodicWorks
.Where(t => t.DateTime <= maxDate) .Where(t => t.DateTime <= maxDate)
.Where(t => Math.Abs(t.BitDepth - t.WellDepth) < 0.0001) .Where(t => Math.Abs(t.BitDepth - t.WellDepth) < 0.0001)
.OrderBy(t => t.DateTime) .OrderBy(t => t.DateTime)
.Take(100_000)
.ToArrayAsync(token); .ToArrayAsync(token);
if (!telemetryDataSaub.Any()) if (!telemetryDataSaub.Any())
return; return 0;
var dataSaubStats = CreateDataSaubStat(detectedOperations, telemetryDataSaub); var dataSaubStats = CreateDataSaubStat(detectedOperations, telemetryDataSaub);
db.Set<DataSaubStat>().AddRange(dataSaubStats); db.Set<DataSaubStat>().AddRange(dataSaubStats);
await db.SaveChangesAsync(token); return await db.SaveChangesAsync(token);
} }
private static IEnumerable<DataSaubStat> CreateDataSaubStat(IEnumerable<DetectedOperation> detectedOperations, TelemetryDataSaub[] telemetryDataSaub) private static IEnumerable<DataSaubStat> CreateDataSaubStat(IEnumerable<DetectedOperation> detectedOperations, TelemetryDataSaub[] telemetryDataSaub)
@ -137,6 +140,8 @@ namespace AsbCloudInfrastructure.Background.PeriodicWorks
var length = i - indexStart; var length = i - indexStart;
var span = telemetryDataSaub.Slice(indexStart, length); var span = telemetryDataSaub.Slice(indexStart, length);
indexStart = i; indexStart = i;
if (length <= 2 || (span[^1].WellDepth - span[0].WellDepth) < 0.001)
continue; // мелкие выборки не учитываем.
var stat = CalcStat(operation, span); var stat = CalcStat(operation, span);
result.Add(stat); result.Add(stat);
} }
@ -214,6 +219,7 @@ namespace AsbCloudInfrastructure.Background.PeriodicWorks
private static bool IsNewCacheItem(TelemetryDataSaub previous, TelemetryDataSaub current) private static bool IsNewCacheItem(TelemetryDataSaub previous, TelemetryDataSaub current)
{ {
return !(current.Mode == previous.Mode) return !(current.Mode == previous.Mode)
|| !(current.WellDepth >= previous.WellDepth)
|| !(current.BlockSpeedSp == previous.BlockSpeedSp) || !(current.BlockSpeedSp == previous.BlockSpeedSp)
|| !(current.PressureIdle == previous.PressureIdle) || !(current.PressureIdle == previous.PressureIdle)
|| !(current.PressureSp == previous.PressureSp) || !(current.PressureSp == previous.PressureSp)