forked from ddrilling/AsbCloudServer
Merge pull request 'Создать метод который удаляет данные по телеметрии панели (и все связанные с ней) до заданной даты.' (#290) from feature/#34835931-delete-telemetry-part-by-id-and-dates into dev
Reviewed-on: https://test.digitaldrilling.ru:8443/DDrilling/AsbCloudServer/pulls/290 Reviewed-by: Никита Фролов <ng.frolov@digitaldrilling.ru>
This commit is contained in:
commit
ec33345ded
@ -1,4 +1,5 @@
|
||||
using AsbCloudApp.Data;
|
||||
using AsbCloudApp.Services;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Threading;
|
||||
@ -9,7 +10,7 @@ namespace AsbCloudApp.Repositories
|
||||
/// <summary>
|
||||
/// Репозиторий работы с данными из таблицы t_data_daub_stat
|
||||
/// </summary>
|
||||
public interface IDataSaubStatRepository
|
||||
public interface IDataSaubStatRepository : ITelemetryDataEditorService
|
||||
{
|
||||
/// <summary>
|
||||
/// Получение записей по ключу телеметрии
|
||||
|
@ -1,18 +1,18 @@
|
||||
using System;
|
||||
using AsbCloudApp.Data;
|
||||
using AsbCloudApp.Data.DetectedOperation;
|
||||
using AsbCloudApp.Requests;
|
||||
using AsbCloudApp.Services;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Threading.Tasks;
|
||||
using System.Threading;
|
||||
using AsbCloudApp.Data;
|
||||
using AsbCloudApp.Data.WellOperation;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace AsbCloudApp.Repositories;
|
||||
|
||||
/// <summary>
|
||||
/// Таблица автоматически определенных операций
|
||||
/// </summary>
|
||||
public interface IDetectedOperationRepository
|
||||
public interface IDetectedOperationRepository : ITelemetryDataEditorService
|
||||
{
|
||||
/// <summary>
|
||||
/// Добавление нескольких записей
|
||||
|
@ -1,5 +1,6 @@
|
||||
using AsbCloudApp.Data.SAUB;
|
||||
using AsbCloudApp.Requests;
|
||||
using AsbCloudApp.Services;
|
||||
using System.Collections.Generic;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
@ -9,7 +10,7 @@ namespace AsbCloudApp.Repositories
|
||||
/// <summary>
|
||||
/// репозиторий по работе с данными drill_test
|
||||
/// </summary>
|
||||
public interface IDrillTestRepository
|
||||
public interface IDrillTestRepository : ITelemetryDataEditorService
|
||||
{
|
||||
/// <summary>
|
||||
/// Получить данные drill_test в соответствии с параметрами запроса
|
||||
|
@ -5,13 +5,14 @@ using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using AsbCloudApp.Requests;
|
||||
using AsbCloudApp.Data;
|
||||
using AsbCloudApp.Services;
|
||||
|
||||
namespace AsbCloudApp.Repositories
|
||||
{
|
||||
/// <summary>
|
||||
/// данные ГТИ
|
||||
/// </summary>
|
||||
public interface IGtrRepository
|
||||
public interface IGtrRepository : ITelemetryDataEditorService
|
||||
{
|
||||
/// <summary>
|
||||
/// добавить данные (для панели бурильщика)
|
||||
|
@ -1,15 +1,16 @@
|
||||
using AsbCloudApp.Data;
|
||||
using AsbCloudApp.Requests;
|
||||
using AsbCloudApp.Services;
|
||||
using System.Collections.Generic;
|
||||
using System.Threading.Tasks;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace AsbCloudApp.Repositories
|
||||
{
|
||||
/// <summary>
|
||||
/// Репозиторий по ограничивающим параметрам с фильтрацией
|
||||
/// </summary>
|
||||
public interface ILimitingParameterRepository
|
||||
public interface ILimitingParameterRepository : ITelemetryDataEditorService
|
||||
{
|
||||
/// <summary>
|
||||
/// Получение списка ограничивающих параметров по идентификатору скважины
|
||||
|
39
AsbCloudApp/Requests/TelemetryPartDeleteRequest.cs
Normal file
39
AsbCloudApp/Requests/TelemetryPartDeleteRequest.cs
Normal file
@ -0,0 +1,39 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace AsbCloudApp.Requests;
|
||||
|
||||
/// <summary>
|
||||
/// Параметры запроса на удаление куска телеметрии
|
||||
/// </summary>
|
||||
public class TelemetryPartDeleteRequest : IValidatableObject
|
||||
{
|
||||
/// <summary>
|
||||
/// ключ телеметрии
|
||||
/// </summary>
|
||||
public int IdTelemetry { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// greater or equal then Date. Must be set one of GeDate or LeDate
|
||||
/// </summary>
|
||||
public DateTimeOffset? GeDate { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// less or equal then Date. Must be set one of GeDate or LeDate
|
||||
/// </summary>
|
||||
public DateTimeOffset? LeDate { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Валидация входящих данных
|
||||
/// </summary>
|
||||
/// <param name="validationContext"></param>
|
||||
/// <returns></returns>
|
||||
public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
|
||||
{
|
||||
if (IdTelemetry == 0)
|
||||
yield return new ValidationResult($"IdTelemetry must be defined");
|
||||
if (!GeDate.HasValue && !LeDate.HasValue)
|
||||
yield return new ValidationResult($"GeDate or LeDate must be defined");
|
||||
}
|
||||
}
|
@ -10,7 +10,7 @@ namespace AsbCloudApp.Services
|
||||
/// <summary>
|
||||
/// Сервис сообщений панели оператора
|
||||
/// </summary>
|
||||
public interface IMessageService
|
||||
public interface IMessageService : ITelemetryDataEditorService
|
||||
{
|
||||
/// <summary>
|
||||
/// Получить сообщения по параметрам
|
||||
|
19
AsbCloudApp/Services/ITelemetryDataEditorService.cs
Normal file
19
AsbCloudApp/Services/ITelemetryDataEditorService.cs
Normal file
@ -0,0 +1,19 @@
|
||||
using AsbCloudApp.Requests;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace AsbCloudApp.Services;
|
||||
|
||||
/// <summary>
|
||||
/// Сервис по работе с данными телеметрии
|
||||
/// </summary>
|
||||
public interface ITelemetryDataEditorService
|
||||
{
|
||||
/// <summary>
|
||||
/// Удаление части телеметрии по запросу
|
||||
/// </summary>
|
||||
/// <param name="request"></param>
|
||||
/// <param name="token"></param>
|
||||
/// <returns></returns>
|
||||
Task<int> DeleteAsync(TelemetryPartDeleteRequest request, CancellationToken token);
|
||||
}
|
@ -11,7 +11,7 @@ namespace AsbCloudApp.Services
|
||||
/// сервис данных тех. процесса
|
||||
/// </summary>
|
||||
/// <typeparam name="TDto"></typeparam>
|
||||
public interface ITelemetryDataService<TDto> where TDto : ITelemetryData
|
||||
public interface ITelemetryDataService<TDto> : ITelemetryDataEditorService where TDto : ITelemetryData
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
|
@ -1,4 +1,5 @@
|
||||
using AsbCloudApp.Data;
|
||||
using AsbCloudApp.Requests;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Threading;
|
||||
@ -9,7 +10,7 @@ namespace AsbCloudApp.Services
|
||||
/// <summary>
|
||||
/// The wits record repository.
|
||||
/// </summary>
|
||||
public interface IWitsRecordRepository<TDto>
|
||||
public interface IWitsRecordRepository<TDto> : ITelemetryDataEditorService
|
||||
where TDto : ITelemetryData
|
||||
{
|
||||
/// <summary>
|
||||
|
@ -493,6 +493,8 @@ namespace AsbCloudInfrastructure
|
||||
|
||||
services.AddTransient<IWellboreService, WellboreService>();
|
||||
|
||||
services.AddTransient<ITelemetryDataEditorService, TelemetryDataEditorService>();
|
||||
|
||||
services.AddTransient<DetectedOperationExportService>();
|
||||
|
||||
services.AddTransient<IDailyReportService, DailyReportService>();
|
||||
|
@ -1,5 +1,6 @@
|
||||
using AsbCloudApp.Data;
|
||||
using AsbCloudApp.Repositories;
|
||||
using AsbCloudApp.Requests;
|
||||
using AsbCloudApp.Services;
|
||||
using AsbCloudDb.Model;
|
||||
using Mapster;
|
||||
@ -81,5 +82,32 @@ namespace AsbCloudInfrastructure.Repository
|
||||
|
||||
return entity;
|
||||
}
|
||||
|
||||
private IQueryable<DataSaubStat> BuildQuery(TelemetryPartDeleteRequest request)
|
||||
{
|
||||
var query = db.Set<DataSaubStat>()
|
||||
.Where(o => o.IdTelemetry == request.IdTelemetry);
|
||||
|
||||
if (request.LeDate is not null)
|
||||
{
|
||||
var leDate = request.LeDate.Value.ToUniversalTime();
|
||||
query = query.Where(o => o.DateStart <= leDate);
|
||||
}
|
||||
|
||||
if (request.GeDate is not null)
|
||||
{
|
||||
var geDate = request.GeDate.Value.ToUniversalTime();
|
||||
query = query.Where(o => o.DateEnd >= geDate);
|
||||
}
|
||||
|
||||
return query;
|
||||
}
|
||||
|
||||
public async Task<int> DeleteAsync(TelemetryPartDeleteRequest request, CancellationToken token)
|
||||
{
|
||||
var query = BuildQuery(request);
|
||||
db.Set<DataSaubStat>().RemoveRange(query);
|
||||
return await db.SaveChangesAsync(token);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -15,7 +15,8 @@ using AsbCloudApp.Data;
|
||||
|
||||
namespace AsbCloudInfrastructure.Repository;
|
||||
|
||||
public class DetectedOperationRepository : CrudRepositoryBase<DetectedOperationDto, DetectedOperation>, IDetectedOperationRepository
|
||||
public class DetectedOperationRepository
|
||||
: CrudRepositoryBase<DetectedOperationDto, DetectedOperation>, IDetectedOperationRepository
|
||||
{
|
||||
private readonly ITelemetryService telemetryService;
|
||||
|
||||
@ -33,6 +34,13 @@ public class DetectedOperationRepository : CrudRepositoryBase<DetectedOperationD
|
||||
return await dbContext.SaveChangesAsync(token);
|
||||
}
|
||||
|
||||
public async Task<int> DeleteAsync(TelemetryPartDeleteRequest request, CancellationToken token)
|
||||
{
|
||||
var query = BuildQuery(request);
|
||||
dbContext.Set<DetectedOperation>().RemoveRange(query);
|
||||
return await dbContext.SaveChangesAsync(token);
|
||||
}
|
||||
|
||||
public async Task<PaginationContainer<DetectedOperationDto>> GetPageAsync(DetectedOperationByTelemetryRequest request, CancellationToken token)
|
||||
{
|
||||
var skip = request.Skip ?? 0;
|
||||
@ -113,6 +121,26 @@ public class DetectedOperationRepository : CrudRepositoryBase<DetectedOperationD
|
||||
return query;
|
||||
}
|
||||
|
||||
private IQueryable<DetectedOperation> BuildQuery(TelemetryPartDeleteRequest request)
|
||||
{
|
||||
var query = dbContext.Set<DetectedOperation>()
|
||||
.Where(o => o.IdTelemetry == request.IdTelemetry);
|
||||
|
||||
if (request.LeDate is not null)
|
||||
{
|
||||
var leDate = request.LeDate.Value.ToUniversalTime();
|
||||
query = query.Where(o => o.DateStart <= leDate);
|
||||
}
|
||||
|
||||
if (request.GeDate is not null)
|
||||
{
|
||||
var geDate = request.GeDate.Value.ToUniversalTime();
|
||||
query = query.Where(o => o.DateEnd >= geDate);
|
||||
}
|
||||
|
||||
return query;
|
||||
}
|
||||
|
||||
private static DetectedOperationDto Convert(DetectedOperation src, TimeSpan offset)
|
||||
{
|
||||
var dto = src.Adapt<DetectedOperationDto>();
|
||||
|
@ -84,5 +84,33 @@ namespace AsbCloudInfrastructure.Repository
|
||||
dto.TimeStampStart = dto.TimeStampStart.ToRemoteDateTime(dto.Telemetry?.TimeZone?.Hours ?? 0);
|
||||
return dto;
|
||||
}
|
||||
|
||||
//TODO: Унифицировать модели данных телеметрии.Чтобы в будущем унифицировать репозитории данных телеметрии.
|
||||
private IQueryable<DrillTest> BuildQuery(TelemetryPartDeleteRequest request)
|
||||
{
|
||||
var query = db.Set<DrillTest>()
|
||||
.Where(o => o.IdTelemetry == request.IdTelemetry);
|
||||
|
||||
if (request.LeDate is not null)
|
||||
{
|
||||
var leDate = request.LeDate.Value.ToUniversalTime();
|
||||
query = query.Where(o => o.TimeStampStart <= leDate);
|
||||
}
|
||||
|
||||
if (request.GeDate is not null)
|
||||
{
|
||||
var geDate = request.GeDate.Value.ToUniversalTime();
|
||||
query = query.Where(o => o.TimeStampStart >= geDate);
|
||||
}
|
||||
|
||||
return query;
|
||||
}
|
||||
|
||||
public async Task<int> DeleteAsync(TelemetryPartDeleteRequest request, CancellationToken token)
|
||||
{
|
||||
var query = BuildQuery(request);
|
||||
db.Set<DrillTest>().RemoveRange(query);
|
||||
return await db.SaveChangesAsync(token);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1,9 +1,13 @@
|
||||
using AsbCloudApp.Data;
|
||||
using AsbCloudApp.Data.GTR;
|
||||
using AsbCloudApp.Exceptions;
|
||||
using AsbCloudApp.Repositories;
|
||||
using AsbCloudApp.Requests;
|
||||
using AsbCloudApp.Services;
|
||||
using AsbCloudDb;
|
||||
using AsbCloudDb.Model;
|
||||
using AsbCloudDb.Model.GTR;
|
||||
using Mapster;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using System;
|
||||
using System.Collections.Concurrent;
|
||||
@ -12,11 +16,6 @@ using System.Diagnostics;
|
||||
using System.Linq;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using AsbCloudApp.Exceptions;
|
||||
using AsbCloudApp.Requests;
|
||||
using Mapster;
|
||||
using AsbCloudApp.Data;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace AsbCloudInfrastructure.Repository
|
||||
{
|
||||
@ -369,7 +368,8 @@ namespace AsbCloudInfrastructure.Repository
|
||||
|
||||
cache.AddOrUpdate(idTelemetry,
|
||||
(_) => MakeNewCache(dtos),
|
||||
(_, oldItemsDictionary) => {
|
||||
(_, oldItemsDictionary) =>
|
||||
{
|
||||
foreach (var record in dtos)
|
||||
foreach (var item in record.Items)
|
||||
{
|
||||
@ -398,7 +398,8 @@ namespace AsbCloudInfrastructure.Repository
|
||||
{
|
||||
var items = dtos.SelectMany(record =>
|
||||
record.Items.Select(
|
||||
item => new WitsItemRecordDto {
|
||||
item => new WitsItemRecordDto
|
||||
{
|
||||
IdItem = item.Key,
|
||||
IdRecord = record.Id,
|
||||
Date = record.Date,
|
||||
@ -439,6 +440,47 @@ namespace AsbCloudInfrastructure.Repository
|
||||
Value = (TValue)dto.Value.Value,
|
||||
};
|
||||
|
||||
private IQueryable<TEntity> BuildQuery<TEntity, TValue>(TelemetryPartDeleteRequest request)
|
||||
where TEntity : WitsItemBase<TValue>
|
||||
where TValue : notnull
|
||||
{
|
||||
var query = db.Set<TEntity>().Where(i => i.IdTelemetry == request.IdTelemetry);
|
||||
|
||||
if (request.LeDate is not null)
|
||||
{
|
||||
var leDate = request.LeDate.Value.ToUniversalTime();
|
||||
query = query.Where(o => o.DateTime <= leDate);
|
||||
}
|
||||
|
||||
if (request.GeDate is not null)
|
||||
{
|
||||
var geDate = request.GeDate.Value.ToUniversalTime();
|
||||
query = query.Where(o => o.DateTime >= geDate);
|
||||
}
|
||||
|
||||
return query;
|
||||
}
|
||||
|
||||
public async Task<int> DeleteAsync(TelemetryPartDeleteRequest request, CancellationToken token)
|
||||
{
|
||||
var result = 0;
|
||||
result += await DeleteAsync<WitsItemFloat, float>(request, token);
|
||||
result += await DeleteAsync<WitsItemInt, int>(request, token);
|
||||
result += await DeleteAsync<WitsItemString, string>(request, token);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
private async Task<int> DeleteAsync<TEntity, TType>(TelemetryPartDeleteRequest request, CancellationToken token)
|
||||
where TEntity : WitsItemBase<TType>
|
||||
where TType : notnull
|
||||
{
|
||||
var query = BuildQuery<TEntity, TType>(request);
|
||||
db.Set<TEntity>().RemoveRange(query);
|
||||
return await db.SaveChangesAsync(token);
|
||||
}
|
||||
|
||||
|
||||
private class WitsRequest
|
||||
{
|
||||
public int IdTelemetry { get; set; }
|
||||
|
@ -21,6 +21,13 @@ namespace AsbCloudInfrastructure.Repository
|
||||
this.context = context;
|
||||
}
|
||||
|
||||
public async Task<int> DeleteAsync(TelemetryPartDeleteRequest request, CancellationToken token)
|
||||
{
|
||||
var query = BuildQuery(request);
|
||||
context.Set<LimitingParameter>().RemoveRange(query);
|
||||
return await context.SaveChangesAsync(token);
|
||||
}
|
||||
|
||||
public async Task<IEnumerable<LimitingParameterDataDto>> GetLimitingParametersAsync(LimitingParameterRequest request, WellDto wellDto, CancellationToken token)
|
||||
{
|
||||
var timezoneOffset = wellDto.Timezone.Hours;
|
||||
@ -74,6 +81,26 @@ namespace AsbCloudInfrastructure.Repository
|
||||
|
||||
return query;
|
||||
}
|
||||
|
||||
private IQueryable<LimitingParameter> BuildQuery(TelemetryPartDeleteRequest request)
|
||||
{
|
||||
var query = context.Set<LimitingParameter>()
|
||||
.Where(o => o.IdTelemetry == request.IdTelemetry);
|
||||
|
||||
if (request.LeDate is not null)
|
||||
{
|
||||
var leDate = request.LeDate.Value.ToUniversalTime();
|
||||
query = query.Where(o => o.DateStart <= leDate);
|
||||
}
|
||||
|
||||
if (request.GeDate is not null)
|
||||
{
|
||||
var geDate = request.GeDate.Value.ToUniversalTime();
|
||||
query = query.Where(o => o.DateEnd >= geDate);
|
||||
}
|
||||
|
||||
return query;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -1,3 +1,4 @@
|
||||
using AsbCloudApp.Requests;
|
||||
using AsbCloudApp.Services;
|
||||
using AsbCloudDb.Model;
|
||||
using Mapster;
|
||||
@ -58,6 +59,33 @@ namespace AsbCloudInfrastructure.Repository
|
||||
return data.Select(d => Convert(d, timezoneHours));
|
||||
}
|
||||
|
||||
private IQueryable<TEntity> BuildQuery(TelemetryPartDeleteRequest request)
|
||||
{
|
||||
var query = db.Set<TEntity>()
|
||||
.Where(o => o.IdTelemetry == request.IdTelemetry);
|
||||
|
||||
if (request.LeDate is not null)
|
||||
{
|
||||
var leDate = request.LeDate.Value.ToUniversalTime();
|
||||
query = query.Where(o => o.DateTime <= leDate);
|
||||
}
|
||||
|
||||
if (request.GeDate is not null)
|
||||
{
|
||||
var geDate = request.GeDate.Value.ToUniversalTime();
|
||||
query = query.Where(o => o.DateTime >= geDate);
|
||||
}
|
||||
|
||||
return query;
|
||||
}
|
||||
|
||||
public async Task<int> DeleteAsync(TelemetryPartDeleteRequest request, CancellationToken token)
|
||||
{
|
||||
var query = BuildQuery(request);
|
||||
dbset.RemoveRange(query);
|
||||
return await db.SaveChangesAsync(token);
|
||||
}
|
||||
|
||||
public TDto? GetLastOrDefault(int idTelemetry)
|
||||
=> cache.GetValueOrDefault(idTelemetry);
|
||||
|
||||
|
@ -154,6 +154,33 @@ namespace AsbCloudInfrastructure.Services.SAUB
|
||||
|
||||
return db.SaveChangesAsync(token);
|
||||
}
|
||||
|
||||
private IQueryable<TelemetryMessage> BuildQuery(TelemetryPartDeleteRequest request)
|
||||
{
|
||||
var query = db.Set<TelemetryMessage>()
|
||||
.Where(o => o.IdTelemetry == request.IdTelemetry);
|
||||
|
||||
if (request.GeDate is not null)
|
||||
{
|
||||
var geDate = request.GeDate.Value.ToUniversalTime();
|
||||
query = query.Where(o => o.DateTime <= geDate);
|
||||
}
|
||||
|
||||
if (request.LeDate is not null)
|
||||
{
|
||||
var leDate = request.LeDate.Value.ToUniversalTime();
|
||||
query = query.Where(o => o.DateTime >= leDate);
|
||||
}
|
||||
|
||||
return query;
|
||||
}
|
||||
|
||||
public async Task<int> DeleteAsync(TelemetryPartDeleteRequest request, CancellationToken token)
|
||||
{
|
||||
var query = BuildQuery(request);
|
||||
db.Set<TelemetryMessage>().RemoveRange(query);
|
||||
return await db.SaveChangesAsync(token);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1,6 +1,7 @@
|
||||
using AsbCloudApp.Data;
|
||||
using AsbCloudApp.Exceptions;
|
||||
using AsbCloudApp.Repositories;
|
||||
using AsbCloudApp.Requests;
|
||||
using AsbCloudApp.Services;
|
||||
using AsbCloudDb;
|
||||
using AsbCloudDb.Model;
|
||||
@ -11,8 +12,6 @@ using System.Diagnostics;
|
||||
using System.Linq;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using AsbCloudApp.Requests;
|
||||
using Mapster;
|
||||
|
||||
namespace AsbCloudInfrastructure.Services.SAUB
|
||||
{
|
||||
@ -219,6 +218,26 @@ namespace AsbCloudInfrastructure.Services.SAUB
|
||||
return query;
|
||||
}
|
||||
|
||||
private IQueryable<TEntity> BuildQuery(TelemetryPartDeleteRequest request)
|
||||
{
|
||||
var query = db.Set<TEntity>()
|
||||
.Where(o => o.IdTelemetry == request.IdTelemetry);
|
||||
|
||||
if (request.GeDate is not null)
|
||||
{
|
||||
var geDate = request.GeDate.Value.ToUniversalTime();
|
||||
query = query.Where(o => o.DateTime <= geDate);
|
||||
}
|
||||
|
||||
if (request.LeDate is not null)
|
||||
{
|
||||
var leDate = request.LeDate.Value.ToUniversalTime();
|
||||
query = query.Where(o => o.DateTime >= leDate);
|
||||
}
|
||||
|
||||
return query;
|
||||
}
|
||||
|
||||
/// <inheritdoc/>
|
||||
public async Task<DatesRangeDto?> GetRangeAsync(int idWell, DateTimeOffset geDate, DateTimeOffset? leDate, CancellationToken token)
|
||||
{
|
||||
@ -282,5 +301,11 @@ namespace AsbCloudInfrastructure.Services.SAUB
|
||||
|
||||
protected abstract TEntity Convert(TDto src, double timezoneOffset);
|
||||
|
||||
public async Task<int> DeleteAsync(TelemetryPartDeleteRequest request, CancellationToken token)
|
||||
{
|
||||
var query = BuildQuery(request);
|
||||
db.Set<TEntity>().RemoveRange(query);
|
||||
return await db.SaveChangesAsync(token);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -0,0 +1,82 @@
|
||||
using AsbCloudApp.Data.SAUB;
|
||||
using AsbCloudApp.Data.WITS;
|
||||
using AsbCloudApp.Repositories;
|
||||
using AsbCloudApp.Requests;
|
||||
using AsbCloudApp.Services;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace AsbCloudInfrastructure.Services.SAUB
|
||||
{
|
||||
/// <summary>
|
||||
/// Сервис по работе с данными телеметрии
|
||||
/// </summary>
|
||||
public class TelemetryDataEditorService : ITelemetryDataEditorService
|
||||
{
|
||||
private readonly ITelemetryDataEditorService[] repositories;
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
/// <param name="dataSaubService"></param>
|
||||
/// <param name="dataSpinService"></param>
|
||||
/// <param name="dataSaubStatRepository"></param>
|
||||
/// <param name="messageService"></param>
|
||||
/// <param name="drillTestRepository"></param>
|
||||
/// <param name="limitingParameterRepository"></param>
|
||||
/// <param name="detectedOperationRepository"></param>
|
||||
/// <param name="witsRecord1Repository"></param>
|
||||
/// <param name="witsRecord7Repository"></param>
|
||||
/// <param name="witsRecord8Repository"></param>
|
||||
/// <param name="witsRecord50Repository"></param>
|
||||
/// <param name="witsRecord60Repository"></param>
|
||||
/// <param name="witsRecord61Repository"></param>
|
||||
/// <param name="gtrRepository"></param>
|
||||
public TelemetryDataEditorService(
|
||||
ITelemetryDataSaubService dataSaubService,
|
||||
ITelemetryDataService<TelemetryDataSpinDto> dataSpinService,
|
||||
IDataSaubStatRepository dataSaubStatRepository,
|
||||
IMessageService messageService,
|
||||
IDrillTestRepository drillTestRepository,
|
||||
ILimitingParameterRepository limitingParameterRepository,
|
||||
IDetectedOperationRepository detectedOperationRepository,
|
||||
IWitsRecordRepository<Record1Dto> witsRecord1Repository,
|
||||
IWitsRecordRepository<Record7Dto> witsRecord7Repository,
|
||||
IWitsRecordRepository<Record8Dto> witsRecord8Repository,
|
||||
IWitsRecordRepository<Record50Dto> witsRecord50Repository,
|
||||
IWitsRecordRepository<Record60Dto> witsRecord60Repository,
|
||||
IWitsRecordRepository<Record61Dto> witsRecord61Repository,
|
||||
IGtrRepository gtrRepository
|
||||
)
|
||||
{
|
||||
repositories =
|
||||
[
|
||||
dataSaubService,
|
||||
dataSpinService,
|
||||
dataSaubStatRepository,
|
||||
messageService,
|
||||
drillTestRepository,
|
||||
limitingParameterRepository,
|
||||
detectedOperationRepository,
|
||||
witsRecord1Repository,
|
||||
witsRecord7Repository,
|
||||
witsRecord8Repository,
|
||||
witsRecord50Repository,
|
||||
witsRecord60Repository,
|
||||
witsRecord61Repository,
|
||||
gtrRepository,
|
||||
];
|
||||
}
|
||||
|
||||
public async Task<int> DeleteAsync(TelemetryPartDeleteRequest request, CancellationToken token)
|
||||
{
|
||||
var result = 0;
|
||||
foreach (var repository in repositories)
|
||||
{
|
||||
result += await repository.DeleteAsync(request, token);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
}
|
@ -1,7 +1,10 @@
|
||||
using AsbCloudApp.Data;
|
||||
using AsbCloudApp.Requests;
|
||||
using AsbCloudApp.Services;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using System;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
@ -16,12 +19,15 @@ namespace AsbCloudWebApi.Controllers
|
||||
public class AdminTelemetryController : CrudController<TelemetryDto, ICrudRepository<TelemetryDto>>
|
||||
{
|
||||
private readonly ITelemetryService telemetryService;
|
||||
private readonly ITelemetryDataEditorService telemetryEditorService;
|
||||
|
||||
public AdminTelemetryController(ICrudRepository<TelemetryDto> service,
|
||||
ITelemetryService telemetryService)
|
||||
ITelemetryService telemetryService,
|
||||
ITelemetryDataEditorService telemetryEditorService)
|
||||
: base(service)
|
||||
{
|
||||
this.telemetryService = telemetryService;
|
||||
this.telemetryEditorService = telemetryEditorService;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@ -36,5 +42,22 @@ namespace AsbCloudWebApi.Controllers
|
||||
.ConfigureAwait(false);
|
||||
return Ok(count);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Удаление куска телеметрии по запросу
|
||||
/// </summary>
|
||||
/// <param name="request">запрос</param>
|
||||
/// <param name="token"></param>
|
||||
/// <returns></returns>
|
||||
[HttpDelete("/part")]
|
||||
[Permission]
|
||||
[ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
|
||||
[ProducesResponseType(typeof(ValidationProblemDetails), StatusCodes.Status400BadRequest)]
|
||||
public async Task<IActionResult> DeleteAsync([FromQuery] TelemetryPartDeleteRequest request,CancellationToken token)
|
||||
{
|
||||
var result = await telemetryEditorService.DeleteAsync(request, token);
|
||||
|
||||
return Ok(result);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user