diff --git a/AsbCloudApp/Data/TelemetryMessageDto.cs b/AsbCloudApp/Data/TelemetryMessageDto.cs index 32e4f1a7..bd9d90a2 100644 --- a/AsbCloudApp/Data/TelemetryMessageDto.cs +++ b/AsbCloudApp/Data/TelemetryMessageDto.cs @@ -3,7 +3,7 @@ namespace AsbCloudApp.Data { /// - /// Сообщение получаемое от телеметрии + /// Сообщение получаемое от телеметрии с буровой /// public class TelemetryMessageDto : IId { diff --git a/AsbCloudInfrastructure/ReportDataSourcePgCloud.cs b/AsbCloudInfrastructure/ReportDataSourcePgCloud.cs index 3429dd85..f789dd76 100644 --- a/AsbCloudInfrastructure/ReportDataSourcePgCloud.cs +++ b/AsbCloudInfrastructure/ReportDataSourcePgCloud.cs @@ -122,11 +122,17 @@ namespace AsbSaubReport { Id = item.Id, Date = item.Date, - Category = categories[events[item.IdEvent].IdCategory], + Category = events.GetValueOrDefault(item.IdEvent) == null + ? $"" + : categories[events[item.IdEvent].IdCategory], User = item.IdTelemetryUser == null ? "" - : users[(int)item.IdTelemetryUser].MakeDisplayName(), - Text = events[item.IdEvent].MakeMessageText(item) + : users.GetValueOrDefault((int)item.IdTelemetryUser) == null + ? $"User id{item.IdTelemetryUser}" + : users[(int)item.IdTelemetryUser].MakeDisplayName(), + Text = events.GetValueOrDefault(item.IdEvent) == null + ? $"Стбытие {item.IdEvent} {item.Arg0} {item.Arg1} {item.Arg2} {item.Arg3}" + : events[item.IdEvent].MakeMessageText(item) }; public WellInfoReport GetWellInfo() diff --git a/AsbCloudInfrastructure/Services/BackgroundWorkerService.cs b/AsbCloudInfrastructure/Services/BackgroundWorkerService.cs index 8e3a4bab..14a8e253 100644 --- a/AsbCloudInfrastructure/Services/BackgroundWorkerService.cs +++ b/AsbCloudInfrastructure/Services/BackgroundWorkerService.cs @@ -1,5 +1,7 @@ using AsbCloudApp.Services; using Microsoft.Extensions.Hosting; +using System; +using System.Diagnostics; using System.Threading; using System.Threading.Tasks; @@ -25,9 +27,10 @@ namespace AsbCloudInfrastructure.Services else await Task.Delay(100, token).ConfigureAwait(false); } - catch + catch(Exception ex) { - //logger ? + Trace.TraceError(ex.Message); + Console.WriteLine(ex.Message); } } }