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

Фикс предупреждений + рефакторинг кода

Browse Source
This commit is contained in:
Степанов Дмитрий 2023-12-19 13:39:50 +05:00
parent b32f115568
commit f5f5a77418
3 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AsbCloudApp/Services/IDetectedOperationService.cs
View File

@ -35,7 +35,7 @@ namespace AsbCloudApp.Services
/// <param name="request"></param>
/// <param name="token"></param>
/// <returns></returns>
Task<IEnumerable<DetectedOperationDto>?> GetOperationsAsync(DetectedOperationRequest request, CancellationToken token);
Task<IEnumerable<DetectedOperationDto>> GetOperationsAsync(DetectedOperationRequest request, CancellationToken token);
/// <summary>
/// Удалить операции

12
AsbCloudInfrastructure/Services/DetectOperations/DetectedOperationService.cs
View File

@ -45,17 +45,13 @@ namespace AsbCloudInfrastructure.Services.DetectOperations
return result;
}
public async Task<IEnumerable<DetectedOperationDto>?> GetOperationsAsync(DetectedOperationRequest request, CancellationToken token)
public async Task<IEnumerable<DetectedOperationDto>> GetOperationsAsync(DetectedOperationRequest request, CancellationToken token)
{
var well = await wellService.GetOrDefaultAsync(request.IdWell, token);
if (well?.IdTelemetry is null || well.Timezone is null)
return null;
if (well?.IdTelemetry is null)
return Enumerable.Empty<DetectedOperationDto>();
var query = BuildQuery(well, request)
?.AsNoTracking();
if (query is null)
return null;
var query = BuildQuery(well, request).AsNoTracking();
var data = await query.ToListAsync(token);

10
AsbCloudInfrastructure/Services/Subsystems/SubsystemService.cs
View File

@ -223,13 +223,11 @@ internal class SubsystemService : ISubsystemService
var dateRange = telemetryDataSaubService.GetRange(well.Id);
var beginUTC = gtDate.HasValue
? gtDate.Value.ToUtcDateTimeOffset(hoursOffset)
: dateRange.From.ToUtcDateTimeOffset(hoursOffset);
var beginUTC = gtDate?.ToUtcDateTimeOffset(hoursOffset)
?? dateRange?.From.ToUtcDateTimeOffset(hoursOffset);
var endUTC = ltDate.HasValue
? ltDate.Value.ToUtcDateTimeOffset(hoursOffset)
: dateRange.To.ToUtcDateTimeOffset(hoursOffset);
var endUTC = ltDate?.ToUtcDateTimeOffset(hoursOffset)
?? dateRange?.To.ToUtcDateTimeOffset(hoursOffset);
var request = new DetectedOperationRequest
{