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

Получение телеметрии расхода БН

Browse Source
This commit is contained in:
ai.astrakhantsev 2023-04-14 11:47:49 +05:00
parent cea14deddc
commit 8b271da299
7 changed files with 7985 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
AsbCloudApp/Data/SAUB/TelemetryDataSaubDto.cs
View File

@ -1,4 +1,7 @@
using System;
using System.ComponentModel.DataAnnotations.Schema;
using System.Text.Json.Serialization;
namespace AsbCloudApp.Data.SAUB
{
/// <summary>
@ -217,5 +220,20 @@ namespace AsbCloudApp.Data.SAUB
/// MSE
/// </summary>
public float? Mse { get; set; }
/// <summary>
/// РасходБН. Насос 1
/// </summary>
public float? Pump0Flow { get; set; }
/// <summary>
/// РасходБН. Насос 2
/// </summary>
public float? Pump1Flow { get; set; }
/// <summary>
/// РасходБН. Насос 3
/// </summary>
public float? Pump2Flow { get; set; }
}
}

7836
AsbCloudDb/Migrations/20230414033303_UpdateTable_t_telemetry_data_saub.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

45
AsbCloudDb/Migrations/20230414033303_UpdateTable_t_telemetry_data_saub.cs Normal file
View File

@ -0,0 +1,45 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace AsbCloudDb.Migrations
{
public partial class UpdateTable_t_telemetry_data_saub : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<float>(
name: "pump0Flow",
table: "t_telemetry_data_saub",
type: "real",
nullable: true);
migrationBuilder.AddColumn<float>(
name: "pump1Flow",
table: "t_telemetry_data_saub",
type: "real",
nullable: true);
migrationBuilder.AddColumn<float>(
name: "pump2Flow",
table: "t_telemetry_data_saub",
type: "real",
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "pump0Flow",
table: "t_telemetry_data_saub");
migrationBuilder.DropColumn(
name: "pump1Flow",
table: "t_telemetry_data_saub");
migrationBuilder.DropColumn(
name: "pump2Flow",
table: "t_telemetry_data_saub");
}
}
}

12
AsbCloudDb/Migrations/AsbCloudDbContextModelSnapshot.cs
View File

@ -4123,6 +4123,18 @@ namespace AsbCloudDb.Migrations
.HasColumnName("pressure_sp_slide")
.HasComment("Давление. Задание для режима слайда");
b.Property<float?>("Pump0Flow")
.HasColumnType("real")
.HasColumnName("pump0Flow");
b.Property<float?>("Pump1Flow")
.HasColumnType("real")
.HasColumnName("pump1Flow");
b.Property<float?>("Pump2Flow")
.HasColumnType("real")
.HasColumnName("pump2Flow");
b.Property<float?>("RotorSpeed")
.HasColumnType("real")
.HasColumnName("rotor_speed")

9
AsbCloudDb/Model/TelemetryDataSaub.cs
View File

@ -125,6 +125,15 @@ namespace AsbCloudDb.Model
[Column("mse"), Comment("MSE")]
public float? Mse { get; set; }
[Column("pump0Flow"), JsonPropertyName("РасходБН. Насос 1")]
public float? Pump0Flow { get; set; }
[Column("pump1Flow"), JsonPropertyName("РасходБН. Насос 2")]
public float? Pump1Flow { get; set; }
[Column("pump2Flow"), JsonPropertyName("РасходБН. Насос 3")]
public float? Pump2Flow { get; set; }
[JsonIgnore]
[ForeignKey(nameof(IdTelemetry))]
[InverseProperty(nameof(Model.Telemetry.DataSaub))]

5
AsbCloudWebApi/ProtobufModel.cs
View File

@ -366,7 +366,10 @@ namespace AsbCloudWebApi
.Add(36, nameof(TelemetryDataSaubDto.FlowDeltaLimitMax))
.Add(37, nameof(TelemetryDataSaubDto.IdFeedRegulator))
.Add(38, nameof(TelemetryDataSaubDto.MseState))
.Add(39, nameof(TelemetryDataSaubDto.Mse));
.Add(39, nameof(TelemetryDataSaubDto.Mse))
.Add(40, nameof(TelemetryDataSaubDto.Pump0Flow))
.Add(41, nameof(TelemetryDataSaubDto.Pump1Flow))
.Add(42, nameof(TelemetryDataSaubDto.Pump2Flow));
}
}
}

61
AsbCloudWebApi/Rest/TelemetryDataSaub.http Normal file
View File

@ -0,0 +1,61 @@
@baseUrl = http://127.0.0.1:5000
@contentType = application/json
@auth = Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCIsImN0eSI6IkpXVCJ9.eyJpZCI6IjEiLCJodHRwOi8vc2NoZW1hcy54bWxzb2FwLm9yZy93cy8yMDA1LzA1L2lkZW50aXR5L2NsYWltcy9uYW1lIjoiZGV2IiwiaWRDb21wYW55IjoiMSIsImh0dHA6Ly9zY2hlbWFzLm1pY3Jvc29mdC5jb20vd3MvMjAwOC8wNi9pZGVudGl0eS9jbGFpbXMvcm9sZSI6InJvb3QiLCJuYmYiOjE2NjI1NDgxNjIsImV4cCI6MTY5NDEwNTc2MiwiaXNzIjoiYSIsImF1ZCI6ImEifQ.OEAlNzxi7Jat6pzDBTAjTbChskc-tdJthJexyWwwUKE
@uid = 20210917_165407777
# https://marketplace.visualstudio.com/items?itemName=humao.rest-client
###
POST {{baseUrl}}/api/TelemetryDataSaub/{{uid}}
Content-Type: {{contentType}}
accept: */*
Authorization: {{auth}}
[
{
"idTelemetry": 8,
"dateTime": "2022-07-18T14:53:17",
"mode": 10,
"user": null,
"wellDepth": 0,
"bitDepth": 0,
"blockPosition": 5,
"blockPositionMin": 1.5,
"blockPositionMax": 0,
"blockSpeed": 0,
"blockSpeedSp": 50,
"blockSpeedSpRotor": 100,
"blockSpeedSpSlide": 50,
"blockSpeedSpDevelop": 100,
"pressure": 0,
"pressureIdle": 0,
"pressureSp": 18,
"pressureSpRotor": 28,
"pressureSpSlide": 18,
"pressureSpDevelop": 15,
"pressureDeltaLimitMax": 50,
"axialLoad": 0,
"axialLoadSp": 8,
"axialLoadLimitMax": 15,
"hookWeight": 0,
"hookWeightIdle": 0,
"hookWeightLimitMin": 0,
"hookWeightLimitMax": 0,
"rotorTorque": 0,
"rotorTorqueIdle": 0,
"rotorTorqueSp": 20,
"rotorTorqueLimitMax": 32,
"rotorSpeed": 0,
"flow": 0,
"flowIdle": 0,
"flowDeltaLimitMax": 3,
"idFeedRegulator": 0,
"mseState": 32,
"mse": 0,
"pump0Flow": 213.12,
"pump1Flow": 234.33,
"pump2Flow": 215.36,
"date": "2022-07-18T14:53:17"
}
]