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

refactor DailyReportService.MakeTimeBalanceAsync(..);

Browse Source 
fix naming;
This commit is contained in:
ngfrolov 2022-08-10 13:44:35 +05:00
parent 12e70cb7c0
commit 25f5700814
2 changed files with 39 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
AsbCloudInfrastructure/Services/DailyReport/DailyReportService.cs
View File

@ -114,12 +114,7 @@ namespace AsbCloudInfrastructure.Services.DailyReport
private async Task<DailyReportDto> MakeDefaultDailyReportAsync(int idWell, DateTime date, CancellationToken token) private async Task<DailyReportDto> MakeDefaultDailyReportAsync(int idWell, DateTime date, CancellationToken token)
{ {
var well = await wellService.GetOrDefaultAsync(idWell, token); var well = await wellService.GetOrDefaultAsync(idWell, token);
var detectedOperations = await detectedOperationService.GetOperationsStatAsync(new DetectedOperationRequest
{
IdWell = idWell,
GtDate = date.Date,
LtDate = date.Date.AddDays(1)
}, token);
var dto = new DailyReportDto() var dto = new DailyReportDto()
{ {
Head = new HeadDto() Head = new HeadDto()
@ -128,34 +123,46 @@ namespace AsbCloudInfrastructure.Services.DailyReport
WellName = well?.Caption ?? "", WellName = well?.Caption ?? "",
ClusterName = well?.Cluster ?? "", ClusterName = well?.Cluster ?? "",
}, },
TimeBalance = detectedOperations is null ? new TimeBalanceDto() { } : GetTimeBalanceDto(detectedOperations), TimeBalance = await MakeTimeBalanceAsync(idWell, date, token),
}; };
return dto; return dto;
} }
private TimeBalanceDto GetTimeBalanceDto(IEnumerable<DetectedOperationStatDto> stat) private async Task<TimeBalanceDto> MakeTimeBalanceAsync(int idWell, DateTime date, CancellationToken token)
{ {
var dto = stat is null ? new TimeBalanceDto() { } : new TimeBalanceDto() var stat = await detectedOperationService.GetOperationsStatAsync(new DetectedOperationRequest
{ {
Drilling = $"{FormatOperationValue(stat.FirstOrDefault(x => x.IdCategory == DetectedOperationService.IdOperationRotor)) + FormatOperationValue(stat.FirstOrDefault(x => x.IdCategory == DetectedOperationService.IdOperationSlide))}", IdWell = idWell,
Flushing = FormatOperationValue(stat.FirstOrDefault(x => x.IdCategory == DetectedOperationService.idOperationFlushing)).ToString(), GtDate = date.Date,
Building = FormatOperationValue(stat.FirstOrDefault(x => x.IdCategory == DetectedOperationService.IdOperationSlipsTime)).ToString(), LtDate = date.Date.AddDays(1)
Elaboration = FormatOperationValue(stat.FirstOrDefault(x => x.IdCategory == DetectedOperationService.idOperationElaboration)).ToString(), }, token);
ElaborationBeforeBuilding = FormatOperationValue(stat.FirstOrDefault(x => x.IdCategory == DetectedOperationService.idOperationElaborationBeforeBuilding)).ToString(),
TemplatingBeforeBuilding = FormatOperationValue(stat.FirstOrDefault(x => x.IdCategory == DetectedOperationService.idOperationTemplatingBeforeBuilding)).ToString(), if (stat is null)
FlushingBeforeBuilding = FormatOperationValue(stat.FirstOrDefault(x => x.IdCategory == DetectedOperationService.idOperationFlushingBeforeBuilding)).ToString(), return new TimeBalanceDto();
StaticSurveying = FormatOperationValue(stat.FirstOrDefault(x => x.IdCategory == DetectedOperationService.idOperationStaticSurveying)).ToString(),
Gis = FormatOperationValue(stat.FirstOrDefault(x => x.IdCategory == DetectedOperationService.idOperationGis)).ToString(), var dto = new TimeBalanceDto()
Ozc = FormatOperationValue(stat.FirstOrDefault(x => x.IdCategory == DetectedOperationService.idOperationOzc)).ToString(), {
Cementing = FormatOperationValue(stat.FirstOrDefault(x => x.IdCategory == DetectedOperationService.idOperationCementing)).ToString(), Drilling = $"{GetHoursFromStat(stat, DetectedOperationService.IdOperationRotor, DetectedOperationService.IdOperationSlide):#0.00}",
Npv = FormatOperationValue(stat.FirstOrDefault(x => x.IdCategory == DetectedOperationService.idOperationNpv)).ToString(), Flushing = $"{GetHoursFromStat(stat, DetectedOperationService.idOperationFlushing):#0.00}",
Building = $"{GetHoursFromStat(stat, DetectedOperationService.IdOperationSlipsTime):#0.00}",
Elaboration = $"{GetHoursFromStat(stat, DetectedOperationService.IdOperationElaboration):#0.00}",
ElaborationBeforeBuilding = $"{GetHoursFromStat(stat, DetectedOperationService.IdOperationElaborationBeforeBuilding):#0.00}",
TemplatingBeforeBuilding = $"{GetHoursFromStat(stat, DetectedOperationService.IdOperationTemplatingBeforeBuilding):#0.00}",
FlushingBeforeBuilding = $"{GetHoursFromStat(stat, DetectedOperationService.IdOperationFlushingBeforeBuilding):#0.00}",
StaticSurveying = $"{GetHoursFromStat(stat, DetectedOperationService.IdOperationStaticSurveying):#0.00}",
Gis = $"{GetHoursFromStat(stat, DetectedOperationService.IdOperationGis):#0.00}",
Ozc = $"{GetHoursFromStat(stat, DetectedOperationService.IdOperationOzc):#0.00}",
Cementing = $"{GetHoursFromStat(stat, DetectedOperationService.IdOperationCementing):#0.00}",
Npv = $"{GetHoursFromStat(stat, DetectedOperationService.IdOperationNpv):#0.00}",
}; };
return dto; return dto;
} }
private double FormatOperationValue(DetectedOperationStatDto? operationStat) private static double GetHoursFromStat(IEnumerable<DetectedOperationStatDto> stat, params int[] idCategories)
{ {
return operationStat is not null ? Math.Round(operationStat.MinutesTotal / 60, 2) : 0; var valueMinutes = stat.Where(o => idCategories.Contains(o.IdCategory))
.Sum(o => o.MinutesTotal);
return valueMinutes / 60d;
} }
private static DailyReportDto Convert(AsbCloudDb.Model.DailyReport.DailyReport entity) private static DailyReportDto Convert(AsbCloudDb.Model.DailyReport.DailyReport entity)

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

