diff --git a/AsbCloudApp/Services/Subsystems/ISubsystemOperationTimeService.cs b/AsbCloudApp/Services/Subsystems/ISubsystemOperationTimeService.cs
index 746fa398..774b8754 100644
--- a/AsbCloudApp/Services/Subsystems/ISubsystemOperationTimeService.cs
+++ b/AsbCloudApp/Services/Subsystems/ISubsystemOperationTimeService.cs
@@ -63,14 +63,6 @@ namespace AsbCloudApp.Services.Subsystems
///
///
///
- Task> GetStatByActiveWells(IEnumerable wellIds, CancellationToken token);
-
- ///
- /// Получение периода, за который будет расчитываться статистика
- ///
- ///
- ///
- ///
- Task> GetStatDateRangeAsync(SubsystemOperationTimeRequest request, CancellationToken token);
+ Task> GetStatByActiveWells(IEnumerable wellIds, CancellationToken token);
}
}
diff --git a/AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeService.cs b/AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeService.cs
index 3dcf51a9..beafaf35 100644
--- a/AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeService.cs
+++ b/AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeService.cs
@@ -1,6 +1,7 @@
using AsbCloudApp.Data;
using AsbCloudApp.Data.DetectedOperation;
using AsbCloudApp.Data.Subsystems;
+using AsbCloudApp.Exceptions;
using AsbCloudApp.Requests;
using AsbCloudApp.Services;
using AsbCloudApp.Services.Subsystems;
@@ -17,10 +18,8 @@ using System.Threading.Tasks;
namespace AsbCloudInfrastructure.Services.Subsystems
{
-
internal class SubsystemOperationTimeService : ISubsystemOperationTimeService
{
-
private readonly IAsbCloudDbContext db;
private readonly IWellService wellService;
private readonly ICrudRepository subsystemService;
@@ -111,22 +110,6 @@ namespace AsbCloudInfrastructure.Services.Subsystems
return statList;
}
- public async Task> GetStatDateRangeAsync(SubsystemOperationTimeRequest request, CancellationToken token)
- {
- request.SelectMode = SubsystemOperationTimeRequest.SelectModeTrim;
- var data = await GetOperationTimeAsync(request, token);
- if (data is null)
- return Enumerable.Empty();
-
- var dateRanges = new List
- {
- data.Min(d => d.DateStart),
- data.Max(d => d.DateEnd)
- };
-
- return dateRanges.AsEnumerable();
- }
-
private static IEnumerable TrimOperation(IEnumerable data, DateTimeOffset? gtDate, DateTimeOffset? ltDate)
{
if (!ltDate.HasValue && !gtDate.HasValue)
@@ -219,6 +202,7 @@ namespace AsbCloudInfrastructure.Services.Subsystems
return depthInterval;
}
+
private static double GetDepthIntervalSubsystem(int idSubsystem, (double depthIntervalRotor, double depthIntervalSlide) depthInterval)
{
var depthIntervalSubsystem = 0d;
@@ -350,11 +334,11 @@ namespace AsbCloudInfrastructure.Services.Subsystems
return result;
}
- private IQueryable? BuildQuery(SubsystemOperationTimeRequest request)
+ private IQueryable BuildQuery(SubsystemOperationTimeRequest request)
{
var well = wellService.GetOrDefault(request.IdWell);
if (well?.IdTelemetry is null || well.Timezone is null)
- return null;
+ throw new ArgumentInvalidException($"Not valid IdWell = {request.IdWell}", nameof(request.IdWell));
var query = db.SubsystemOperationTimes
.Include(o => o.Subsystem)
@@ -412,9 +396,6 @@ namespace AsbCloudInfrastructure.Services.Subsystems
dto.DateStart = operationTime.DateStart.ToRemoteDateTime(hours);
dto.DateEnd = operationTime.DateEnd.ToRemoteDateTime(hours);
return dto;
- }
-
-
+ }
}
-
}