Merge branch 'dev' into feature/#36049589-copy-contacts-from-well-to-well

AsbCloudApp/Repositories/IDataSaubStatRepository.cs

@@ -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>
         /// Получение записей по ключу телеметрии

AsbCloudApp/Repositories/IDetectedOperationRepository.cs

@@ -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 System.Threading.Tasks;
-using AsbCloudApp.Data.WellOperation;
 
 namespace AsbCloudApp.Repositories;
 
 /// <summary>
 /// Таблица автоматически определенных операций
 /// </summary>
-public interface IDetectedOperationRepository
+public interface IDetectedOperationRepository : ITelemetryDataEditorService
 {
     /// <summary>
     /// Добавление нескольких записей
@@ -21,7 +21,7 @@ public interface IDetectedOperationRepository
     /// <param name="token"></param>
     /// <returns>количество добавленных</returns>
     Task<int> InsertRangeAsync(IEnumerable<DetectedOperationDto> dtos, CancellationToken token);
-    
+
     /// <summary>
     /// Обновить несколько записей
     /// </summary>
@@ -37,7 +37,7 @@ public interface IDetectedOperationRepository
     /// <param name="token"></param>
     /// <returns></returns>
     Task<int> DeleteRangeAsync(IEnumerable<int> ids, CancellationToken token);
-    
+
     /// <summary>
     /// Получить автоматически определенные операции по телеметрии
     /// </summary>
@@ -60,7 +60,7 @@ public interface IDetectedOperationRepository
     /// <param name="token"></param>
     /// <returns></returns>
     Task<IDictionary<int, DateTimeOffset>> GetLastDetectedDatesAsync(CancellationToken token);
-    
+
     /// <summary>
     /// Удалить операции
     /// </summary>

AsbCloudApp/Repositories/IDrillTestRepository.cs

@@ -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 в соответствии с параметрами запроса

AsbCloudApp/Repositories/IGtrRepository.cs

@@ -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>
         /// добавить данные (для панели бурильщика)

AsbCloudApp/Repositories/ILimitingParameterRepository.cs

@@ -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>
         /// Получение списка ограничивающих параметров по идентификатору скважины

AsbCloudApp/Requests/TelemetryPartDeleteRequest.cs

@@ -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");
+    }
+}

AsbCloudApp/Services/IMessageService.cs

@@ -10,7 +10,7 @@ namespace AsbCloudApp.Services
     /// <summary>
     /// Сервис сообщений панели оператора
     /// </summary>
-    public interface IMessageService
+    public interface IMessageService : ITelemetryDataEditorService
     {
         /// <summary>
         /// Получить сообщения по параметрам

AsbCloudApp/Services/ITelemetryDataEditorService.cs

@@ -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);
+}

AsbCloudApp/Services/ITelemetryDataService.cs

@@ -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>

AsbCloudApp/Services/IWitsRepository.cs

@@ -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>

AsbCloudDb/Migrations/20240724070443_Update_WellSectionType_Order.cs

