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

nit fixes

Browse Source
This commit is contained in:
ngfrolov 2024-02-14 13:43:19 +05:00
parent 08e0a4fb38
commit 5eede46b31
Signed by: ng.frolov
GPG Key ID: E99907A0357B29A7
2 changed files with 299 additions and 315 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AsbCloudApp/Data/ProcessMaps/Report/ProcessMapReportDataSaubStatDto.cs
View File

@ -84,7 +84,7 @@ public class ProcessMapReportDataSaubStatDto
/// <summary> /// <summary>
/// Обороты ВСП, об/мин /// Обороты ВСП, об/мин
/// </summary> /// </summary>
public ProcessMapReportDataSaubStatParamsDto Turnover { get; set; } = new(); public ProcessMapReportDataSaubStatParamsDto TopDriveSpeed { get; set; } = new();
/// <summary> /// <summary>
/// Расход, л/с /// Расход, л/с

26
AsbCloudInfrastructure/Services/ProcessMaps/Report/ProcessMapReportDataSaubStatService.cs
View File

@ -14,10 +14,10 @@ using System.Linq;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace AsbCloudInfrastructure.Services.ProcessMaps.Report namespace AsbCloudInfrastructure.Services.ProcessMaps.Report;
public class ProcessMapReportDataSaubStatService : IProcessMapReportDataSaubStatService
{ {
public class ProcessMapReportDataSaubStatService : IProcessMapReportDataSaubStatService
{
private readonly IWellService wellService; private readonly IWellService wellService;
private readonly IChangeLogRepository<ProcessMapPlanDrillingDto, ProcessMapPlanBaseRequestWithWell> processMapPlanBaseRepository; private readonly IChangeLogRepository<ProcessMapPlanDrillingDto, ProcessMapPlanBaseRequestWithWell> processMapPlanBaseRepository;
private readonly IDataSaubStatRepository dataSaubStatRepository; private readonly IDataSaubStatRepository dataSaubStatRepository;
@ -150,7 +150,7 @@ namespace AsbCloudInfrastructure.Services.ProcessMaps.Report
return list; return list;
} }
private bool IsModeMatchOperationCategory(int idMode, int idCategory) private static bool IsModeMatchOperationCategory(int idMode, int idCategory)
{ {
return (idMode == 1 && idCategory == 5003) || (idMode == 2 && idCategory == 5002); return (idMode == 1 && idCategory == 5003) || (idMode == 2 && idCategory == 5002);
} }
@ -167,7 +167,6 @@ namespace AsbCloudInfrastructure.Services.ProcessMaps.Report
var deltaDepth = lastElemInInterval.DepthEnd - firstElemInInterval.DepthStart; var deltaDepth = lastElemInInterval.DepthEnd - firstElemInInterval.DepthStart;
var aggregatedValues = CalcAggregate(span); var aggregatedValues = CalcAggregate(span);
return new ProcessMapReportDataSaubStatDto() return new ProcessMapReportDataSaubStatDto()
@ -211,7 +210,7 @@ namespace AsbCloudInfrastructure.Services.ProcessMaps.Report
FactWavg = deltaDepth / aggregatedValues.DrilledTime, FactWavg = deltaDepth / aggregatedValues.DrilledTime,
SetpointUsage = aggregatedValues.SetpointUsageRopPlan SetpointUsage = aggregatedValues.SetpointUsageRopPlan
}, },
Turnover = new ProcessMapReportDataSaubStatParamsDto TopDriveSpeed = new ProcessMapReportDataSaubStatParamsDto
{ {
SetpointPlan = processMapPlanFilteredByDepth?.TopDriveSpeedPlan, SetpointPlan = processMapPlanFilteredByDepth?.TopDriveSpeedPlan,
FactWavg = aggregatedValues.RotorSpeed, FactWavg = aggregatedValues.RotorSpeed,
@ -313,20 +312,6 @@ namespace AsbCloudInfrastructure.Services.ProcessMaps.Report
); );
} }
private double CalcRopPlan(ProcessMapPlanDrillingDto[] processMapPlanFilteredByDepth)
{
var sumRopPlan = 0.0;
var diffDepthTotal = 0.0;
for (var i = 0; i < processMapPlanFilteredByDepth.Length; i++)
{
var diffDepth = processMapPlanFilteredByDepth[i].DepthEnd - processMapPlanFilteredByDepth[i].DepthStart;
sumRopPlan += diffDepth * processMapPlanFilteredByDepth[i].RopPlan;
diffDepthTotal += diffDepth;
}
return sumRopPlan / diffDepthTotal;
}
private bool IsNewInterval(DataSaubStatDto currentElem, DataSaubStatDto firstElem, DataSaubStatRequest request) private bool IsNewInterval(DataSaubStatDto currentElem, DataSaubStatDto firstElem, DataSaubStatRequest request)
{ {
bool isNewElemBySpeed(double currentSpeed, double firstSpeed) bool isNewElemBySpeed(double currentSpeed, double firstSpeed)
@ -352,5 +337,4 @@ namespace AsbCloudInfrastructure.Services.ProcessMaps.Report
|| (isNewElemBySpeed(currentElem.Speed, firstElem.Speed)); || (isNewElemBySpeed(currentElem.Speed, firstElem.Speed));
return isNewElem; return isNewElem;
} }
}
} }