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

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Фролов 2021-09-20 10:33:45 +05:00
commit ea95563717
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
AsbCloudInfrastructure/Services/MessageService.cs
View File

@ -97,9 +97,19 @@ namespace AsbCloudInfrastructure.Services
{ {
Date = message.Date, Date = message.Date,
Id = message.Id, Id = message.Id,
User = users.FirstOrDefault(u => u.IdUser == message.IdTelemetryUser).MakeDisplayName(),
}; };
if (message.IdTelemetryUser is not null)
{
if (users.Any())
{
var user = users.FirstOrDefault(u => u.IdUser == message.IdTelemetryUser);
messageDto.User = user.MakeDisplayName();
}
else
messageDto.User = message.IdTelemetryUser.ToString();
}
var e = events.FirstOrDefault(e => e.IdEvent == message.IdEvent); var e = events.FirstOrDefault(e => e.IdEvent == message.IdEvent);
if (e != null) if (e != null)
{ {

4
AsbCloudWebApi/appsettings.json
View File

@ -7,7 +7,9 @@
} }
}, },
"ConnectionStrings": { "ConnectionStrings": {
"DefaultConnection": "Host=localhost;Database=postgres;Username=postgres;Password=q;Persist Security Info=True" "DefaultConnection": "Host=localhost;Database=postgres;Username=postgres;Password=q;Persist Security Info=True",
"ServerConnection": "Host=192.168.1.70;Database=postgres;Username=postgres;Password=q;Persist Security Info=True",
"LocalConnection": "Host=localhost;Database=postgres;Username=postgres;Password=q;Persist Security Info=True"
}, },
"AllowedHosts": "*", "AllowedHosts": "*",
"Urls": "http://0.0.0.0:5000" "Urls": "http://0.0.0.0:5000"