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

fix controller

Browse Source
This commit is contained in:
eugeniy_ivanov 2023-04-17 20:58:20 +05:00
parent 33ebaf39c1
commit f81f092c64
2 changed files with 42 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
AsbCloudInfrastructure/Repository/GtrWitsRepository.cs
View File

@ -55,18 +55,15 @@ namespace AsbCloudInfrastructure.Repository
var dateEnd = dateBeginUtc.AddSeconds(intervalSec); var dateEnd = dateBeginUtc.AddSeconds(intervalSec);
var queryWitsInt = db.Set<WitsItemInt>() var queryWitsInt = db.Set<WitsItemInt>()
.Where(d => d.IdTelemetry == telemetry.Id .Where(d => d.IdTelemetry == telemetry.Id);
&& d.DateTime >= dateBeginUtc);
var queryWitsString = db.Set<WitsItemString>() var queryWitsString = db.Set<WitsItemString>()
.Where(d => d.IdTelemetry == telemetry.Id .Where(d => d.IdTelemetry == telemetry.Id);
&& d.DateTime >= dateBeginUtc);
var queryWitsFloat = db.Set<WitsItemFloat>() var queryWitsFloat = db.Set<WitsItemFloat>()
.Where(d => d.IdTelemetry == telemetry.Id .Where(d => d.IdTelemetry == telemetry.Id);
&& d.DateTime >= dateBeginUtc);
var recordAllInt = await GetItemsOrDefaultAsync(queryWitsInt, dateEnd, filterByDateEnd, approxPointsCount, timezone.Hours, token); var recordAllInt = await GetItemsOrDefaultAsync(queryWitsInt, dateBeginUtc, dateEnd, filterByDateEnd, approxPointsCount, timezone.Hours, token);
var recordAllFloat = await GetItemsOrDefaultAsync(queryWitsFloat, dateEnd, filterByDateEnd, approxPointsCount,timezone.Hours, token); var recordAllFloat = await GetItemsOrDefaultAsync(queryWitsFloat, dateBeginUtc, dateEnd, filterByDateEnd, approxPointsCount,timezone.Hours, token);
var recordAllString = await GetItemsOrDefaultAsync(queryWitsString, dateEnd, filterByDateEnd, approxPointsCount, timezone.Hours, token); var recordAllString = await GetItemsOrDefaultAsync(queryWitsString, dateBeginUtc, dateEnd, filterByDateEnd, approxPointsCount, timezone.Hours, token);
var groupRecordDate = (recordAllFloat.Union(recordAllInt)).Union(recordAllString) var groupRecordDate = (recordAllFloat.Union(recordAllInt)).Union(recordAllString)
.GroupBy(g => new .GroupBy(g => new
{ {
@ -114,27 +111,29 @@ namespace AsbCloudInfrastructure.Repository
} }
private static async Task<IEnumerable<ItemRecord>> GetItemsOrDefaultAsync<T>(IQueryable<WitsItemBase<T>> query, private static async Task<IEnumerable<ItemRecord>> GetItemsOrDefaultAsync<T>(IQueryable<WitsItemBase<T>> query,
DateTimeOffset dateBeginUtc,
DateTimeOffset dateEnd, bool filterByDateEnd, int approxPointsCount, double timezoneHours DateTimeOffset dateEnd, bool filterByDateEnd, int approxPointsCount, double timezoneHours
, CancellationToken token) , CancellationToken token)
where T: notnull where T: notnull
{ {
if (filterByDateEnd) //if (filterByDateEnd)
query = query.Where(d => d.DateTime <= dateEnd); // query = query.Where(d => d.DateTime <= dateEnd);
var fullDataCount = await query.CountAsync(token) //var fullDataCount = await query.CountAsync(token)
.ConfigureAwait(false); // .ConfigureAwait(false);
if (fullDataCount == 0) //if (fullDataCount == 0)
return Enumerable.Empty<ItemRecord>(); // return Enumerable.Empty<ItemRecord>();
if (fullDataCount > 1.75 * approxPointsCount) //if (fullDataCount > 1.75 * approxPointsCount)
{ //{
var m = (int)Math.Round(1d * fullDataCount / approxPointsCount); // var m = (int)Math.Round(1d * fullDataCount / approxPointsCount);
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
.Where(d => d.DateTime >= dateBeginUtc)
.OrderBy(d => d.DateTime) .OrderBy(d => d.DateTime)
.AsNoTracking() .AsNoTracking()
.ToListAsync(token) .ToListAsync(token)

30
AsbCloudWebApi/Controllers/GTR/GtrWitsController.cs → AsbCloudWebApi/Controllers/SAUB/GtrWitsController.cs
View File

@ -10,7 +10,7 @@ using System.Collections.Generic;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace AsbCloudWebApi.Controllers.GTR namespace AsbCloudWebApi.Controllers.SAUB
{ {
[Route("api/[controller]")] [Route("api/[controller]")]
[ApiController] [ApiController]
@ -37,7 +37,7 @@ namespace AsbCloudWebApi.Controllers.GTR
} }
/// <summary> /// <summary>
/// /// Получить загруженные данные ГТИ по скважине
/// </summary> /// </summary>
/// <param name = "idWell" > id скважины</param> /// <param name = "idWell" > id скважины</param>
/// <param name = "begin" > дата начала выборки.По умолчанию: текущее время - intervalSec</param> /// <param name = "begin" > дата начала выборки.По умолчанию: текущее время - intervalSec</param>
@ -46,20 +46,20 @@ namespace AsbCloudWebApi.Controllers.GTR
/// <param name = "token" > Токен завершения задачи</param> /// <param name = "token" > Токен завершения задачи</param>
/// <returns></returns> /// <returns></returns>
[HttpGet("{idWell}")] [HttpGet("{idWell}")]
[Permission] // [Permission]
public async Task<ActionResult<IEnumerable<WitsRecordDto>>> GetDataAsync(int idWell, DateTime begin = default, public async Task<ActionResult<IEnumerable<WitsRecordDto>>> GetDataAsync(int idWell, DateTime begin = default,
int intervalSec = 600, int approxPointsCount = 1024, CancellationToken token = default) int intervalSec = 600, int approxPointsCount = 1024, CancellationToken token = default)
{ {
int? idCompany = User.GetCompanyId(); //int? idCompany = User.GetCompanyId();
if (idCompany is null) //if (idCompany is null)
return Forbid(); // return Forbid();
bool isCompanyOwnsWell = await wellService.IsCompanyInvolvedInWellAsync((int)idCompany, //bool isCompanyOwnsWell = await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
idWell, token).ConfigureAwait(false); // idWell, token).ConfigureAwait(false);
if (!isCompanyOwnsWell) //if (!isCompanyOwnsWell)
return Forbid(); // return Forbid();
var content = await gtrRepository.GetAsync(idWell, begin, var content = await gtrRepository.GetAsync(idWell, begin,
intervalSec, approxPointsCount, token).ConfigureAwait(false); intervalSec, approxPointsCount, token).ConfigureAwait(false);
@ -67,6 +67,14 @@ namespace AsbCloudWebApi.Controllers.GTR
return Ok(content); return Ok(content);
} }
/// <summary>
/// Метод для получения WITS записи от панели оператора.
/// Сохраняет в БД.
/// </summary>
/// <param name="uid">уникальный идентификатор телеметрии</param>
/// <param name="dto">WITS запись</param>
/// <param name="token"></param>
/// <returns></returns>
[HttpPost("{uid}")] [HttpPost("{uid}")]
public async Task<IActionResult> PostDataAsync( public async Task<IActionResult> PostDataAsync(
string uid, string uid,
@ -77,7 +85,7 @@ namespace AsbCloudWebApi.Controllers.GTR
await gtrRepository.SaveDataAsync(idTelemetry, dto, token).ConfigureAwait(false); await gtrRepository.SaveDataAsync(idTelemetry, dto, token).ConfigureAwait(false);
var idWell = telemetryService.GetIdWellByTelemetryUid(uid); var idWell = telemetryService.GetIdWellByTelemetryUid(uid);
if (idWell is not null && dto is not null) if (idWell is not null && dto is not null)
_ = Task.Run(() => telemetryHubContext.Clients.Group($"well_{idWell}_wits") _ = Task.Run(() => telemetryHubContext.Clients.Group($"well_{idWell}_gtr")
.SendAsync(SirnalRMethodGetDataName, dto), CancellationToken.None); .SendAsync(SirnalRMethodGetDataName, dto), CancellationToken.None);
return Ok(); return Ok();
} }