From cd974ebcca1e9fa9548d2ce054e0e486ba8c70ab Mon Sep 17 00:00:00 2001 From: Alek-ban Date: Wed, 4 Mar 2026 10:00:17 +0300 Subject: [PATCH] feat: update amine content calibration db --- ...mineContentCalibrationInitial.Designer.cs} | 10 +++++-- ...3084152_AmineContentCalibrationInitial.cs} | 5 ++-- ...eContentCalibrationContextModelSnapshot.cs | 8 +++-- .../Database/Calibration/CalibrationRecord.cs | 30 ++++++++++--------- .../Database/Calibration/ImageRecord.cs | 8 ++--- .../Database/Calibration/SeparatorRecord.cs | 8 +++-- ...04_AmineContentResultsInitial.Designer.cs} | 2 +- ...60303084204_AmineContentResultsInitial.cs} | 0 8 files changed, 42 insertions(+), 29 deletions(-) rename GSS2.Core/Analysis/AmineContent/Database/Calibration/{20260227093032_AmineContentCalibrationInitial.Designer.cs => 20260303084152_AmineContentCalibrationInitial.Designer.cs} (95%) rename GSS2.Core/Analysis/AmineContent/Database/Calibration/{20260227093032_AmineContentCalibrationInitial.cs => 20260303084152_AmineContentCalibrationInitial.cs} (95%) rename GSS2.Core/Analysis/AmineContent/Database/Results/{20260227093041_AmineContentResultsInitial.Designer.cs => 20260303084204_AmineContentResultsInitial.Designer.cs} (99%) rename GSS2.Core/Analysis/AmineContent/Database/Results/{20260227093041_AmineContentResultsInitial.cs => 20260303084204_AmineContentResultsInitial.cs} (100%) diff --git a/GSS2.Core/Analysis/AmineContent/Database/Calibration/20260227093032_AmineContentCalibrationInitial.Designer.cs b/GSS2.Core/Analysis/AmineContent/Database/Calibration/20260303084152_AmineContentCalibrationInitial.Designer.cs similarity index 95% rename from GSS2.Core/Analysis/AmineContent/Database/Calibration/20260227093032_AmineContentCalibrationInitial.Designer.cs rename to GSS2.Core/Analysis/AmineContent/Database/Calibration/20260303084152_AmineContentCalibrationInitial.Designer.cs index 73926da..0c5c894 100644 --- a/GSS2.Core/Analysis/AmineContent/Database/Calibration/20260227093032_AmineContentCalibrationInitial.Designer.cs +++ b/GSS2.Core/Analysis/AmineContent/Database/Calibration/20260303084152_AmineContentCalibrationInitial.Designer.cs @@ -11,7 +11,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; namespace GSS2.Core.Analysis.AmineContent.Database.Calibration { [DbContext(typeof(AmineContentCalibrationContext))] - [Migration("20260227093032_AmineContentCalibrationInitial")] + [Migration("20260303084152_AmineContentCalibrationInitial")] partial class AmineContentCalibrationInitial { /// @@ -42,9 +42,13 @@ namespace GSS2.Core.Analysis.AmineContent.Database.Calibration .HasColumnType("INTEGER") .HasComment("Уникальный идентификатор"); + b.Property("MeasuredContent") + .HasColumnType("REAL") + .HasComment("Измеренное колличество масла (кг/т | гр/кг)"); + b.Property("MixtureActualRate") .HasColumnType("REAL") - .HasComment("Фактический расход кондиционирующей смеси (кг/т)"); + .HasComment("Фактический расход кондиционирующей смеси (кг/т | гр/кг)"); b.Property("MixtureAmineContent") .HasColumnType("REAL") @@ -57,7 +61,7 @@ namespace GSS2.Core.Analysis.AmineContent.Database.Calibration b.Property("MixtureNormalRate") .HasColumnType("REAL") - .HasComment("Норма расхода кондиционирующей смеси (кг/т)"); + .HasComment("Норма расхода кондиционирующей смеси (кг/т | гр/кг)"); b.Property("SampleBrand") .HasMaxLength(512) diff --git a/GSS2.Core/Analysis/AmineContent/Database/Calibration/20260227093032_AmineContentCalibrationInitial.cs b/GSS2.Core/Analysis/AmineContent/Database/Calibration/20260303084152_AmineContentCalibrationInitial.cs similarity index 95% rename from GSS2.Core/Analysis/AmineContent/Database/Calibration/20260227093032_AmineContentCalibrationInitial.cs rename to GSS2.Core/Analysis/AmineContent/Database/Calibration/20260303084152_AmineContentCalibrationInitial.cs index 307e755..cb4f6b3 100644 --- a/GSS2.Core/Analysis/AmineContent/Database/Calibration/20260227093032_AmineContentCalibrationInitial.cs +++ b/GSS2.Core/Analysis/AmineContent/Database/Calibration/20260303084152_AmineContentCalibrationInitial.cs @@ -25,8 +25,9 @@ namespace GSS2.Core.Analysis.AmineContent.Database.Calibration SamplingPlace = table.Column(type: "TEXT", maxLength: 512, nullable: true, comment: "Место отбора пробы"), MixtureName = table.Column(type: "TEXT", maxLength: 512, nullable: true, comment: "Название используемой кондиционирующей смеси"), MixtureAmineContent = table.Column(type: "REAL", nullable: true, comment: "Содержание аминов в кондиционирующей смеси (%)"), - MixtureNormalRate = table.Column(type: "REAL", nullable: true, comment: "Норма расхода кондиционирующей смеси (кг/т)"), - MixtureActualRate = table.Column(type: "REAL", nullable: true, comment: "Фактический расход кондиционирующей смеси (кг/т)") + MixtureNormalRate = table.Column(type: "REAL", nullable: true, comment: "Норма расхода кондиционирующей смеси (кг/т | гр/кг)"), + MixtureActualRate = table.Column(type: "REAL", nullable: true, comment: "Фактический расход кондиционирующей смеси (кг/т | гр/кг)"), + MeasuredContent = table.Column(type: "REAL", nullable: true, comment: "Измеренное колличество масла (кг/т | гр/кг)") }, constraints: table => { diff --git a/GSS2.Core/Analysis/AmineContent/Database/Calibration/AmineContentCalibrationContextModelSnapshot.cs b/GSS2.Core/Analysis/AmineContent/Database/Calibration/AmineContentCalibrationContextModelSnapshot.cs index c52acf3..59a5fb9 100644 --- a/GSS2.Core/Analysis/AmineContent/Database/Calibration/AmineContentCalibrationContextModelSnapshot.cs +++ b/GSS2.Core/Analysis/AmineContent/Database/Calibration/AmineContentCalibrationContextModelSnapshot.cs @@ -39,9 +39,13 @@ namespace GSS2.Core.Analysis.AmineContent.Database.Calibration .HasColumnType("INTEGER") .HasComment("Уникальный идентификатор"); + b.Property("MeasuredContent") + .HasColumnType("REAL") + .HasComment("Измеренное колличество масла (кг/т | гр/кг)"); + b.Property("MixtureActualRate") .HasColumnType("REAL") - .HasComment("Фактический расход кондиционирующей смеси (кг/т)"); + .HasComment("Фактический расход кондиционирующей смеси (кг/т | гр/кг)"); b.Property("MixtureAmineContent") .HasColumnType("REAL") @@ -54,7 +58,7 @@ namespace GSS2.Core.Analysis.AmineContent.Database.Calibration b.Property("MixtureNormalRate") .HasColumnType("REAL") - .HasComment("Норма расхода кондиционирующей смеси (кг/т)"); + .HasComment("Норма расхода кондиционирующей смеси (кг/т | гр/кг)"); b.Property("SampleBrand") .HasMaxLength(512) diff --git a/GSS2.Core/Analysis/AmineContent/Database/Calibration/CalibrationRecord.cs b/GSS2.Core/Analysis/AmineContent/Database/Calibration/CalibrationRecord.cs index 2420366..6aebf89 100644 --- a/GSS2.Core/Analysis/AmineContent/Database/Calibration/CalibrationRecord.cs +++ b/GSS2.Core/Analysis/AmineContent/Database/Calibration/CalibrationRecord.cs @@ -7,27 +7,29 @@ public record CalibrationRecord [Comment("Уникальный идентификатор")] public int Id { get; set; } [Comment("Название пробы")] - public required string? SampleName { get; init; } + public required string? SampleName { get; set; } [Comment("Дополнительная информация о пробе")] - public required string? SampleComment { get; init; } + public required string? SampleComment { get; set; } [Comment("Марка пробы")] - public required string? SampleBrand { get; init; } + public required string? SampleBrand { get; set; } [Comment("Масса пробы (кг)")] - public required double? SampleMass { get; init; } + public required double? SampleMass { get; set; } [Comment("Дата и время отбора пробы")] - public required DateTime? SamplingDateTime { get; init; } + public required DateTime? SamplingDateTime { get; set; } [Comment("Место отбора пробы")] - public required string? SamplingPlace { get; init; } + public required string? SamplingPlace { get; set; } [Comment("Название используемой кондиционирующей смеси")] - public required string? MixtureName { get; init; } + public required string? MixtureName { get; set; } [Comment("Содержание аминов в кондиционирующей смеси (%)")] - public required double? MixtureAmineContent { get; init; } - [Comment("Норма расхода кондиционирующей смеси (кг/т)")] - public required double? MixtureNormalRate { get; init; } - [Comment("Фактический расход кондиционирующей смеси (кг/т)")] - public required double? MixtureActualRate { get; init; } + public required double? MixtureAmineContent { get; set; } + [Comment("Норма расхода кондиционирующей смеси (кг/т | гр/кг)")] + public required double? MixtureNormalRate { get; set; } + [Comment("Фактический расход кондиционирующей смеси (кг/т | гр/кг)")] + public required double? MixtureActualRate { get; set; } + [Comment("Измеренное колличество масла (кг/т | гр/кг)")] + public required double? MeasuredContent { get; set; } [Comment("Изображения пробы")] - public required List SampleImages { get; init; } + public required List SampleImages { get; set; } [Comment("Изображения пустого сепаратора")] - public required List SeparatorImages { get; init; } + public required List SeparatorImages { get; set; } } diff --git a/GSS2.Core/Analysis/AmineContent/Database/Calibration/ImageRecord.cs b/GSS2.Core/Analysis/AmineContent/Database/Calibration/ImageRecord.cs index 8fe1658..df6abcd 100644 --- a/GSS2.Core/Analysis/AmineContent/Database/Calibration/ImageRecord.cs +++ b/GSS2.Core/Analysis/AmineContent/Database/Calibration/ImageRecord.cs @@ -7,13 +7,13 @@ public record ImageRecord [Comment("Уникальный идентификатор")] public int Id { get; set; } [Comment("Интенсивность видимого света (0..1)")] - public required double VisibleIntensity { get; init; } + public required double VisibleIntensity { get; set; } [Comment("Интенсивность УФ излучения 365 нм (0..1)")] - public required double Uv365Intensity { get; init; } + public required double Uv365Intensity { get; set; } [Comment("Интенсивность УФ излучения 254 нм (0..1)")] - public required double Uv254Intensity { get; init; } + public required double Uv254Intensity { get; set; } [Comment("Путь к файлу изображения")] - public required string ImagePath { get; init; } + public required string ImagePath { get; set; } // 1:N public int? SeparatorRecordId { get; set; } diff --git a/GSS2.Core/Analysis/AmineContent/Database/Calibration/SeparatorRecord.cs b/GSS2.Core/Analysis/AmineContent/Database/Calibration/SeparatorRecord.cs index 302620b..1ac16af 100644 --- a/GSS2.Core/Analysis/AmineContent/Database/Calibration/SeparatorRecord.cs +++ b/GSS2.Core/Analysis/AmineContent/Database/Calibration/SeparatorRecord.cs @@ -1,3 +1,5 @@ +using System.IO.Pipelines; + using Microsoft.EntityFrameworkCore; namespace GSS2.Core.Analysis.AmineContent.Database.Calibration; @@ -7,9 +9,9 @@ public record SeparatorRecord [Comment("Уникальный идентификатор")] public int Id { get; set; } [Comment("Тип сепаратора")] - public required string Type { get; init; } + public required string Type { get; set; } [Comment("Партия сепаратора")] - public required string Batch { get; init; } + public required string Batch { get; set; } [Comment("Изображения сепаратора")] - public required List Images { get; init; } + public required List Images { get; set; } } diff --git a/GSS2.Core/Analysis/AmineContent/Database/Results/20260227093041_AmineContentResultsInitial.Designer.cs b/GSS2.Core/Analysis/AmineContent/Database/Results/20260303084204_AmineContentResultsInitial.Designer.cs similarity index 99% rename from GSS2.Core/Analysis/AmineContent/Database/Results/20260227093041_AmineContentResultsInitial.Designer.cs rename to GSS2.Core/Analysis/AmineContent/Database/Results/20260303084204_AmineContentResultsInitial.Designer.cs index d811a75..ae8c3ef 100644 --- a/GSS2.Core/Analysis/AmineContent/Database/Results/20260227093041_AmineContentResultsInitial.Designer.cs +++ b/GSS2.Core/Analysis/AmineContent/Database/Results/20260303084204_AmineContentResultsInitial.Designer.cs @@ -11,7 +11,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; namespace GSS2.Core.Analysis.AmineContent.Database.Results { [DbContext(typeof(AmineContentResultsContext))] - [Migration("20260227093041_AmineContentResultsInitial")] + [Migration("20260303084204_AmineContentResultsInitial")] partial class AmineContentResultsInitial { /// diff --git a/GSS2.Core/Analysis/AmineContent/Database/Results/20260227093041_AmineContentResultsInitial.cs b/GSS2.Core/Analysis/AmineContent/Database/Results/20260303084204_AmineContentResultsInitial.cs similarity index 100% rename from GSS2.Core/Analysis/AmineContent/Database/Results/20260227093041_AmineContentResultsInitial.cs rename to GSS2.Core/Analysis/AmineContent/Database/Results/20260303084204_AmineContentResultsInitial.cs