@ -22,18 +22,18 @@ namespace AsbCloudInfrastructure.Services.DetectOperations
public const int IdOperationSlide = 3; public const int IdOperationSlide = 3;
public const int IdOperationSlipsTime = 14; public const int IdOperationSlipsTime = 14;
public const int idOperationFlushing = 22; public const int idOperationFlushing = 22;
public const int idOperationElaboration = 1022; public const int IdOperationElaboration = 1022;
public const int idOperationRepair = 1031; public const int idOperationRepair = 1031;
public const int idOperationGis = 1001; public const int IdOperationGis = 1001;
public const int idOperationOzc = 1008; public const int IdOperationOzc = 1008;
public const int idOperationCementing = 1040; public const int IdOperationCementing = 1040;
public const int idOperationNpv = 1043; public const int IdOperationNpv = 1043;
public const int idOperationElaborationBeforeBuilding = 18; public const int IdOperationElaborationBeforeBuilding = 18;
public const int idOperationTemplatingBeforeBuilding = 19; public const int IdOperationTemplatingBeforeBuilding = 19;
public const int idOperationFlushingBeforeBuilding = 20; public const int IdOperationFlushingBeforeBuilding = 20;
public const int idOperationStaticSurveying = 21; public const int IdOperationStaticSurveying = 21;
private readonly IAsbCloudDbContext db; private readonly IAsbCloudDbContext db;
private readonly IWellService wellService; private readonly IWellService wellService;