forked from ddrilling/AsbCloudServer
ProcessMapReportDataSaubStatService apply compiller recommendations
This commit is contained in:
parent
53af712750
commit
c19defe529
@ -89,7 +89,7 @@ public class ProcessMapReportDataSaubStatService : IProcessMapReportDataSaubStat
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
private IEnumerable<ProcessMapReportDataSaubStatDto> CalcByIntervals(
|
private static IEnumerable<ProcessMapReportDataSaubStatDto> CalcByIntervals(
|
||||||
DataSaubStatRequest request,
|
DataSaubStatRequest request,
|
||||||
IEnumerable<ProcessMapPlanDrillingDto> processMapPlanWellDrillings,
|
IEnumerable<ProcessMapPlanDrillingDto> processMapPlanWellDrillings,
|
||||||
Span<DataSaubStatDto> dataSaubStats,
|
Span<DataSaubStatDto> dataSaubStats,
|
||||||
@ -157,7 +157,7 @@ public class ProcessMapReportDataSaubStatService : IProcessMapReportDataSaubStat
|
|||||||
return (idMode == 1 && idCategory == 5003) || (idMode == 2 && idCategory == 5002);
|
return (idMode == 1 && idCategory == 5003) || (idMode == 2 && idCategory == 5002);
|
||||||
}
|
}
|
||||||
|
|
||||||
private ProcessMapReportDataSaubStatDto? CalcStat(
|
private static ProcessMapReportDataSaubStatDto? CalcStat(
|
||||||
ProcessMapPlanDrillingDto? processMapPlanFilteredByDepth,
|
ProcessMapPlanDrillingDto? processMapPlanFilteredByDepth,
|
||||||
Span<DataSaubStatDto> span,
|
Span<DataSaubStatDto> span,
|
||||||
string wellOperationCategoryName,
|
string wellOperationCategoryName,
|
||||||
@ -232,7 +232,7 @@ public class ProcessMapReportDataSaubStatService : IProcessMapReportDataSaubStat
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
private (
|
private static (
|
||||||
double Pressure,
|
double Pressure,
|
||||||
double AxialLoadSp,
|
double AxialLoadSp,
|
||||||
double AxialLoad,
|
double AxialLoad,
|
||||||
@ -314,9 +314,9 @@ public class ProcessMapReportDataSaubStatService : IProcessMapReportDataSaubStat
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
private bool IsNewInterval(DataSaubStatDto currentElem, DataSaubStatDto firstElem, DataSaubStatRequest request)
|
private static bool IsNewInterval(DataSaubStatDto currentElem, DataSaubStatDto firstElem, DataSaubStatRequest request)
|
||||||
{
|
{
|
||||||
bool isNewElemBySpeed(double currentSpeed, double firstSpeed)
|
static bool IsNewElemBySpeed(double currentSpeed, double firstSpeed)
|
||||||
{
|
{
|
||||||
//2. Изменение уставки скорости подачи от первого значения в начале интервала при условии:
|
//2. Изменение уставки скорости подачи от первого значения в начале интервала при условии:
|
||||||
//скорость > 80 м/ч => изменение уставки на ± 20 м/ч;
|
//скорость > 80 м/ч => изменение уставки на ± 20 м/ч;
|
||||||
@ -336,7 +336,7 @@ public class ProcessMapReportDataSaubStatService : IProcessMapReportDataSaubStat
|
|||||||
|| (Math.Abs(currentElem.RotorTorque - firstElem.RotorTorque) >= request.DeltaRotorTorque)
|
|| (Math.Abs(currentElem.RotorTorque - firstElem.RotorTorque) >= request.DeltaRotorTorque)
|
||||||
|| (Math.Abs((currentElem.AxialLoadSp ?? 0) - (firstElem.AxialLoadSp ?? 0)) >= request.DeltaAxialLoadSp)
|
|| (Math.Abs((currentElem.AxialLoadSp ?? 0) - (firstElem.AxialLoadSp ?? 0)) >= request.DeltaAxialLoadSp)
|
||||||
|| (Math.Abs((currentElem.RotorTorqueSp ?? 0) - (firstElem.RotorTorqueSp ?? 0)) >= request.DeltaRotorTorqueSp)
|
|| (Math.Abs((currentElem.RotorTorqueSp ?? 0) - (firstElem.RotorTorqueSp ?? 0)) >= request.DeltaRotorTorqueSp)
|
||||||
|| (isNewElemBySpeed(currentElem.Speed, firstElem.Speed));
|
|| (IsNewElemBySpeed(currentElem.Speed, firstElem.Speed));
|
||||||
return isNewElem;
|
return isNewElem;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user