Add Mse to telemetryDataSaub

AsbCloudApp/Data/TelemetryDataSaubDto.cs

@@ -141,5 +141,7 @@ namespace AsbCloudApp.Data
         /// Текущее состояние работы MSE
         /// </summary>
         public short? MseState { get; set; }
+
+        public float? Mse { get; set; }
     }
 }

AsbCloudDb/Migrations/20220310113607_Add_Mse_to_dataSaub.cs

@@ -0,0 +1,56 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace AsbCloudDb.Migrations
+{
+    public partial class Add_Mse_to_dataSaub : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DeleteData(
+                table: "t_relation_user_user_role",
+                keyColumns: new[] { "id_user", "id_user_role" },
+                keyValues: new object[] { 1, 2 });
+
+            migrationBuilder.AddColumn<float>(
+                name: "mse",
+                table: "t_telemetry_data_saub",
+                type: "real",
+                nullable: true,
+                comment: "MSE");
+
+            migrationBuilder.AlterColumn<int>(
+                name: "id_mark_type",
+                table: "t_file_mark",
+                type: "integer",
+                nullable: false,
+                comment: "0 - отклонен, 1 - согласован",
+                oldClrType: typeof(int),
+                oldType: "integer",
+                oldComment: "0 - Согласован");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "mse",
+                table: "t_telemetry_data_saub");
+
+            migrationBuilder.AlterColumn<int>(
+                name: "id_mark_type",
+                table: "t_file_mark",
+                type: "integer",
+                nullable: false,
+                comment: "0 - Согласован",
+                oldClrType: typeof(int),
+                oldType: "integer",
+                oldComment: "0 - отклонен, 1 - согласован");
+
+            migrationBuilder.InsertData(
+                table: "t_relation_user_user_role",
+                columns: new[] { "id_user", "id_user_role" },
+                values: new object[] { 1, 2 });
+        }
+    }
+}

AsbCloudDb/Migrations/AsbCloudDbContextModelSnapshot.cs

@@ -638,7 +638,7 @@ namespace AsbCloudDb.Migrations
                     b.Property<int>("IdMarkType")
                         .HasColumnType("integer")
                         .HasColumnName("id_mark_type")
-                        .HasComment("0 - Согласован");
+                        .HasComment("0 - отклонен, 1 - согласован");
 
                     b.Property<int>("IdUser")
                         .HasColumnType("integer")
@@ -1393,7 +1393,7 @@ namespace AsbCloudDb.Migrations
                         .HasColumnType("integer")
                         .HasColumnName("id_drilling_program_part");
 
-                    b.Property<int>("IdDrillingProgramPartRole")
+                    b.Property<int>("IdUserRole")
                         .HasColumnType("integer")
                         .HasColumnName("id_role")
                         .HasComment("1 - publisher, 2 - approver");
@@ -2303,7 +2303,7 @@ namespace AsbCloudDb.Migrations
                         new
                         {
                             IdUser = 1,
-                            IdUserRole = 2
+                            IdUserRole = 1
                         });
                 });
 
@@ -2677,6 +2677,11 @@ namespace AsbCloudDb.Migrations
                         .HasColumnName("mode")
                         .HasComment("Режим САУБ");
 
+                    b.Property<float?>("Mse")
+                        .HasColumnType("real")
+                        .HasColumnName("mse")
+                        .HasComment("MSE");
+
                     b.Property<short?>("MseState")
                         .HasColumnType("smallint")
                         .HasColumnName("mse_state")

AsbCloudDb/Model/TelemetryDataSaub.cs

@@ -1,6 +1,5 @@
 using Microsoft.EntityFrameworkCore;
 using System;
-using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Text.Json.Serialization;
 
@@ -125,6 +124,8 @@ namespace AsbCloudDb.Model
         [Column("flow_delta_limit_max"), Comment("Расход. Аварийный макс.")]
         public float? FlowDeltaLimitMax { get; set; }
 
+        [Column("mse"), Comment("MSE")]
+        public float? Mse { get; set; }
 
         [JsonIgnore]
         [ForeignKey(nameof(IdTelemetry))]

AsbCloudDb/Readme.md

@@ -32,7 +32,7 @@ dotnet ef migrations remove <MigrationName> --project AsbCloudDb
 ## Backup
 Terminal:
 ```
-sudo -u postgres pg_dump -Fc -U postgres postgres -W > dump_2021-11-26.bak
+sudo -u postgres pg_dump -Fc -U postgres postgres -W > dump_2022-03-09.bak
 ```
  
 ## Restore backup

AsbCloudWebApi/ProtobufModel.cs

@@ -127,7 +127,8 @@ namespace AsbCloudWebApi
                 .Add(35, nameof(TelemetryDataSaubDto.FlowIdle))
                 .Add(36, nameof(TelemetryDataSaubDto.FlowDeltaLimitMax))
                 .Add(37, nameof(TelemetryDataSaubDto.IdFeedRegulator))
-                .Add(38, nameof(TelemetryDataSaubDto.MseState));
+                .Add(38, nameof(TelemetryDataSaubDto.MseState))
+                .Add(39, nameof(TelemetryDataSaubDto.Mse));
         }
     }
 }