@@ -0,0 +1,158 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace AsbCloudDb.Migrations
+{
+    /// <inheritdoc />
+    public partial class Update_WellSectionType_Order : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.UpdateData(
+                table: "t_well_section_type",
+                keyColumn: "id",
+                keyValue: 1,
+                column: "order",
+                value: 5f);
+
+            migrationBuilder.UpdateData(
+                table: "t_well_section_type",
+                keyColumn: "id",
+                keyValue: 5,
+                column: "order",
+                value: 4f);
+
+            migrationBuilder.UpdateData(
+                table: "t_well_section_type",
+                keyColumn: "id",
+                keyValue: 7,
+                column: "order",
+                value: 5.1f);
+
+            migrationBuilder.UpdateData(
+                table: "t_well_section_type",
+                keyColumn: "id",
+                keyValue: 11,
+                column: "order",
+                value: 4.1f);
+
+            migrationBuilder.UpdateData(
+                table: "t_well_section_type",
+                keyColumn: "id",
+                keyValue: 13,
+                column: "order",
+                value: 5.2f);
+
+            migrationBuilder.UpdateData(
+                table: "t_well_section_type",
+                keyColumn: "id",
+                keyValue: 17,
+                column: "order",
+                value: 4.2f);
+
+            migrationBuilder.UpdateData(
+                table: "t_well_section_type",
+                keyColumn: "id",
+                keyValue: 19,
+                column: "order",
+                value: 5.3f);
+
+            migrationBuilder.UpdateData(
+                table: "t_well_section_type",
+                keyColumn: "id",
+                keyValue: 23,
+                column: "order",
+                value: 4.3f);
+
+            migrationBuilder.UpdateData(
+                table: "t_well_section_type",
+                keyColumn: "id",
+                keyValue: 25,
+                column: "order",
+                value: 5.4f);
+
+            migrationBuilder.UpdateData(
+                table: "t_well_section_type",
+                keyColumn: "id",
+                keyValue: 29,
+                column: "order",
+                value: 4.4f);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.UpdateData(
+                table: "t_well_section_type",
+                keyColumn: "id",
+                keyValue: 1,
+                column: "order",
+                value: 4f);
+
+            migrationBuilder.UpdateData(
+                table: "t_well_section_type",
+                keyColumn: "id",
+                keyValue: 5,
+                column: "order",
+                value: 5f);
+
+            migrationBuilder.UpdateData(
+                table: "t_well_section_type",
+                keyColumn: "id",
+                keyValue: 7,
+                column: "order",
+                value: 4.1f);
+
+            migrationBuilder.UpdateData(
+                table: "t_well_section_type",
+                keyColumn: "id",
+                keyValue: 11,
+                column: "order",
+                value: 5.1f);
+
+            migrationBuilder.UpdateData(
+                table: "t_well_section_type",
+                keyColumn: "id",
+                keyValue: 13,
+                column: "order",
+                value: 4.2f);
+
+            migrationBuilder.UpdateData(
+                table: "t_well_section_type",
+                keyColumn: "id",
+                keyValue: 17,
+                column: "order",
+                value: 5.2f);
+
+            migrationBuilder.UpdateData(
+                table: "t_well_section_type",
+                keyColumn: "id",
+                keyValue: 19,
+                column: "order",
+                value: 4.3f);
+
+            migrationBuilder.UpdateData(
+                table: "t_well_section_type",
+                keyColumn: "id",
+                keyValue: 23,
+                column: "order",
+                value: 5.3f);
+
+            migrationBuilder.UpdateData(
+                table: "t_well_section_type",
+                keyColumn: "id",
+                keyValue: 25,
+                column: "order",
+                value: 4.4f);
+
+            migrationBuilder.UpdateData(
+                table: "t_well_section_type",
+                keyColumn: "id",
+                keyValue: 29,
+                column: "order",
+                value: 5.4f);
+        }
+    }
+}

AsbCloudDb/Migrations/AsbCloudDbContextModelSnapshot.cs

