корректировка логики определения наработок Спин

This commit is contained in:
eugeniy_ivanov 2022-10-06 14:43:43 +05:00
parent e8789df59e
commit 7b900c1f9d

View File

@ -215,7 +215,7 @@ namespace AsbCloudInfrastructure.Services.Subsystems
private static async Task<IEnumerable<SubsystemOperationTime>?> OperationTimeSpinAsync(int idTelemetry, DateTimeOffset begin, IAsbCloudDbContext db, CancellationToken token) private static async Task<IEnumerable<SubsystemOperationTime>?> OperationTimeSpinAsync(int idTelemetry, DateTimeOffset begin, IAsbCloudDbContext db, CancellationToken token)
{ {
static int? GetSubsytemId(short mode, int state) static int? GetSubsytemId(short? mode, int? state)
{ {
if (state == 7 && (mode & 2) > 0) if (state == 7 && (mode & 2) > 0)
return idSubsytemTorqueMaster; return idSubsytemTorqueMaster;
@ -225,13 +225,22 @@ namespace AsbCloudInfrastructure.Services.Subsystems
return null; return null;
} }
static float GetDepthFromSaub(List<DataRow> rowsSaub, DateTimeOffset date)
{
float depth = 0;
for (int i = 0; i < rowsSaub.Count; i++)
{
if (date <= rowsSaub[i].Date)
depth = (float)rowsSaub[i].Depth;
}
return depth;
}
var query = var querySpin =
$"select " + $"select " +
$" tspin.date, " + $" tspin.date, " +
$" tspin.mode, " + $" tspin.mode, " +
$" tspin.state, " + $" tspin.state " +
$" tsaub.well_depth " +
$"from ( " + $"from ( " +
$" select " + $" select " +
$" date, " + $" date, " +
@ -241,42 +250,50 @@ namespace AsbCloudInfrastructure.Services.Subsystems
$" lag(state, 1) over (order by date) as state_pre " + $" lag(state, 1) over (order by date) as state_pre " +
$" from t_telemetry_data_spin " + $" from t_telemetry_data_spin " +
$" where id_telemetry = @idTelemetry and date >= @begin" + $" where id_telemetry = @idTelemetry and date >= @begin" +
$" order by date ) as tspin " + $" order by date ) as tspin " +
$"left outer join ( " +
$" select " +
$" date, " +
$" well_depth " +
$" from t_telemetry_data_saub " +
$" where id_telemetry = @idTelemetry and date >= @begin) as tsaub " +
$"on EXTRACT(EPOCH from tspin.date) = EXTRACT(EPOCH from tsaub.date) " +
$"where mode_pre is null or state_pre is null or mode != mode_pre or state != state_pre " + $"where mode_pre is null or state_pre is null or mode != mode_pre or state != state_pre " +
$"order by date;"; $"order by date;";
var saubDepthAndDate = await db.TelemetryDataSaub.Where(s => s.IdTelemetry == idTelemetry & s.DateTime >= begin)
.Select(s => new DataRow()
{
Date = s.DateTime,
Depth = s.WellDepth
})
.OrderBy(s => s.Date)
.ToListAsync(token);
var idTelemetryParam = new NpgsqlParameter("@idTelemetry", idTelemetry); var idTelemetryParam = new NpgsqlParameter("@idTelemetry", idTelemetry);
var beginParam = new NpgsqlParameter("@begin", begin); var beginParam = new NpgsqlParameter("@begin", begin);
await db.Database.OpenConnectionAsync(token); await db.Database.OpenConnectionAsync(token);
using var command = db.Database.GetDbConnection().CreateCommand(); using var command = db.Database.GetDbConnection().CreateCommand();
command.CommandText = query; command.CommandText = querySpin;
command.Parameters.Add(idTelemetryParam); command.Parameters.Add(idTelemetryParam);
command.Parameters.Add(beginParam); command.Parameters.Add(beginParam);
using var result = await command.ExecuteReaderAsync(token); using var result = await command.ExecuteReaderAsync(token);
var subsystemOperationTime = new List<SubsystemOperationTime>(32); var subsystemOperationTime = new List<SubsystemOperationTime>(32);
var dataRowList = new List<DataRow>();
if (result.Read()) while (result.Read())
{ {
var mode = result.GetFieldValue<short>(1); var dateRowItem = new DataRow()
var state = result.GetFieldValue<int>(2);
var idSubsystem = GetSubsytemId(mode, state);
var dateStart = result.GetFieldValue<DateTimeOffset>(0);
var depthStart = result.GetFieldValue<float?>(3);
while (result.Read())
{ {
var dateEnd = result.GetFieldValue<DateTimeOffset>(0); Date = result.GetFieldValue<DateTimeOffset>(0),
var depthEnd = result.GetFieldValue<float?>(3); Mode = result.GetFieldValue<short?>(1),
State = result.GetFieldValue<short?>(2)
};
dateRowItem.Depth = GetDepthFromSaub(saubDepthAndDate, dateRowItem.Date);
dataRowList.Add(dateRowItem);
}
if (dataRowList.Any()==true)
{
var mode = dataRowList[0].Mode;
var state = dataRowList[0].State;
var idSubsystem = GetSubsytemId(mode, state);
var dateStart = dataRowList[0].Date;
var depthStart = dataRowList[0].Depth;
for (int i = 1; i<dataRowList.Count;i++)
{
var dateEnd = dataRowList[1].Date;
var depthEnd = dataRowList[1].Depth;
if (idSubsystem.HasValue) if (idSubsystem.HasValue)
{ {
var operationTimeItem = new SubsystemOperationTime() var operationTimeItem = new SubsystemOperationTime()
@ -290,12 +307,12 @@ namespace AsbCloudInfrastructure.Services.Subsystems
}; };
subsystemOperationTime.Add(operationTimeItem); subsystemOperationTime.Add(operationTimeItem);
} }
mode = result.GetFieldValue<short>(1); mode = dataRowList[i].Mode;
state = result.GetFieldValue<int>(2); state = dataRowList[i].State;
idSubsystem = GetSubsytemId(mode, state); idSubsystem = GetSubsytemId(mode, state);
dateStart = dateEnd; dateStart = dateEnd;
depthStart = depthEnd; depthStart = depthEnd;
} }
} }
return subsystemOperationTime; return subsystemOperationTime;
} }