This commit is contained in:
KharchenkoVV 2021-09-24 11:17:42 +05:00
commit 804bdc6175
3 changed files with 15 additions and 6 deletions

View File

@ -3,7 +3,7 @@
namespace AsbCloudApp.Data namespace AsbCloudApp.Data
{ {
/// <summary> /// <summary>
/// Сообщение получаемое от телеметрии /// Сообщение получаемое от телеметрии с буровой
/// </summary> /// </summary>
public class TelemetryMessageDto : IId public class TelemetryMessageDto : IId
{ {

View File

@ -122,11 +122,17 @@ namespace AsbSaubReport
{ {
Id = item.Id, Id = item.Id,
Date = item.Date, Date = item.Date,
Category = categories[events[item.IdEvent].IdCategory], Category = events.GetValueOrDefault(item.IdEvent) == null
? $""
: categories[events[item.IdEvent].IdCategory],
User = item.IdTelemetryUser == null User = item.IdTelemetryUser == null
? "" ? ""
: users.GetValueOrDefault((int)item.IdTelemetryUser) == null
? $"User id{item.IdTelemetryUser}"
: users[(int)item.IdTelemetryUser].MakeDisplayName(), : users[(int)item.IdTelemetryUser].MakeDisplayName(),
Text = events[item.IdEvent].MakeMessageText(item) Text = events.GetValueOrDefault(item.IdEvent) == null
? $"Стбытие {item.IdEvent} {item.Arg0} {item.Arg1} {item.Arg2} {item.Arg3}"
: events[item.IdEvent].MakeMessageText(item)
}; };
public WellInfoReport GetWellInfo() public WellInfoReport GetWellInfo()

View File

@ -1,5 +1,7 @@
using AsbCloudApp.Services; using AsbCloudApp.Services;
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
using System;
using System.Diagnostics;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -25,9 +27,10 @@ namespace AsbCloudInfrastructure.Services
else else
await Task.Delay(100, token).ConfigureAwait(false); await Task.Delay(100, token).ConfigureAwait(false);
} }
catch catch(Exception ex)
{ {
//logger ? Trace.TraceError(ex.Message);
Console.WriteLine(ex.Message);
} }
} }
} }