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

better names for db entities

Browse Source
This commit is contained in:
Фролов 2021-08-10 16:37:13 +05:00
parent 7eed929f33
commit 0f08d71ddb
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
AsbCloudInfrastructure/ReportDataSourcePgCloud.cs
View File

@ -14,7 +14,7 @@ namespace AsbSaubReport
private readonly int? idTelemetry;
private readonly WellInfoReport info;
private readonly Dictionary<int, Event> events;
private readonly Dictionary<int, TelemetryEvent> events;
private readonly Dictionary<int, TelemetryUser> users;
private readonly Dictionary<int, string> categories = new Dictionary<int, string>
{
@ -38,7 +38,7 @@ namespace AsbSaubReport
if (idTelemetry is null)
throw new ArgumentException($"Well {idWell} doesn't contain telemetry", nameof(idWell));
events = context.Events
events = context.TelemetryEvents
.Where(e => e.IdTelemetry == idTelemetry)
.ToDictionary(e => e.IdEvent, e => e);
@ -59,7 +59,7 @@ namespace AsbSaubReport
public AnalyzeResult Analyze()
{
var messagesQuery = from item in context.Messages
var messagesQuery = from item in context.TelemetryMessages
where item.IdTelemetry == idTelemetry
select item;
@ -114,7 +114,7 @@ namespace AsbSaubReport
};
public IQueryable<MessageReport> GetMessages(DateTime begin, DateTime end)
=> from item in context.Messages
=> from item in context.TelemetryMessages
where item.IdTelemetry == idTelemetry
&& item.Date >= begin
&& item.Date <= end

4
AsbCloudInfrastructure/Services/AnalyticsService.cs
View File

@ -162,7 +162,7 @@ namespace AsbCloudInfrastructure.Services
var operations = (from a in db.TelemetryAnalysis
where a.IdTelemetry == telemetryId &&
a.UnixDate > unixBegin && a.UnixDate < unixEnd
join o in db.Operations on a.IdOperation equals o.Id
join o in db.TelemetryOperations on a.IdOperation equals o.Id
group a by new { a.IdOperation, o.Name } into g
select new TelemetryOperationDurationDto
{
@ -188,7 +188,7 @@ namespace AsbCloudInfrastructure.Services
var operations = (from a in db.TelemetryAnalysis
where a.IdTelemetry == telemetryId
join o in db.Operations on a.IdOperation equals o.Id
join o in db.TelemetryOperations on a.IdOperation equals o.Id
group a by new
{
Interval = Math.Floor((a.UnixDate - workBeginSeconds + timezoneOffset) / intervalSeconds),

6
AsbCloudInfrastructure/Services/EventService.cs
View File

@ -10,12 +10,12 @@ namespace AsbCloudInfrastructure.Services
public class EventService : IEventService
{
private readonly ITelemetryService telemetryService;
private readonly CacheTable<Event> cacheEvents;
private readonly CacheTable<TelemetryEvent> cacheEvents;
public EventService(IAsbCloudDbContext db, CacheDb cacheDb, ITelemetryService telemetryService)
{
this.telemetryService = telemetryService;
cacheEvents = cacheDb.GetCachedTable<Event>((AsbCloudDbContext)db);
cacheEvents = cacheDb.GetCachedTable<TelemetryEvent>((AsbCloudDbContext)db);
}
public void Upsert(string uid, IEnumerable<EventDto> dtos)
@ -25,7 +25,7 @@ namespace AsbCloudInfrastructure.Services
var telemetryId = telemetryService.GetOrCreateTemetryIdByUid(uid);
var entities = dtos.Select(dto => new Event
var entities = dtos.Select(dto => new TelemetryEvent
{
IdEvent = dto.Id,
IdTelemetry = telemetryId,

12
AsbCloudInfrastructure/Services/MessageService.cs
View File

@ -14,14 +14,14 @@ namespace AsbCloudInfrastructure.Services
{
private readonly IAsbCloudDbContext db;
private readonly ITelemetryService telemetryService;
private readonly CacheTable<Event> cacheEvents;
private readonly CacheTable<TelemetryEvent> cacheEvents;
private readonly CacheTable<TelemetryUser> cacheTUsers;
public MessageService(IAsbCloudDbContext db, CacheDb cacheDb, ITelemetryService telemetryService)
{
this.db = db;
this.telemetryService = telemetryService;
cacheEvents = cacheDb.GetCachedTable<Event>((AsbCloudDbContext)db);
cacheEvents = cacheDb.GetCachedTable<TelemetryEvent>((AsbCloudDbContext)db);
cacheTUsers = cacheDb.GetCachedTable<TelemetryUser>((AsbCloudDbContext)db);
}
@ -43,7 +43,7 @@ namespace AsbCloudInfrastructure.Services
if (!events.Any())
return null;
var query = db.Messages.Where(m => m.IdTelemetry == telemetryId);
var query = db.TelemetryMessages.Where(m => m.IdTelemetry == telemetryId);
if ((categoryids?.Any() == true) || !string.IsNullOrEmpty(searchString))
{
@ -114,7 +114,7 @@ namespace AsbCloudInfrastructure.Services
if (telemetryId is null)
return null;
var (From, To) = db.GetDatesRange<Message>((int)telemetryId);
var (From, To) = db.GetDatesRange<TelemetryMessage>((int)telemetryId);
return new DatesRangeDto { From = From, To = To };
}
@ -128,10 +128,10 @@ namespace AsbCloudInfrastructure.Services
foreach (var dto in dtos)
{
var entity = dto.Adapt<Message>();
var entity = dto.Adapt<TelemetryMessage>();
entity.Id = 0;
entity.IdTelemetry = telemetryId;
db.Messages.Add(entity);
db.TelemetryMessages.Add(entity);
}
db.SaveChanges();

2
AsbCloudInfrastructure/Services/ReportService.cs
View File

@ -119,7 +119,7 @@ namespace AsbCloudInfrastructure.Services
var datesRange = (from d in db.DataSaubBases
where d.IdTelemetry == telemetryId
select d.Date).Union(
from m in db.Messages
from m in db.TelemetryMessages
where m.IdTelemetry == telemetryId
select m.Date).DefaultIfEmpty().GroupBy(g => true)
.Select(g => new