@@ -9545,7 +9545,7 @@ namespace AsbCloudDb.Migrations
                         {
                             Id = 1,
                             Caption = "Пилотный ствол",
-                            Order = 4f
+                            Order = 5f
                         },
                         new
                         {
@@ -9569,7 +9569,7 @@ namespace AsbCloudDb.Migrations
                         {
                             Id = 5,
                             Caption = "Транспортный ствол",
-                            Order = 5f
+                            Order = 4f
                         },
                         new
                         {
@@ -9581,7 +9581,7 @@ namespace AsbCloudDb.Migrations
                         {
                             Id = 7,
                             Caption = "Пилотный ствол 2",
-                            Order = 4.1f
+                            Order = 5.1f
                         },
                         new
                         {
@@ -9605,7 +9605,7 @@ namespace AsbCloudDb.Migrations
                         {
                             Id = 11,
                             Caption = "Транспортный ствол 2",
-                            Order = 5.1f
+                            Order = 4.1f
                         },
                         new
                         {
@@ -9617,7 +9617,7 @@ namespace AsbCloudDb.Migrations
                         {
                             Id = 13,
                             Caption = "Пилотный ствол 3",
-                            Order = 4.2f
+                            Order = 5.2f
                         },
                         new
                         {
@@ -9641,7 +9641,7 @@ namespace AsbCloudDb.Migrations
                         {
                             Id = 17,
                             Caption = "Транспортный ствол 3",
-                            Order = 5.2f
+                            Order = 4.2f
                         },
                         new
                         {
@@ -9653,7 +9653,7 @@ namespace AsbCloudDb.Migrations
                         {
                             Id = 19,
                             Caption = "Пилотный ствол 4",
-                            Order = 4.3f
+                            Order = 5.3f
                         },
                         new
                         {
@@ -9677,7 +9677,7 @@ namespace AsbCloudDb.Migrations
                         {
                             Id = 23,
                             Caption = "Транспортный ствол 4",
-                            Order = 5.3f
+                            Order = 4.3f
                         },
                         new
                         {
@@ -9689,7 +9689,7 @@ namespace AsbCloudDb.Migrations
                         {
                             Id = 25,
                             Caption = "Пилотный ствол 5",
-                            Order = 4.4f
+                            Order = 5.4f
                         },
                         new
                         {
@@ -9713,7 +9713,7 @@ namespace AsbCloudDb.Migrations
                         {
                             Id = 29,
                             Caption = "Транспортный ствол 5",
-                            Order = 5.4f
+                            Order = 4.4f
                         },
                         new
                         {

AsbCloudDb/Model/DefaultData/EntityFillerWellSectionType.cs

@@ -4,39 +4,39 @@ namespace AsbCloudDb.Model.DefaultData
     {
         public override WellSectionType[] GetData() => new WellSectionType[]
         {
-            new (){ Id = 1, Caption = "Пилотный ствол", Order = 4},
+            new (){ Id = 1, Caption = "Пилотный ствол", Order = 5},
             new (){ Id = 2, Caption = "Направление", Order = 0},
             new (){ Id = 3, Caption = "Кондуктор", Order = 1},
             new (){ Id = 4, Caption = "Эксплуатационная колонна", Order = 3},
-            new (){ Id = 5, Caption = "Транспортный ствол", Order = 5},
+            new (){ Id = 5, Caption = "Транспортный ствол", Order = 4},
             new (){ Id = 6, Caption = "Хвостовик", Order = 6},
 
-            new (){ Id = 7, Caption = "Пилотный ствол 2", Order = 4.1f},
+            new (){ Id = 7, Caption = "Пилотный ствол 2", Order = 5.1f},
             new (){ Id = 8, Caption = "Направление 2", Order = 0.1f},
             new (){ Id = 9, Caption = "Кондуктор 2", Order = 1.1f},
             new (){ Id = 10, Caption = "Эксплуатационная колонна 2", Order = 3.1f},
-            new (){ Id = 11, Caption = "Транспортный ствол 2", Order = 5.1f},
+            new (){ Id = 11, Caption = "Транспортный ствол 2", Order = 4.1f},
             new (){ Id = 12, Caption = "Хвостовик 2", Order = 6.1f},
 
-            new (){ Id = 13, Caption = "Пилотный ствол 3", Order = 4.2f},
+            new (){ Id = 13, Caption = "Пилотный ствол 3", Order = 5.2f},
             new (){ Id = 14, Caption = "Направление 3", Order = 0.2f},
             new (){ Id = 15, Caption = "Кондуктор 3", Order = 1.2f},
             new (){ Id = 16, Caption = "Эксплуатационная колонна 3", Order = 3.2f},
-            new (){ Id = 17, Caption = "Транспортный ствол 3", Order = 5.2f},
+            new (){ Id = 17, Caption = "Транспортный ствол 3", Order = 4.2f},
             new (){ Id = 18, Caption = "Хвостовик 3", Order = 6.2f},
 
-            new (){ Id = 19, Caption = "Пилотный ствол 4", Order = 4.3f},
+            new (){ Id = 19, Caption = "Пилотный ствол 4", Order = 5.3f},
             new (){ Id = 20, Caption = "Направление 4", Order = 0.3f},
             new (){ Id = 21, Caption = "Кондуктор 4", Order = 1.3f},
             new (){ Id = 22, Caption = "Эксплуатационная колонна 4", Order = 3.3f},
-            new (){ Id = 23, Caption = "Транспортный ствол 4", Order = 5.3f},
+            new (){ Id = 23, Caption = "Транспортный ствол 4", Order = 4.3f},
             new (){ Id = 24, Caption = "Хвостовик 4", Order = 6.3f},
 
-            new (){ Id = 25, Caption = "Пилотный ствол 5", Order = 4.4f},
+            new (){ Id = 25, Caption = "Пилотный ствол 5", Order = 5.4f},
             new (){ Id = 26, Caption = "Направление 5", Order = 0.4f},
             new (){ Id = 27, Caption = "Кондуктор 5", Order = 1.4f},
             new (){ Id = 28, Caption = "Эксплуатационная колонна 5", Order = 3.4f},
-            new (){ Id = 29, Caption = "Транспортный ствол 5", Order = 5.4f},
+            new (){ Id = 29, Caption = "Транспортный ствол 5", Order = 4.4f},
             new (){ Id = 30, Caption = "Хвостовик 5", Order = 6.4f},
 
             new (){ Id = 31, Caption = "Техническая колонна", Order = 2},

AsbCloudInfrastructure/DependencyInjection.cs

@@ -493,6 +493,8 @@ namespace AsbCloudInfrastructure
 
             services.AddTransient<IWellboreService, WellboreService>();
 
+            services.AddTransient<ITelemetryDataEditorService, TelemetryDataEditorService>();
+
             services.AddTransient<DetectedOperationExportService>();
 
             services.AddTransient<IDailyReportService, DailyReportService>();

AsbCloudInfrastructure/Repository/DataSaubStatRepository.cs

@@ -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);
+        }
     }
 }

AsbCloudInfrastructure/Repository/DetectedOperationRepository.cs

@@ -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;
@@ -112,7 +120,27 @@ 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>();

AsbCloudInfrastructure/Repository/DrillTestRepository.cs

@@ -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);
+        }
     }
 }

AsbCloudInfrastructure/Repository/GtrWitsRepository.cs

@@ -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
 {
@@ -87,7 +86,7 @@ namespace AsbCloudInfrastructure.Repository
         public async Task<DatesRangeDto?> GetRangeAsync(int idWell, DateTimeOffset? geDate, DateTimeOffset? leDate, CancellationToken token)
         {
             var telemetry = telemetryService.GetOrDefaultTelemetryByIdWell(idWell);
-            
+
             if (telemetry is null)
                 return null;
 
@@ -109,7 +108,7 @@ namespace AsbCloudInfrastructure.Repository
                 });
             var range = await groupedQuery.FirstOrDefaultAsync(token);
 
-            if (range is null) 
+            if (range is null)
                 return null;
 
             var result = new DatesRangeDto
@@ -121,16 +120,16 @@ namespace AsbCloudInfrastructure.Repository
         }
 
         private async Task<IEnumerable<GtrWitsDto>> GetAsync<TEntity, TType>(int idWell, GtrRequest request, CancellationToken token)
-            where TEntity : WitsItemBase<TType> 
+            where TEntity : WitsItemBase<TType>
             where TType : notnull
         {
             var telemetry = telemetryService.GetOrDefaultTelemetryByIdWell(idWell);
-            
+
             if (telemetry is null)
                 return Enumerable.Empty<GtrWitsDto>();
 
             if (telemetry.TimeZone is null)
-                throw new ArgumentInvalidException(nameof(idWell),$"Telemetry id: {telemetry.Id} can't find timezone");
+                throw new ArgumentInvalidException(nameof(idWell), $"Telemetry id: {telemetry.Id} can't find timezone");
 
             var query = BuildQuery<TEntity, TType>(telemetry.Id, request);
 
@@ -147,7 +146,7 @@ namespace AsbCloudInfrastructure.Repository
 
             var interval = TimeSpan.FromSeconds(10);
             var timezoneOffset = TimeSpan.FromHours(telemetry.TimeZone.Hours);
-            
+
             var dtos = entities
                 .GroupBy(e => e.DateTime.Ticks / interval.Ticks)
                 .Select(groupByInterval =>
@@ -166,9 +165,9 @@ namespace AsbCloudInfrastructure.Repository
         }
 
         private IQueryable<TEntity> BuildQuery<TEntity, TType>(int idTelemetry, GtrRequest request)
-            where TEntity : WitsItemBase<TType> 
+            where TEntity : WitsItemBase<TType>
             where TType : notnull
-        {            
+        {
             var query = db.Set<TEntity>()
                 .Where(e => e.IdTelemetry == idTelemetry);
 
@@ -183,9 +182,9 @@ namespace AsbCloudInfrastructure.Repository
             else
             {
                 var lastDate = query
-                    .OrderBy(e=>e.DateTime)
+                    .OrderBy(e => e.DateTime)
                     .LastOrDefault()
-                    ?.DateTime 
+                    ?.DateTime
                     ?? DateTimeOffset.UtcNow;
                 var dateBegin = lastDate.AddSeconds(-request.IntervalSec);
                 var dateEnd = lastDate;
@@ -329,10 +328,10 @@ namespace AsbCloudInfrastructure.Repository
                 var dateTime = record.Date.ToUtcDateTimeOffset(timezoneHours);
                 foreach (var item in record.Items)
                 {
-                    if (cacheTelemetryItems?.TryGetValue((record.Id, item.Key), out var cacheItem) == true)                    
+                    if (cacheTelemetryItems?.TryGetValue((record.Id, item.Key), out var cacheItem) == true)
                         if (Math.Abs((dateTime - cacheItem.Date).TotalSeconds) < 1)
-                            continue;                    
+                            continue;
-                    
+
                     if (item.Value.Value is string valueString)
                     {
                         var entity = MakeEntity<WitsItemString, string>(record.Id, item.Key, idTelemetry, dateTime, valueString);
@@ -362,14 +361,15 @@ namespace AsbCloudInfrastructure.Repository
                 if (ints.Any())
                     await db.Database.ExecInsertOrIgnoreAsync(db.Set<WitsItemInt>(), ints, token);
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 Trace.TraceError("Exception while saving GTR Wits data", ex);
             }
 
             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,
@@ -409,7 +410,7 @@ namespace AsbCloudInfrastructure.Repository
                 .GroupBy(item => (item.IdRecord, item.IdItem));
 
             var pairs = groups.Select(group => new KeyValuePair<(int, int), WitsItemRecordDto>(
-                group.Key, 
+                group.Key,
                 group.OrderByDescending(item => item.Date).First()));
 
             return new ConcurrentDictionary<(int, int), WitsItemRecordDto>(pairs);
@@ -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; }

AsbCloudInfrastructure/Repository/LimitingParameterRepository.cs

@@ -17,10 +17,17 @@ namespace AsbCloudInfrastructure.Repository
         private readonly IAsbCloudDbContext context;
 
         public LimitingParameterRepository(IAsbCloudDbContext context)
-        { 
+        {
             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;
+        }
     }
 
 }

AsbCloudInfrastructure/Repository/WitsRecordRepository.cs

@@ -1,3 +1,4 @@
+using AsbCloudApp.Requests;
 using AsbCloudApp.Services;
 using AsbCloudDb.Model;
 using Mapster;
@@ -20,7 +21,7 @@ namespace AsbCloudInfrastructure.Repository
         private readonly IAsbCloudDbContext db;
         private readonly ITelemetryService telemetryService;
 
-        private static readonly ConcurrentDictionary<int, TDto> cache = new ();
+        private static readonly ConcurrentDictionary<int, TDto> cache = new();
 
         public WitsRecordRepository(IAsbCloudDbContext db, ITelemetryService telemetryService)
         {
@@ -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);
 
@@ -66,7 +94,7 @@ namespace AsbCloudInfrastructure.Repository
             if (!dtos.Any())
                 return;
 
-            cache.AddOrUpdate(idTelemetry, dtos.Last(), (_,_) => dtos.OrderBy(r => r.DateTime).Last());
+            cache.AddOrUpdate(idTelemetry, dtos.Last(), (_, _) => dtos.OrderBy(r => r.DateTime).Last());
 
             var timezoneHours = telemetryService.GetTimezone(idTelemetry).Hours;
             var entities = dtos
@@ -81,7 +109,7 @@ namespace AsbCloudInfrastructure.Repository
                 .Select(e => e.DateTime)
                 .OrderBy(d => d)
                 .ToArrayAsync(token);
-            
+
             foreach (var entity in entities)
             {
                 if (!existingEntities.Any(e => e == entity.DateTime))
@@ -101,9 +129,9 @@ namespace AsbCloudInfrastructure.Repository
                         (dt.Millisecond + random.Next(1, 283)) % 1000,
                         dt.Offset);
                     dbset.Add(entity);
-                }                    
+                }
             }
-            
+
             await db.SaveChangesAsync(token);
         }
 
@@ -126,8 +154,8 @@ namespace AsbCloudInfrastructure.Repository
         {
             var entity = dto.Adapt<TEntity>();
             entity.Recid = GetRecId(dto);
-            entity.IdTelemetry = idTelemetry;            
+            entity.IdTelemetry = idTelemetry;
-            entity.DateTime = dto.DateTime.ToUtcDateTimeOffset(timezoneHours);            
+            entity.DateTime = dto.DateTime.ToUtcDateTimeOffset(timezoneHours);
             return entity;
         }
 

AsbCloudInfrastructure/Services/SAUB/MessageService.cs

@@ -96,7 +96,7 @@ namespace AsbCloudInfrastructure.Services.SAUB
             var allUsers = await memoryCache.GetOrCreateBasicAsync(db.Set<TelemetryUser>(), token);
             var users = allUsers.Where(u => u.IdTelemetry == telemetry.Id);
 
-            var eventsDict = events.ToDictionary(x=>x.IdEvent, x => x);
+            var eventsDict = events.ToDictionary(x => x.IdEvent, x => x);
             var usersDict = users.ToDictionary(x => x.IdUser, x => x);
 
             var messagesDtoList = new List<MessageDto>();
@@ -142,7 +142,7 @@ namespace AsbCloudInfrastructure.Services.SAUB
                 return Task.CompletedTask;
 
             var telemetry = telemetryService.GetOrCreateTelemetryByUid(uid);
-            
+
             foreach (var dto in dtos)
             {
                 var entity = dto.Adapt<TelemetryMessage>();
@@ -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);
+        }
     }
 }
 

