Вернул пользователя для авто определённых операций

This commit is contained in:
Степанов Дмитрий 2024-02-20 13:01:13 +03:00
parent 53715dfaaa
commit 3e84b1591f
9 changed files with 21 additions and 9480 deletions

View File

@ -31,6 +31,11 @@ public class DetectedOperationDto: IId
[Required] [Required]
public int IdUserAtStart { get; set; } public int IdUserAtStart { get; set; }
/// <summary>
/// Пользователь панели оператора
/// </summary>
public string? TelemetryUserName { get; set; }
/// <summary> /// <summary>
/// Дата завершения операции в часовом поясе скважины /// Дата завершения операции в часовом поясе скважины
/// </summary> /// </summary>

View File

@ -14,6 +14,11 @@ namespace AsbCloudApp.Data.SAUB
[Required] [Required]
public DateTime DateTime { get; set; } public DateTime DateTime { get; set; }
/// <summary>
/// Пользователь САУБ
/// </summary>
public int? IdUser { get; set; }
/// <summary> /// <summary>
/// Режим работы САУБ: /// Режим работы САУБ:
/// 0 - "РУЧНОЙ" /// 0 - "РУЧНОЙ"

View File

@ -1,27 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace AsbCloudDb.Migrations
{
public partial class DetectedOperateion_Remove_IdUser : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "id_user",
table: "t_detected_operation");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<int>(
name: "id_user",
table: "t_detected_operation",
type: "integer",
nullable: false,
defaultValue: 0,
comment: "Id пользователя по телеметрии на момент начала операции");
}
}
}

View File

@ -532,6 +532,11 @@ namespace AsbCloudDb.Migrations
.HasColumnType("integer") .HasColumnType("integer")
.HasColumnName("id_telemetry"); .HasColumnName("id_telemetry");
b.Property<int>("IdUsersAtStart")
.HasColumnType("integer")
.HasColumnName("id_user")
.HasComment("Id пользователя по телеметрии на момент начала операции");
b.Property<double>("Value") b.Property<double>("Value")
.HasColumnType("double precision") .HasColumnType("double precision")
.HasColumnName("value") .HasColumnName("value")

View File

@ -26,6 +26,9 @@ namespace AsbCloudDb.Model
[Column("date_end", TypeName = "timestamp with time zone"), Comment("Дата начала операции")] [Column("date_end", TypeName = "timestamp with time zone"), Comment("Дата начала операции")]
public DateTimeOffset DateEnd { get; set; } public DateTimeOffset DateEnd { get; set; }
[Column("id_user"), Comment("Id пользователя по телеметрии на момент начала операции")]
public int IdUsersAtStart { get; set; }
[NotMapped] [NotMapped]
public double DurationMinutes => (DateEnd - DateStart).TotalMinutes; public double DurationMinutes => (DateEnd - DateStart).TotalMinutes;

View File

@ -6,6 +6,7 @@ public class DetectableTelemetry
{ {
public DateTimeOffset DateTime { get; set; } public DateTimeOffset DateTime { get; set; }
public int Mode { get; set; } public int Mode { get; set; }
public int? IdUser { get; set; }
public float WellDepth { get; set; } public float WellDepth { get; set; }
public float Pressure { get; set; } public float Pressure { get; set; }
public float HookWeight { get; set; } public float HookWeight { get; set; }

View File

@ -156,6 +156,7 @@ public class DetectedOperationService : IDetectedOperationService
.Select(t => new DetectableTelemetry .Select(t => new DetectableTelemetry
{ {
DateTime = t.DateTime, DateTime = t.DateTime,
IdUser = t.IdUser,
Mode = t.Mode, Mode = t.Mode,
WellDepth = t.WellDepth, WellDepth = t.WellDepth,
Pressure = t.Pressure, Pressure = t.Pressure,

View File

@ -119,6 +119,7 @@ namespace AsbCloudInfrastructure.Services.DetectOperations.Detectors
{ {
IdCategory = IdCategory, IdCategory = IdCategory,
IdTelemetry = idTelemetry, IdTelemetry = idTelemetry,
IdUserAtStart = pBegin.IdUser ?? -1,
DateStart = pBegin.DateTime, DateStart = pBegin.DateTime,
DateEnd = pEnd.DateTime, DateEnd = pEnd.DateTime,
DepthStart = (double)pBegin.WellDepth, DepthStart = (double)pBegin.WellDepth,