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

Правки по результатам ревью

Browse Source
This commit is contained in:
Olga Nemt 2023-05-19 12:45:07 +05:00
parent 7f5af356e6
commit 41663eabcb
4 changed files with 82 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AsbCloudApp/Data/GTR/WitsItemRecordDto.cs
View File

@ -25,6 +25,6 @@ namespace AsbCloudApp.Data.GTR
/// <summary>
/// Значение
/// </summary>
public object Value { get; set; }
public JsonValue Value { get; set; } = default!;
}
}

4
AsbCloudApp/Repositories/IGtrRepository.cs
View File

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

132
AsbCloudInfrastructure/Repository/GtrWitsRepository.cs
View File

@ -64,13 +64,13 @@ namespace AsbCloudInfrastructure.Repository
Items = g.Select(r => new
{
Key = r.IdItem,
Value = r.Item
Value = r.Value
}).ToDictionary(x => x.Key, x => x.Value)
});
return dtos;
}
public async Task<IEnumerable<WitsItemRecordDto>> GetDataByRecordIdAsync(int idWell, int idRecord, CancellationToken token = default)
public async Task<IEnumerable<WitsItemRecordDto>> GetLastDataByRecordIdAsync(int idWell, int idRecord, CancellationToken token = default)
{
var telemetry = telemetryService.GetOrDefaultTelemetryByIdWell(idWell);
if (telemetry is null)
@ -85,33 +85,87 @@ namespace AsbCloudInfrastructure.Repository
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 recordAllInt = await GetGroupedItemsOrDefaultAsync<WitsItemInt, int>(witsRequest, token);
var recordAllFloat = await GetGroupedItemsOrDefaultAsync<WitsItemFloat, float>(witsRequest, token);
var recordAllString = await GetGroupedItemsOrDefaultAsync<WitsItemString, string>(witsRequest, token);
var dtos = (recordAllFloat.Union(recordAllInt)).Union(recordAllString)
.GroupBy(g => new
{
g.IdRecord,
g.IdTelemetry,
g.IdItem
})
.Select(g => new WitsItemRecordDto()
{
IdRecord = g.Key.IdRecord,
IdItem = g.Key.IdItem,
Date = g.MaxBy(i => i.Date)!.Date,
Value = g.MaxBy(i => i.Date)!.Item.Value,
}).ToArray();
var dtos = (recordAllFloat.Union(recordAllInt)).Union(recordAllString).ToArray();
return dtos;
}
private async Task<IEnumerable<ItemRecord>> GetItemsOrDefaultAsync<TEntity, TValue>(
private async Task<IEnumerable<WitsItemRecordDto>> GetGroupedItemsOrDefaultAsync<TEntity, TValue>(WitsRequest request, CancellationToken token)
where TEntity : WitsItemBase<TValue>
where TValue : notnull
{
var query = BuildQuery<TEntity, TValue>(request);
var groupedQuery = query.GroupBy(g => new
{
g.IdRecord,
g.IdTelemetry,
g.IdItem
})
.Select(g => new
{
g.Key.IdRecord,
g.Key.IdItem,
Data = g.OrderByDescending(i => i.DateTime)
.FirstOrDefault()
});
var groupedEntities = await groupedQuery
.ToArrayAsync(token)
.ConfigureAwait(false);
var entities = groupedEntities
.Select(e => new WitsItemRecordDto()
{
IdRecord = e.IdRecord,
IdItem = e.IdItem,
Date = e.Data!.DateTime.ToRemoteDateTime(request.TimezoneHours),
Value = new JsonValue(e.Data!.Value)
});
return entities;
}
private async Task<IEnumerable<WitsItemRecordDto>> GetItemsOrDefaultAsync<TEntity, TValue>(
WitsRequest request,
CancellationToken token)
where TEntity : WitsItemBase<TValue>
where TValue : notnull
{
var query = BuildQuery<TEntity, TValue>(request);
var fullDataCount = await query.CountAsync(token);
if (fullDataCount == 0)
return Enumerable.Empty<WitsItemRecordDto>();
if (request.ApproxPointsCount is not null && fullDataCount > 1.75 * request.ApproxPointsCount)
{
var m = (int)Math.Round(1d * fullDataCount / request.ApproxPointsCount!.Value);
if (m > 1)
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
.OrderBy(d => d.DateTime)
.AsNoTracking()
.ToListAsync(token)
.ConfigureAwait(false);
var items = entities.Select(e => new WitsItemRecordDto
{
IdRecord = e.IdRecord,
Date = e.DateTime.ToRemoteDateTime(request.TimezoneHours),
IdItem = e.IdItem,
Value = new JsonValue(e.Value)
});
return items;
}
private IQueryable<TEntity> BuildQuery<TEntity, TValue>(WitsRequest request)
where TEntity : WitsItemBase<TValue>
where TValue : notnull
{
var query = db.Set<TEntity>().Where(i => i.IdTelemetry == request.IdTelemetry);
@ -127,32 +181,7 @@ namespace AsbCloudInfrastructure.Repository
query = query
.Where(d => d.DateTime <= request.DateEnd);
var fullDataCount = await query.CountAsync(token);
if (fullDataCount == 0)
return Enumerable.Empty<ItemRecord>();
if (request.ApproxPointsCount is not null && fullDataCount > 1.75 * request.ApproxPointsCount)
{
var m = (int)Math.Round(1d * fullDataCount / request.ApproxPointsCount!.Value);
if (m > 1)
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
.OrderBy(d => d.DateTime)
.AsNoTracking()
.ToListAsync(token)
.ConfigureAwait(false);
var items = entities.Select(e => new ItemRecord
{
IdRecord = e.IdRecord,
IdTelemetry = e.IdTelemetry,
Date = e.DateTime.ToRemoteDateTime(request.TimezoneHours),
IdItem = e.IdItem,
Item = new JsonValue(e.Value)
});
return items;
return query;
}
public async Task SaveDataAsync(int idTelemetry, WitsRecordDto dto, CancellationToken token)
@ -192,15 +221,6 @@ namespace AsbCloudInfrastructure.Repository
Value = value,
};
internal class ItemRecord
{
public int IdRecord { get; set; }
public int IdTelemetry { get; set; }
public DateTime Date { get; set; }
public int IdItem { get; set; }
public JsonValue Item { get; set; } = default!;
}
private class WitsRequest
{
public int IdTelemetry { get; set; }

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

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