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

рефакторинг

Browse Source
This commit is contained in:
eugeniy_ivanov 2022-11-03 00:01:44 +05:00
parent 0880c3b75c
commit 494fd2a107
2 changed files with 56 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AsbCloudApp/Data/Subsystems/SubsystemActiveWellStatDto.cs
View File

@ -8,9 +8,9 @@ namespace AsbCloudApp.Data.Subsystems
public class SubsystemActiveWellStatDto
{
/// <summary>
/// Идентификатор скважины
/// Активная скважина
/// </summary>
public int IdWell { get; set; }
public WellDto ActiveWell { get; set; }
/// <summary>
/// Наработки подсистем
/// </summary>

45
AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeService.cs
View File

@ -204,21 +204,37 @@ namespace AsbCloudInfrastructure.Services.Subsystems
{
var activeWell = await GetActiveWellByCompany(idCompany, token);
var telemetryIds = activeWell.Select(w => w.IdTelemetry).Distinct();
var firstWell = activeWell.FirstOrDefault();
if (firstWell == null)
return null;
var _well = wellService.GetOrDefault(firstWell.Id);
if (_well is null || _well.Timezone is null)
return null;
DateTimeOffset ExtractDate(DateTime dateTime)
{
var dateTimeOffset = dateTime.ToUtcDateTimeOffset(_well!.Timezone.Hours);
var date = new DateTimeOffset(dateTimeOffset.Year, dateTimeOffset.Month, dateTimeOffset.Day, 0, 0, 0, TimeSpan.Zero);
return date;
}
var query = db.SubsystemOperationTimes
.Where(o => telemetryIds.Contains(o.IdTelemetry))
.AsNoTracking();
DateTime today = DateTime.Today;
if (!gtDate.HasValue)
{
gtDate = today;
}
query = query.Where(o => o.DateStart >= gtDate.Value.ToUniversalTime());
if (!ltDate.HasValue)
if (gtDate is not null)
{
ltDate = today.AddDays(-1);
var beginUTC = ExtractDate(gtDate.Value);
query = query.Where(d => d.DateStart >= beginUTC);
}
query = query.Where(o => o.DateEnd <= ltDate.Value.ToUniversalTime());
//query = query.Where(o => o.DateStart >= DateTime.Today.ToUtcDateTimeOffset(_well.Timezone.Hours));
if (ltDate is not null)
{
var endUTC = ExtractDate(ltDate.Value);
query = query.Where(d => d.DateEnd <= endUTC);
}
//query = query.Where(o => o.DateEnd <= DateTime.Today.AddDays(-1).ToUtcDateTimeOffset(_well.Timezone.Hours));
var result = new List<SubsystemActiveWellStatDto>();
if (query is null)
{
@ -229,17 +245,19 @@ namespace AsbCloudInfrastructure.Services.Subsystems
foreach (var group in groupingSubsystemsOperationTime)
{
var idWell = activeWell.Where(w => w.IdTelemetry == group.Key).Select(w => w.Id).FirstOrDefault();
var well = activeWell.Where(w => w.IdTelemetry == group.Key).FirstOrDefault();
if (well != null)
{
var wellStat = new SubsystemActiveWellStatDto()
{
IdWell = idWell,
ActiveWell = well,
listSubsystemStat = new List<SubsystemStatDto>()
};
var detectedOperationsRequest = new DetectedOperationRequest()
{
IdWell = idWell,
IdsCategories = new List<int>() {1,3},
IdWell = well.Id,
IdsCategories = new List<int>() { 1, 3 },
LtDate = ltDate,
GtDate = gtDate,
};
@ -258,6 +276,7 @@ namespace AsbCloudInfrastructure.Services.Subsystems
result.Add(wellStat);
}
}
}
return result;
}