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

Получение данных ГТИ по id record

Browse Source
This commit is contained in:
Olga Nemt 2023-05-18 15:31:27 +05:00
parent 8d1ae1af84
commit 7514e3132a
3 changed files with 88 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AsbCloudApp/Repositories/IGtrRepository.cs
View File

@ -36,13 +36,13 @@ namespace AsbCloudApp.Repositories
int approxPointsCount = 1024, CancellationToken token = default); int approxPointsCount = 1024, CancellationToken token = default);
/// <summary> /// <summary>
/// получение данных по record id /// получение данных ГТИ по record id
/// </summary> /// </summary>
/// <param name="idWell"></param> /// <param name="idWell"></param>
/// <param name="idRecord"></param> /// <param name="idRecord"></param>
/// <param name="token"></param> /// <param name="token"></param>
/// <returns></returns> /// <returns></returns>
Task<IEnumerable<WitsItemRecordDto>> GetByRecordAsync(int idWell, int idRecord, CancellationToken token = default); Task<IEnumerable<WitsItemRecordDto>> GetDataByRecordIdAsync(int idWell, int idRecord, CancellationToken token = default);
} }
#nullable disable #nullable disable
} }

154
AsbCloudInfrastructure/Repository/GtrWitsRepository.cs
View File

@ -3,7 +3,6 @@ using AsbCloudApp.Repositories;
using AsbCloudApp.Services; using AsbCloudApp.Services;
using AsbCloudDb.Model; using AsbCloudDb.Model;
using AsbCloudDb.Model.GTR; using AsbCloudDb.Model.GTR;
using Mapster;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@ -23,7 +22,7 @@ namespace AsbCloudInfrastructure.Repository
IAsbCloudDbContext db, IAsbCloudDbContext db,
ITelemetryService telemetryService) ITelemetryService telemetryService)
{ {
this.db = db; this.db = db;
this.telemetryService = telemetryService; this.telemetryService = telemetryService;
} }
@ -36,12 +35,21 @@ namespace AsbCloudInfrastructure.Repository
var timezone = telemetryService.GetTimezone(telemetry.Id); var timezone = telemetryService.GetTimezone(telemetry.Id);
DateTimeOffset? dateBeginUtc = dateBegin?.ToUtcDateTimeOffset(timezone.Hours); DateTimeOffset? dateBeginUtc = dateBegin?.ToUtcDateTimeOffset(timezone.Hours);
var dateEnd = dateBeginUtc?.AddSeconds(intervalSec); var dateEnd = dateBeginUtc?.AddSeconds(intervalSec);
var recordAllInt = await GetItemsOrDefaultAsync<WitsItemInt, int>(telemetry.Id, dateBeginUtc, dateEnd, approxPointsCount, timezone.Hours, token); var witsRequest = new WitsRequest()
var recordAllFloat = await GetItemsOrDefaultAsync<WitsItemFloat, float>(telemetry.Id, dateBeginUtc, dateEnd, approxPointsCount,timezone.Hours, token); {
var recordAllString = await GetItemsOrDefaultAsync<WitsItemString, string>(telemetry.Id, dateBeginUtc, dateEnd, approxPointsCount, timezone.Hours, token); IdTelemetry = telemetry.Id,
DateBeginUtc = dateBeginUtc,
DateEnd = dateEnd,
ApproxPointsCount = approxPointsCount,
TimezoneHours = timezone.Hours
};
var recordAllInt = await GetItemsOrDefaultAsync<WitsItemInt, int>(witsRequest, token);
var recordAllFloat = await GetItemsOrDefaultAsync<WitsItemFloat, float>(witsRequest, token);
var recordAllString = await GetItemsOrDefaultAsync<WitsItemString, string>(witsRequest, token);
var dtos = (recordAllFloat.Union(recordAllInt)).Union(recordAllString) var dtos = (recordAllFloat.Union(recordAllInt)).Union(recordAllString)
.GroupBy(g => new .GroupBy(g => new
@ -53,15 +61,16 @@ namespace AsbCloudInfrastructure.Repository
{ {
Id = g.Key.IdRecord, Id = g.Key.IdRecord,
Date = g.Key.Date, Date = g.Key.Date,
Items = g.Select(r => new { Items = g.Select(r => new
Key = r.IdItem, {
Value = r.Item Key = r.IdItem,
Value = r.Item
}).ToDictionary(x => x.Key, x => x.Value) }).ToDictionary(x => x.Key, x => x.Value)
}); });
return dtos; return dtos;
} }
public async Task<IEnumerable<WitsItemRecordDto>> GetByRecordAsync(int idWell, int idRecord, CancellationToken token = default) public async Task<IEnumerable<WitsItemRecordDto>> GetDataByRecordIdAsync(int idWell, int idRecord, CancellationToken token = default)
{ {
var telemetry = telemetryService.GetOrDefaultTelemetryByIdWell(idWell); var telemetry = telemetryService.GetOrDefaultTelemetryByIdWell(idWell);
if (telemetry is null) if (telemetry is null)
@ -69,9 +78,17 @@ namespace AsbCloudInfrastructure.Repository
var timezone = telemetryService.GetTimezone(telemetry.Id); var timezone = telemetryService.GetTimezone(telemetry.Id);
var recordAllInt = await GetItemsOrDefaultByRecordAsync<WitsItemInt, int>(telemetry.Id, idRecord, timezone.Hours, token); var witsRequest = new WitsRequest()
var recordAllFloat = await GetItemsOrDefaultByRecordAsync<WitsItemFloat, float>(telemetry.Id, idRecord, timezone.Hours, token); {
var recordAllString = await GetItemsOrDefaultByRecordAsync<WitsItemString, string>(telemetry.Id, idRecord, timezone.Hours, token); IdTelemetry = telemetry.Id,
TimezoneHours = timezone.Hours,
IdRecord = idRecord,
};
var recordAllInt = await GetItemsOrDefaultAsync<WitsItemInt, int>(witsRequest, token);
var recordAllFloat = await GetItemsOrDefaultAsync<WitsItemFloat, float>(witsRequest, token);
var recordAllString = await GetItemsOrDefaultAsync<WitsItemString, string>(witsRequest, token);
var dtos = (recordAllFloat.Union(recordAllInt)).Union(recordAllString) var dtos = (recordAllFloat.Union(recordAllInt)).Union(recordAllString)
.GroupBy(g => new .GroupBy(g => new
@ -85,95 +102,68 @@ namespace AsbCloudInfrastructure.Repository
IdRecord = g.Key.IdRecord, IdRecord = g.Key.IdRecord,
IdItem = g.Key.IdItem, IdItem = g.Key.IdItem,
Date = g.MaxBy(i => i.Date)!.Date, Date = g.MaxBy(i => i.Date)!.Date,
Value = g.MaxBy(i => i.Date)!.Item.Value, Value = g.MaxBy(i => i.Date)!.Item.Value,
}).ToArray(); }).ToArray();
return dtos; return dtos;
} }
private async Task<IEnumerable<ItemRecord>> GetItemsOrDefaultAsync<TEntity, TValue>( private async Task<IEnumerable<ItemRecord>> GetItemsOrDefaultAsync<TEntity, TValue>(
int idTelemetry, WitsRequest request,
DateTimeOffset? dateBegin,
DateTimeOffset? dateEnd,
int approxPointsCount,
double timezoneHours,
CancellationToken token) CancellationToken token)
where TEntity: WitsItemBase<TValue> where TEntity : WitsItemBase<TValue>
where TValue: notnull where TValue : notnull
{ {
var query = db.Set<TEntity>() var query = BuildQuery<TEntity, TValue>(request, token);
.Where(i => i.IdTelemetry == idTelemetry);
if (dateBegin is not null)
query = query
.Where(d => d.DateTime >= dateBegin);
if (dateEnd is not null)
query = query
.Where(d => d.DateTime <= dateEnd);
var fullDataCount = await query.CountAsync(token); var fullDataCount = await query.CountAsync(token);
if (fullDataCount == 0) if (fullDataCount == 0)
return Enumerable.Empty<ItemRecord>(); return Enumerable.Empty<ItemRecord>();
if (fullDataCount > 1.75 * approxPointsCount) if (request.ApproxPointsCount is not null && fullDataCount > 1.75 * request.ApproxPointsCount)
{ {
var m = (int)Math.Round(1d * fullDataCount / approxPointsCount); var m = (int)Math.Round(1d * fullDataCount / request.ApproxPointsCount!.Value);
if (m > 1) if (m > 1)
query = query.Where((d) => (((d.DateTime.DayOfYear * 24 + d.DateTime.Hour) * 60 + d.DateTime.Minute) * 60 + d.DateTime.Second) % m == 0); query = query.Where((d) => (((d.DateTime.DayOfYear * 24 + d.DateTime.Hour) * 60 + d.DateTime.Minute) * 60 + d.DateTime.Second) % m == 0);
} }
var entities = await query var entities = await query
.OrderBy(d => d.DateTime)
.AsNoTracking() .AsNoTracking()
.ToListAsync(token) .ToListAsync(token)
.ConfigureAwait(false); .ConfigureAwait(false);
var items = entities.Select(e => new ItemRecord var items = entities.Select(e => new ItemRecord
{ {
IdRecord = e.IdRecord, IdRecord = e.IdRecord,
IdTelemetry = e.IdTelemetry, IdTelemetry = e.IdTelemetry,
Date = e.DateTime.ToRemoteDateTime(timezoneHours), Date = e.DateTime.ToRemoteDateTime(request.TimezoneHours),
IdItem = e.IdItem, IdItem = e.IdItem,
Item = new JsonValue(e.Value) Item = new JsonValue(e.Value)
}); });
return items; return items;
} }
private async Task<IEnumerable<ItemRecord>> GetItemsOrDefaultByRecordAsync<TEntity, TValue>( private IQueryable<TEntity> BuildQuery<TEntity, TValue>(WitsRequest request, CancellationToken token)
int idTelemetry,
int idRecord,
double timezoneHours,
CancellationToken token)
where TEntity : WitsItemBase<TValue> where TEntity : WitsItemBase<TValue>
where TValue : notnull where TValue : notnull
{ {
var query = db.Set<TEntity>() var query = db.Set<TEntity>().Where(i => i.IdTelemetry == request.IdTelemetry);
.Where(i => i.IdTelemetry == idTelemetry)
.Where(i => i.IdRecord == idRecord);
var fullDataCount = await query.CountAsync(token); if (request.IdRecord is not null)
query = query
.Where(d => d.IdRecord == request.IdRecord);
if (fullDataCount == 0) if (request.DateBeginUtc is not null)
return Enumerable.Empty<ItemRecord>(); query = query
.Where(d => d.DateTime >= request.DateBeginUtc);
var entities = await query if (request.DateEnd is not null)
.OrderBy(d => d.DateTime) query = query
.AsNoTracking() .Where(d => d.DateTime <= request.DateEnd);
.ToListAsync(token)
.ConfigureAwait(false);
var items = entities.Select(e => new ItemRecord return query.OrderBy(d => d.DateTime);
{
IdRecord = e.IdRecord,
IdTelemetry = e.IdTelemetry,
Date = e.DateTime.ToRemoteDateTime(timezoneHours),
IdItem = e.IdItem,
Item = new JsonValue(e.Value)
});
return items;
} }
public async Task SaveDataAsync(int idTelemetry, WitsRecordDto dto, CancellationToken token) public async Task SaveDataAsync(int idTelemetry, WitsRecordDto dto, CancellationToken token)
{ {
var timezoneHours = telemetryService.GetTimezone(idTelemetry).Hours; var timezoneHours = telemetryService.GetTimezone(idTelemetry).Hours;
@ -182,7 +172,7 @@ namespace AsbCloudInfrastructure.Repository
var dateTime = dto.Date.ToUtcDateTimeOffset(timezoneHours); var dateTime = dto.Date.ToUtcDateTimeOffset(timezoneHours);
if (item.Value.Value is string valueString) if (item.Value.Value is string valueString)
{ {
var entity = MakeEntity<WitsItemString, string>( dto.Id, item.Key, idTelemetry, dateTime, valueString); var entity = MakeEntity<WitsItemString, string>(dto.Id, item.Key, idTelemetry, dateTime, valueString);
db.WitsItemString.Add(entity); db.WitsItemString.Add(entity);
} }
if (item.Value.Value is float valueFloat) if (item.Value.Value is float valueFloat)
@ -194,30 +184,40 @@ namespace AsbCloudInfrastructure.Repository
{ {
var entity = MakeEntity<WitsItemInt, int>(dto.Id, item.Key, idTelemetry, dateTime, valueInt); var entity = MakeEntity<WitsItemInt, int>(dto.Id, item.Key, idTelemetry, dateTime, valueInt);
db.WitsItemInt.Add(entity); db.WitsItemInt.Add(entity);
} }
} }
await db.SaveChangesAsync(token); await db.SaveChangesAsync(token);
} }
private static TEntity MakeEntity<TEntity, TValue>(int idRecord, int idItem, int idTelemetry, DateTimeOffset dateTime, TValue value) private static TEntity MakeEntity<TEntity, TValue>(int idRecord, int idItem, int idTelemetry, DateTimeOffset dateTime, TValue value)
where TEntity : WitsItemBase<TValue>, new() where TEntity : WitsItemBase<TValue>, new()
where TValue: notnull where TValue : notnull
=> new TEntity() { => new TEntity()
IdRecord = idRecord, {
IdItem = idItem, IdRecord = idRecord,
IdTelemetry = idTelemetry, IdItem = idItem,
DateTime = dateTime, IdTelemetry = idTelemetry,
Value = value, DateTime = dateTime,
}; Value = value,
};
internal class ItemRecord internal class ItemRecord
{ {
public int IdRecord { get; set; } public int IdRecord { get; set; }
public int IdTelemetry { get; set; } public int IdTelemetry { get; set; }
public DateTime Date { get; set; } public DateTime Date { get; set; }
public int IdItem { get; set; } public int IdItem { get; set; }
public JsonValue Item { get; set; } = default!; public JsonValue Item { get; set; } = default!;
} }
}
private class WitsRequest
{
public int IdTelemetry { get; set; }
public DateTimeOffset? DateBeginUtc { get; set; }
public DateTimeOffset? DateEnd { get; set; }
public int? ApproxPointsCount { get; set; }
public double TimezoneHours { get; set; }
public int? IdRecord { get; set; }
}
}
} }

