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

rework save method

Browse Source
This commit is contained in:
eugeniy_ivanov 2023-04-11 06:34:51 +05:00
parent 7c827f4fae
commit b9e0e60d6c
1 changed files with 67 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

131
AsbCloudInfrastructure/Repository/GtrWitsRepository.cs
View File

@ -7,6 +7,7 @@ using Microsoft.EntityFrameworkCore;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text.Json;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -14,13 +15,10 @@ namespace AsbCloudInfrastructure.Repository
{ {
#nullable enable #nullable enable
public class GtrWitsRepository : IGtrRepository public class GtrWitsRepository : IGtrRepository
{ {
private readonly IAsbCloudDbContext db; private readonly IAsbCloudDbContext db;
private readonly ITelemetryService telemetryService; private readonly ITelemetryService telemetryService;
private static Random random = new Random((int)(DateTime.Now.Ticks % 0xFFFFFFFF));
public GtrWitsRepository( public GtrWitsRepository(
IAsbCloudDbContext db, IAsbCloudDbContext db,
ITelemetryService telemetryService) ITelemetryService telemetryService)
@ -54,11 +52,9 @@ namespace AsbCloudInfrastructure.Repository
if (dateBeginUtc == default) if (dateBeginUtc == default)
dateBeginUtc = DateTime.UtcNow.AddSeconds(-intervalSec); dateBeginUtc = DateTime.UtcNow.AddSeconds(-intervalSec);
//var cacheData = telemetryDataCache.GetOrDefault(telemetry.Id, dateBeginUtc.ToRemoteDateTime(timezone.Hours), intervalSec, approxPointsCount); //var cacheData = telemetryDataCache.GetOrDefault(telemetry.Id, dateBeginUtc.ToRemoteDateTime(timezone.Hours), intervalSec, approxPointsCount);
//if (cacheData is not null) //if (cacheData is not null)
// return cacheData; // return cacheData;
var dateEnd = dateBeginUtc.AddSeconds(intervalSec); var dateEnd = dateBeginUtc.AddSeconds(intervalSec);
var queryWitsInt = db.WitsItemInt var queryWitsInt = db.WitsItemInt
@ -71,11 +67,9 @@ namespace AsbCloudInfrastructure.Repository
.Where(d => d.IdTelemetry == telemetry.Id .Where(d => d.IdTelemetry == telemetry.Id
&& d.DateTime >= dateBeginUtc); && d.DateTime >= dateBeginUtc);
var recordAllInt = GetEntityIntAsync(queryWitsInt, dateEnd, filterByDateEnd, approxPointsCount, token).Result; var recordAllInt = await GetEntityIntAsync(queryWitsInt, dateEnd, filterByDateEnd, approxPointsCount, token);
var recordAllFloat = GetEntityFloatAsync(queryWitsFloat, dateEnd, filterByDateEnd, approxPointsCount, token).Result; var recordAllFloat = await GetEntityFloatAsync(queryWitsFloat, dateEnd, filterByDateEnd, approxPointsCount, token);
var recordAllStr = GetEntityStrAsync(queryWitsStr, dateEnd, filterByDateEnd, approxPointsCount, token).Result; var recordAllStr = await GetEntityStrAsync(queryWitsStr, dateEnd, filterByDateEnd, approxPointsCount, token);
var dtos = new List<WitsRecordDto>(); var dtos = new List<WitsRecordDto>();
if (recordAllInt.Any()) if (recordAllInt.Any())
{ {
@ -113,7 +107,6 @@ namespace AsbCloudInfrastructure.Repository
{ {
var dto = new WitsRecordDto var dto = new WitsRecordDto
{ {
IdTelemetry = record.IdTelemetry, IdTelemetry = record.IdTelemetry,
Id = record.IdRecord, Id = record.IdRecord,
Date = record.DateTime.ToRemoteDateTime(timezone.Hours), Date = record.DateTime.ToRemoteDateTime(timezone.Hours),
@ -156,44 +149,33 @@ namespace AsbCloudInfrastructure.Repository
return dtos; return dtos;
} }
public async Task SaveDataAsync(int idTelemetry, WitsRecordDto dto, CancellationToken token) public async Task SaveDataAsync(int idTelemetry, WitsRecordDto dto, CancellationToken token)
{ {
//if (dto is null) if (dto is null)
// return; return;
//var timezoneHours = telemetryService.GetTimezone(idTelemetry).Hours; var timezoneHours = telemetryService.GetTimezone(idTelemetry).Hours;
//var entities = GetEntities(dto, idTelemetry, timezoneHours); foreach (var item in dto.Items)
//var dateMin = entities.Min(e => e.DateTime); {
//var dateMax = entities.Max(e => e.DateTime); var jsonValue = item.Value;
//var existingEntities = await dbset var type = jsonValue.Value.GetType().Name;
// .Where(e => e.IdTelemetry == idTelemetry) if (type == "string")
// .Where(e => e.DateTime >= dateMin && e.DateTime <= dateMax) {
// .Select(e => e.DateTime) var entity = GetEntityStr(dto, jsonValue, item.Key, timezoneHours);
// .OrderBy(d => d) db.WitsItemString.Add(entity);
// .ToArrayAsync(token); }
//foreach (var entity in entities) else if (type == "int")
//{ {
// if (!existingEntities.Any(e => e == entity.DateTime)) var entity = GetEntityInt(dto, jsonValue, item.Key, timezoneHours);
// { db.WitsItemInt.Add(entity);
// dbset.Add((TEntity)entity); }
// } else if (type == "float")
// else {
// { var entity = GetEntityFloat(dto, jsonValue, item.Key, timezoneHours);
// var dt = entity.DateTime; db.WitsItemFloat.Add(entity);
// entity.DateTime = new DateTimeOffset( }
// dt.Year, }
// dt.Month,
// dt.Day, await db.SaveChangesAsync(token);
// dt.Hour,
// dt.Minute,
// dt.Second,
// (dt.Millisecond + random.Next(1, 283)) % 1000,
// dt.Offset);
// dbset.Add((TEntity)entity);
// }
//}
//await db.SaveChangesAsync(token);
} }
private static async Task<IEnumerable<WitsItemInt>> GetEntityIntAsync(IQueryable<WitsItemInt> query, private static async Task<IEnumerable<WitsItemInt>> GetEntityIntAsync(IQueryable<WitsItemInt> query,
@ -280,25 +262,44 @@ namespace AsbCloudInfrastructure.Repository
return entities; return entities;
} }
//private static void GetEntities(WitsRecordDto recordItems, int idTelemetry, double timezoneHours) private static WitsItemString GetEntityStr(WitsRecordDto record,JsonValue value,int idItems,double timezoneHours)
//{ {
// var itemsCount = recordItems.Items.Count; var entity = new WitsItemString
// var entities = new List<WitsItemBase<T>>(itemsCount); {
IdTelemetry = record.IdTelemetry,
DateTime = record.Date.ToUtcDateTimeOffset(timezoneHours),
IdRecord = record.Id,
IdItem = idItems,
Value = JsonSerializer.Deserialize<string>(value.ToString())!,
};
return entity;
}
// foreach (var dtoItems in recordItems.Items) private static WitsItemInt GetEntityInt(WitsRecordDto record, JsonValue value, int idItems, double timezoneHours)
// { {
// var entityItems = new WitsItemBase<T> var entity = new WitsItemInt
// { {
// IdTelemetry = idTelemetry, IdTelemetry = record.IdTelemetry,
// DateTime = recordItems.Date.ToUtcDateTimeOffset(timezoneHours), DateTime = record.Date.ToUtcDateTimeOffset(timezoneHours),
// IdRecord = recordItems.Id, IdRecord = record.Id,
// IdItem = dtoItems.Key, IdItem = idItems,
// Value = System.Text.Json.JsonSerializer.Deserialize<T>(dtoItems.Value.ToString()) Value = JsonSerializer.Deserialize<int>(value.ToString())!,
// }; };
// entities.Add(entityItems); return entity;
// } }
// return entities;
//} private static WitsItemFloat GetEntityFloat(WitsRecordDto record, JsonValue value, int idItems, double timezoneHours)
{
var entity = new WitsItemFloat
{
IdTelemetry = record.IdTelemetry,
DateTime = record.Date.ToUtcDateTimeOffset(timezoneHours),
IdRecord = record.Id,
IdItem = idItems,
Value = JsonSerializer.Deserialize<float>(value.ToString())!,
};
return entity;
}
} }
#nullable disable #nullable disable
} }