AsbCloudInfrastructure/Services/SAUB/TelemetryDataBaseService.cs

@@ -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
 {
@@ -160,12 +159,12 @@ namespace AsbCloudInfrastructure.Services.SAUB
         public async Task<IEnumerable<TDto>> GetByTelemetryAsync(int idTelemetry, TelemetryDataRequest request, CancellationToken token)
         {
             var timezone = telemetryService.GetTimezone(idTelemetry);
-            
+
             var cache = telemetryDataCache.GetOrDefault(idTelemetry, request);
-            
+
-            if(cache is not null)
+            if (cache is not null)
                 return cache;
-            
+
             var query = BuildQuery(idTelemetry, request);
 
             var entities = await query
@@ -219,10 +218,30 @@ 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)
         {
-            var telemetry = telemetryService.GetOrDefaultTelemetryByIdWell(idWell) 
+            var telemetry = telemetryService.GetOrDefaultTelemetryByIdWell(idWell)
                 ?? throw new ArgumentInvalidException(nameof(idWell), $"По скважине id:{idWell} нет телеметрии");
 
             if ((DateTimeOffset.UtcNow - geDate) < TimeSpan.FromHours(12))
@@ -231,7 +250,7 @@ namespace AsbCloudInfrastructure.Services.SAUB
                 var cachedRange = telemetryDataCache.GetOrDefaultCachedDataDateRange(telemetry.Id);
                 if (cachedRange is not null)
                 {
-                    var datesRange = new DatesRangeDto {From = cachedRange.From, To = cachedRange.To };
+                    var datesRange = new DatesRangeDto { From = cachedRange.From, To = cachedRange.To };
                     if (geDate >= cachedRange.From)
                         datesRange.From = geDate.ToOffset(cachedRange.From.Offset);
 
@@ -246,7 +265,7 @@ namespace AsbCloudInfrastructure.Services.SAUB
                 .Where(entity => entity.IdTelemetry == telemetry.Id)
                 .Where(entity => entity.DateTime >= geDate.ToUniversalTime());
 
-            if(leDate.HasValue)
+            if (leDate.HasValue)
                 query = query.Where(entity => entity.DateTime <= leDate.Value.ToUniversalTime());
 
             var groupQuery = query
@@ -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);
+        }
     }
 }

AsbCloudInfrastructure/Services/SAUB/TelemetryDataEditorService.cs

@@ -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;
+        }
+    }
+}

AsbCloudWebApi/Controllers/AdminTelemetryController.cs

@@ -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);
+        }
     }
 }