11
AsbCloudWebApi/Controllers/SAUB/GtrWitsController.cs
View File

@ -68,9 +68,16 @@ namespace AsbCloudWebApi.Controllers.SAUB
return Ok(content); return Ok(content);
} }
/// <summary>
/// получение данных ГТИ по ключу record
/// </summary>
/// <param name="idWell">id скважины</param>
/// <param name="idRecord">id record</param>
/// <param name="token"></param>
/// <returns></returns>
[HttpGet("{idWell}/{idRecord}")] [HttpGet("{idWell}/{idRecord}")]
[Permission] [Permission]
public async Task<ActionResult<IEnumerable<WitsItemRecordDto>>> GetDataByRecordAsync(int idWell, int idRecord, CancellationToken token = default) public async Task<ActionResult<IEnumerable<WitsItemRecordDto>>> GetDataByRecordIdAsync(int idWell, int idRecord, CancellationToken token = default)
{ {
int? idCompany = User.GetCompanyId(); int? idCompany = User.GetCompanyId();
@ -83,7 +90,7 @@ namespace AsbCloudWebApi.Controllers.SAUB
if (!isCompanyOwnsWell) if (!isCompanyOwnsWell)
return Forbid(); return Forbid();
var content = await gtrRepository.GetByRecordAsync(idWell, idRecord, token).ConfigureAwait(false); var content = await gtrRepository.GetDataByRecordIdAsync(idWell, idRecord, token).ConfigureAwait(false);
return Ok(content); return Ok(content);
} }