From e434daec2e556c53be98d6ad37c9288dd3c945c9 Mon Sep 17 00:00:00 2001 From: ngfrolov Date: Wed, 8 Nov 2023 10:27:00 +0500 Subject: [PATCH] =?UTF-8?q?WorkSubsystemOperationTimeCalc=20=D0=B1=D0=BE?= =?UTF-8?q?=D0=BB=D0=B5=D0=B5=20=D0=BF=D0=BE=D0=B7=D0=B4=D0=BD=D0=B8=D0=B5?= =?UTF-8?q?=20=D1=82=D0=B5=D0=BB=D0=B5=D0=BC=D0=B5=D1=82=D1=80=D0=B8=D0=B8?= =?UTF-8?q?=20=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D0=B0=D0=BD=D0=B0?= =?UTF-8?q?=D0=BB=D0=B8=D0=B7=D0=B8=D1=80=D1=83=D1=8E=D1=82=D1=81=D1=8F=20?= =?UTF-8?q?=D0=B2=20=D0=BF=D0=B5=D1=80=D0=B2=D1=83=D1=8E=20=D0=BE=D1=87?= =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=B4=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AsbCloudInfrastructure/Background/BackgroundWorker.cs | 1 + .../Background/PeriodicBackgroundWorker.cs | 1 + .../Services/Subsystems/WorkSubsystemOperationTimeCalc.cs | 4 +++- AsbCloudInfrastructure/Startup.cs | 7 +------ 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/AsbCloudInfrastructure/Background/BackgroundWorker.cs b/AsbCloudInfrastructure/Background/BackgroundWorker.cs index f56b0ae4..825f1b66 100644 --- a/AsbCloudInfrastructure/Background/BackgroundWorker.cs +++ b/AsbCloudInfrastructure/Background/BackgroundWorker.cs @@ -54,6 +54,7 @@ public class BackgroundWorker : BackgroundService protected override async Task ExecuteAsync(CancellationToken token) { + Trace.TraceInformation($"{GetType().Name} started"); while (!token.IsCancellationRequested && works.TryDequeue(out CurrentWork)) { try diff --git a/AsbCloudInfrastructure/Background/PeriodicBackgroundWorker.cs b/AsbCloudInfrastructure/Background/PeriodicBackgroundWorker.cs index a7490ed7..dedd6d83 100644 --- a/AsbCloudInfrastructure/Background/PeriodicBackgroundWorker.cs +++ b/AsbCloudInfrastructure/Background/PeriodicBackgroundWorker.cs @@ -42,6 +42,7 @@ public class PeriodicBackgroundWorker : BackgroundService protected override async Task ExecuteAsync(CancellationToken token) { + Trace.TraceInformation($"{GetType().Name} started"); while (!token.IsCancellationRequested) { try diff --git a/AsbCloudInfrastructure/Services/Subsystems/WorkSubsystemOperationTimeCalc.cs b/AsbCloudInfrastructure/Services/Subsystems/WorkSubsystemOperationTimeCalc.cs index 7da8051d..9dd827ba 100644 --- a/AsbCloudInfrastructure/Services/Subsystems/WorkSubsystemOperationTimeCalc.cs +++ b/AsbCloudInfrastructure/Services/Subsystems/WorkSubsystemOperationTimeCalc.cs @@ -55,10 +55,12 @@ public class WorkSubsystemOperationTimeCalc : Work { IdTelemetry = outer, inner.SingleOrDefault()?.LastDate, - }); + }) + .OrderByDescending(i => i.IdTelemetry); var count = telemetryLastDetectedDates.Count(); var i = 0d; + foreach (var item in telemetryLastDetectedDates) { onProgressCallback($"Start handling telemetry: {item.IdTelemetry} from {item.LastDate}", i++ / count); diff --git a/AsbCloudInfrastructure/Startup.cs b/AsbCloudInfrastructure/Startup.cs index 64191e5e..8661c651 100644 --- a/AsbCloudInfrastructure/Startup.cs +++ b/AsbCloudInfrastructure/Startup.cs @@ -1,8 +1,6 @@ -using AsbCloudApp.Services; -using AsbCloudDb.Model; +using AsbCloudDb.Model; using AsbCloudInfrastructure.Services.DetectOperations; using AsbCloudInfrastructure.Services; -using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using System; @@ -10,10 +8,7 @@ using System.Threading.Tasks; using System.Threading; using AsbCloudInfrastructure.Background; using AsbCloudApp.Data.SAUB; -using AsbCloudInfrastructure.Services.SAUB; using AsbCloudInfrastructure.Services.Subsystems; -using System.Linq; -using DocumentFormat.OpenXml.InkML; using AsbCloudDb; using AsbCloudApp.Repositories;