forked from ddrilling/AsbCloudServer
add gtrRepository.SaveData
This commit is contained in:
parent
3ced1a0e20
commit
9a0617adce
@ -10,17 +10,16 @@ namespace AsbCloudApp.Services.WITS
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// данные ГТИ
|
/// данные ГТИ
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public interface IGtrService
|
public interface IGtrRepository
|
||||||
|
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// добавить/изменить данные (для панели бурильщика)
|
/// добавить данные (для панели бурильщика)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="uid"></param>
|
/// <param name="idTelemetry"></param>
|
||||||
/// <param name="dtos"></param>
|
/// <param name="dto"></param>
|
||||||
/// <param name="token"></param>
|
/// <param name="token"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
Task<int> UpdateAsync(string uid, IEnumerable<WitsRecordDto> dtos, CancellationToken token);
|
Task SaveDataAsync(int idTelemetry, WitsRecordDto dto, CancellationToken token);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// получить данные для клиента
|
/// получить данные для клиента
|
||||||
|
@ -2,6 +2,9 @@
|
|||||||
using AsbCloudApp.Services;
|
using AsbCloudApp.Services;
|
||||||
using AsbCloudApp.Services.WITS;
|
using AsbCloudApp.Services.WITS;
|
||||||
using AsbCloudDb.Model;
|
using AsbCloudDb.Model;
|
||||||
|
using AsbCloudDb.Model.GTR;
|
||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
using Newtonsoft.Json;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
@ -11,17 +14,19 @@ using System.Threading.Tasks;
|
|||||||
namespace AsbCloudInfrastructure.Repository
|
namespace AsbCloudInfrastructure.Repository
|
||||||
{
|
{
|
||||||
#nullable enable
|
#nullable enable
|
||||||
public class GtrWitsRepository: IGtrService
|
public class GtrWitsRepository<T> : IGtrRepository
|
||||||
|
where T : WitsItemBase<T>, ITelemetryData
|
||||||
{
|
{
|
||||||
|
|
||||||
private readonly IAsbCloudDbContext db;
|
private readonly IAsbCloudDbContext db;
|
||||||
private readonly ITelemetryService telemetryService;
|
private readonly ITelemetryService telemetryService;
|
||||||
|
private readonly DbSet<T> dbset;
|
||||||
|
private static Random random = new Random((int)(DateTime.Now.Ticks % 0xFFFFFFFF));
|
||||||
|
|
||||||
public GtrWitsRepository(
|
public GtrWitsRepository(
|
||||||
IAsbCloudDbContext db,
|
IAsbCloudDbContext db,
|
||||||
ITelemetryService telemetryService)
|
ITelemetryService telemetryService)
|
||||||
{
|
{
|
||||||
|
dbset = db.Set<T>();
|
||||||
this.db = db;
|
this.db = db;
|
||||||
this.telemetryService = telemetryService;
|
this.telemetryService = telemetryService;
|
||||||
}
|
}
|
||||||
@ -57,9 +62,62 @@ namespace AsbCloudInfrastructure.Repository
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
public Task<int> UpdateAsync(string uid, IEnumerable<WitsRecordDto> dtos, CancellationToken token)
|
public async Task SaveDataAsync(int idTelemetry, WitsRecordDto dto, CancellationToken token)
|
||||||
{
|
{
|
||||||
throw new NotImplementedException();
|
if (dto is null)
|
||||||
|
return;
|
||||||
|
var timezoneHours = telemetryService.GetTimezone(idTelemetry).Hours;
|
||||||
|
var entities = GetEntities(dto,idTelemetry,timezoneHours);
|
||||||
|
var dateMin = entities.Min(e => e.DateTime);
|
||||||
|
var dateMax = entities.Max(e => e.DateTime);
|
||||||
|
var existingEntities = await dbset
|
||||||
|
.Where(e => e.IdTelemetry == idTelemetry)
|
||||||
|
.Where(e => e.DateTime >= dateMin && e.DateTime <= dateMax)
|
||||||
|
.Select(e => e.DateTime)
|
||||||
|
.OrderBy(d => d)
|
||||||
|
.ToArrayAsync(token);
|
||||||
|
foreach (var entity in entities)
|
||||||
|
{
|
||||||
|
if (!existingEntities.Any(e => e == entity.DateTime))
|
||||||
|
{
|
||||||
|
dbset.Add((T)entity);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
var dt = entity.DateTime;
|
||||||
|
entity.DateTime = new DateTimeOffset(
|
||||||
|
dt.Year,
|
||||||
|
dt.Month,
|
||||||
|
dt.Day,
|
||||||
|
dt.Hour,
|
||||||
|
dt.Minute,
|
||||||
|
dt.Second,
|
||||||
|
(dt.Millisecond + random.Next(1, 283)) % 1000,
|
||||||
|
dt.Offset);
|
||||||
|
dbset.Add((T)entity);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
await db.SaveChangesAsync(token);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static IEnumerable<WitsItemBase<T>> GetEntities(WitsRecordDto recordItems, int idTelemetry, double timezoneHours)
|
||||||
|
{
|
||||||
|
var itemsCount = recordItems.Items.Count;
|
||||||
|
var entities = new List<WitsItemBase<T>>(itemsCount);
|
||||||
|
|
||||||
|
foreach (var dtoItems in recordItems.Items)
|
||||||
|
{
|
||||||
|
var entityItems = new WitsItemBase<T>
|
||||||
|
{
|
||||||
|
IdTelemetry = idTelemetry,
|
||||||
|
DateTime = recordItems.Date.ToUtcDateTimeOffset(timezoneHours),
|
||||||
|
IdRecord = recordItems.Id,
|
||||||
|
IdItem = dtoItems.Key,
|
||||||
|
Value = System.Text.Json.JsonSerializer.Deserialize<T>(dtoItems.Value.ToString())
|
||||||
|
};
|
||||||
|
entities.Add(entityItems);
|
||||||
|
}
|
||||||
|
return entities;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#nullable disable
|
#nullable disable
|
||||||
|
Loading…
Reference in New Issue
Block a user