From 0b1f9683b9de93e4f098cbc12585c8e58d53566e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A4=D1=80=D0=BE=D0=BB=D0=BE=D0=B2?= Date: Fri, 17 Sep 2021 16:24:01 +0500 Subject: [PATCH] fix jsonSerializer settings; reafctor TelemetryHub; Add wellDepth into TelemetryMessage --- AsbCloudApp/Data/ITelemetryData.cs | 10 + AsbCloudApp/Data/TelemetryDataSaubDto.cs | 3 +- AsbCloudApp/Data/TelemetryDataSpinDto.cs | 2 +- AsbCloudApp/Data/TelemetryMessageDto.cs | 1 + .../Services/ICachedCrudService.cs | 2 +- AsbCloudApp/Services/ICrudService.cs | 1 - AsbCloudApp/Services/ITelemetryDataService.cs | 15 + ...16094617_AddWellDepthToMessage.Designer.cs | 2366 +++++++++++++++++ .../20210916094617_AddWellDepthToMessage.cs | 24 + .../AsbCloudDbContextModelSnapshot.cs | 8 +- AsbCloudDb/Model/AsbCloudDbContext.cs | 2 +- AsbCloudDb/Model/IAsbCloudDbContext.cs | 2 +- AsbCloudDb/Model/IId.cs | 2 +- ...{IIdTelemetryDate.cs => ITelemetryData.cs} | 2 +- AsbCloudDb/Model/TelemetryDataSaub.cs | 2 +- AsbCloudDb/Model/TelemetryDataSpin.cs | 2 +- AsbCloudDb/Model/TelemetryMessage.cs | 5 +- AsbCloudInfrastructure/DependencyInjection.cs | 4 + .../Services/CrudServiceBase.cs | 22 +- .../Services/DataService.cs | 1 + AsbCloudInfrastructure/Services/IConverter.cs | 8 + .../Services/TelemetryDataSaubService.cs | 36 + .../Services/TelemetryDataService.cs | 137 + .../Services/TelemetryDataSpinService.cs | 30 + .../Services/TelemetryService.cs | 2 +- .../Services/WellOperationService.cs | 2 +- .../Services/_CachedCrudService.cs | 1 + .../Controllers/TelemetryController.cs | 5 +- .../TelemetryDataBaseController.cs | 73 +- .../Controllers/TelemetryDataSaub.cs | 16 - .../TelemetryDataSaubController.cs | 29 + .../Controllers/TelemetryDataSpin.cs | 11 - .../TelemetryDataSpinController.cs | 29 + AsbCloudWebApi/SignalR/ITelemetryHubClient.cs | 13 - AsbCloudWebApi/SignalR/TelemetryHub.cs | 6 +- AsbCloudWebApi/Startup.cs | 10 +- AsbCloudWebApi/wwwroot/asset-manifest.json | 24 +- AsbCloudWebApi/wwwroot/index.html | 2 +- 38 files changed, 2793 insertions(+), 117 deletions(-) create mode 100644 AsbCloudApp/Data/ITelemetryData.cs rename {AsbCloudInfrastructure => AsbCloudApp}/Services/ICachedCrudService.cs (71%) create mode 100644 AsbCloudApp/Services/ITelemetryDataService.cs create mode 100644 AsbCloudDb/Migrations/20210916094617_AddWellDepthToMessage.Designer.cs create mode 100644 AsbCloudDb/Migrations/20210916094617_AddWellDepthToMessage.cs rename AsbCloudDb/Model/{IIdTelemetryDate.cs => ITelemetryData.cs} (76%) create mode 100644 AsbCloudInfrastructure/Services/IConverter.cs create mode 100644 AsbCloudInfrastructure/Services/TelemetryDataSaubService.cs create mode 100644 AsbCloudInfrastructure/Services/TelemetryDataService.cs create mode 100644 AsbCloudInfrastructure/Services/TelemetryDataSpinService.cs delete mode 100644 AsbCloudWebApi/Controllers/TelemetryDataSaub.cs create mode 100644 AsbCloudWebApi/Controllers/TelemetryDataSaubController.cs delete mode 100644 AsbCloudWebApi/Controllers/TelemetryDataSpin.cs create mode 100644 AsbCloudWebApi/Controllers/TelemetryDataSpinController.cs delete mode 100644 AsbCloudWebApi/SignalR/ITelemetryHubClient.cs diff --git a/AsbCloudApp/Data/ITelemetryData.cs b/AsbCloudApp/Data/ITelemetryData.cs new file mode 100644 index 00000000..fb9bd2d4 --- /dev/null +++ b/AsbCloudApp/Data/ITelemetryData.cs @@ -0,0 +1,10 @@ +using System; + +namespace AsbCloudApp.Data +{ + public interface ITelemetryData: IId + { + int IdTelemetry { get; set; } + DateTime Date { get; set; } + } +} diff --git a/AsbCloudApp/Data/TelemetryDataSaubDto.cs b/AsbCloudApp/Data/TelemetryDataSaubDto.cs index de457534..7a4f0afb 100644 --- a/AsbCloudApp/Data/TelemetryDataSaubDto.cs +++ b/AsbCloudApp/Data/TelemetryDataSaubDto.cs @@ -5,8 +5,9 @@ namespace AsbCloudApp.Data /// /// Сообщение получаемое по телеметрии и отправляемое в frontend /// - public class TelemetryDataSaubDto + public class TelemetryDataSaubDto : ITelemetryData { + public int Id { get; set; } //[JsonPropertyName("date")] public DateTime Date { get; set; } diff --git a/AsbCloudApp/Data/TelemetryDataSpinDto.cs b/AsbCloudApp/Data/TelemetryDataSpinDto.cs index bb30c0f3..df1b7de8 100644 --- a/AsbCloudApp/Data/TelemetryDataSpinDto.cs +++ b/AsbCloudApp/Data/TelemetryDataSpinDto.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace AsbCloudApp.Data { - public class TelemetryDataSpinDto + public class TelemetryDataSpinDto : ITelemetryData { public int Id { get; set; } public int IdTelemetry { get; set; } diff --git a/AsbCloudApp/Data/TelemetryMessageDto.cs b/AsbCloudApp/Data/TelemetryMessageDto.cs index 54616cd0..32e4f1a7 100644 --- a/AsbCloudApp/Data/TelemetryMessageDto.cs +++ b/AsbCloudApp/Data/TelemetryMessageDto.cs @@ -9,6 +9,7 @@ namespace AsbCloudApp.Data { public int Id { get; set; } public DateTime Date { get; set; } + public double WellDepth { get; set; } public int IdEvent { get; set; } public int? IdTelemetryUser { get; set; } public string Arg0 { get; set; } diff --git a/AsbCloudInfrastructure/Services/ICachedCrudService.cs b/AsbCloudApp/Services/ICachedCrudService.cs similarity index 71% rename from AsbCloudInfrastructure/Services/ICachedCrudService.cs rename to AsbCloudApp/Services/ICachedCrudService.cs index 1e6043d4..26751519 100644 --- a/AsbCloudInfrastructure/Services/ICachedCrudService.cs +++ b/AsbCloudApp/Services/ICachedCrudService.cs @@ -1,6 +1,6 @@ using AsbCloudApp.Data; -namespace AsbCloudInfrastructure.Services +namespace AsbCloudApp.Services { public interface ICachedCrudService where Tdto : IId { diff --git a/AsbCloudApp/Services/ICrudService.cs b/AsbCloudApp/Services/ICrudService.cs index 1d9c7ff8..e80c1a16 100644 --- a/AsbCloudApp/Services/ICrudService.cs +++ b/AsbCloudApp/Services/ICrudService.cs @@ -8,7 +8,6 @@ namespace AsbCloudApp.Services where Tdto : Data.IId { List Incledes { get; } - Task DeleteAsync(int id, CancellationToken token = default); Task DeleteAsync(IEnumerable ids, CancellationToken token = default); Task> GetAllAsync(CancellationToken token = default); diff --git a/AsbCloudApp/Services/ITelemetryDataService.cs b/AsbCloudApp/Services/ITelemetryDataService.cs new file mode 100644 index 00000000..c9839126 --- /dev/null +++ b/AsbCloudApp/Services/ITelemetryDataService.cs @@ -0,0 +1,15 @@ +using AsbCloudApp.Data; +using System; +using System.Collections.Generic; +using System.Threading; +using System.Threading.Tasks; + +namespace AsbCloudApp.Services +{ + public interface ITelemetryDataService where TDto : ITelemetryData + { + Task> GetAsync(int idWell, DateTime dateBegin = default, double intervalSec = 600, int approxPointsCount = 1024, CancellationToken token = default); + Task GetDataDatesRangeAsync(int idWell, CancellationToken token = default); + Task UpdateDataAsync(string uid, IEnumerable dtos, CancellationToken token = default); + } +} \ No newline at end of file diff --git a/AsbCloudDb/Migrations/20210916094617_AddWellDepthToMessage.Designer.cs b/AsbCloudDb/Migrations/20210916094617_AddWellDepthToMessage.Designer.cs new file mode 100644 index 00000000..81942537 --- /dev/null +++ b/AsbCloudDb/Migrations/20210916094617_AddWellDepthToMessage.Designer.cs @@ -0,0 +1,2366 @@ +// +using System; +using System.Collections.Generic; +using AsbCloudDb.Model; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; + +namespace AsbCloudDb.Migrations +{ + [DbContext(typeof(AsbCloudDbContext))] + [Migration("20210916094617_AddWellDepthToMessage")] + partial class AddWellDepthToMessage + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasPostgresExtension("adminpack") + .UseIdentityByDefaultColumns() + .HasAnnotation("Relational:Collation", "Russian_Russia.1251") + .HasAnnotation("Relational:MaxIdentifierLength", 63) + .HasAnnotation("ProductVersion", "5.0.2"); + + modelBuilder.Entity("AsbCloudDb.Model.Cluster", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id") + .UseIdentityByDefaultColumn(); + + b.Property("Caption") + .HasMaxLength(255) + .HasColumnType("character varying(255)") + .HasColumnName("caption") + .HasComment("Название"); + + b.Property("IdDeposit") + .HasColumnType("integer") + .HasColumnName("id_deposit"); + + b.Property("Latitude") + .HasColumnType("double precision") + .HasColumnName("latitude"); + + b.Property("Longitude") + .HasColumnType("double precision") + .HasColumnName("longitude"); + + b.HasKey("Id"); + + b.HasIndex("IdDeposit"); + + b.ToTable("t_cluster"); + + b + .HasComment("Кусты"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.Company", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id") + .UseIdentityByDefaultColumn(); + + b.Property("Caption") + .HasMaxLength(255) + .HasColumnType("character varying(255)") + .HasColumnName("caption"); + + b.Property("IdCompanyType") + .HasMaxLength(255) + .HasColumnType("integer") + .HasColumnName("id_company_type") + .HasComment("вид деятельности"); + + b.HasKey("Id"); + + b.HasIndex("IdCompanyType"); + + b.ToTable("t_company"); + + b.HasData( + new + { + Id = 1, + Caption = "ООО \"АСБ\"", + IdCompanyType = 3 + }); + }); + + modelBuilder.Entity("AsbCloudDb.Model.CompanyType", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id") + .UseIdentityByDefaultColumn(); + + b.Property("Caption") + .HasMaxLength(255) + .HasColumnType("character varying(255)") + .HasColumnName("caption"); + + b.HasKey("Id"); + + b.ToTable("t_company_type"); + + b.HasData( + new + { + Id = 1, + Caption = "Недрапользователь" + }, + new + { + Id = 2, + Caption = "Буровой подрядчик" + }, + new + { + Id = 3, + Caption = "Сервис автоматизации бурения" + }); + }); + + modelBuilder.Entity("AsbCloudDb.Model.Deposit", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id") + .UseIdentityByDefaultColumn(); + + b.Property("Caption") + .HasMaxLength(255) + .HasColumnType("character varying(255)") + .HasColumnName("caption"); + + b.Property("Latitude") + .HasColumnType("double precision") + .HasColumnName("latitude"); + + b.Property("Longitude") + .HasColumnType("double precision") + .HasColumnName("longitude"); + + b.HasKey("Id"); + + b.ToTable("t_deposit"); + + b + .HasComment("Месторождение"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.FileCategory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id") + .UseIdentityByDefaultColumn(); + + b.Property("Name") + .HasColumnType("text") + .HasColumnName("name") + .HasComment("Название категории"); + + b.Property("ShortName") + .HasColumnType("text") + .HasColumnName("short_name") + .HasComment("Короткое название категории"); + + b.HasKey("Id"); + + b.ToTable("t_file_category"); + + b + .HasComment("Категории файлов"); + + b.HasData( + new + { + Id = 1, + Name = "Растворный сервис", + ShortName = "fluidService" + }, + new + { + Id = 2, + Name = "Цементирование", + ShortName = "cement" + }, + new + { + Id = 3, + Name = "ННБ", + ShortName = "nnb" + }, + new + { + Id = 4, + Name = "ГТИ", + ShortName = "gti" + }, + new + { + Id = 5, + Name = "Документы по скважине", + ShortName = "wellDocuments" + }, + new + { + Id = 6, + Name = "Супервайзер", + ShortName = "supervisor" + }, + new + { + Id = 7, + Name = "Мастер", + ShortName = "master" + }, + new + { + Id = 8, + Name = "Последний замер бурового раствора ПЛАН", + ShortName = "fluidPlanLastData" + }, + new + { + Id = 9, + Name = "Последний замер бурового раствора ФАКТ", + ShortName = "fluidFactLastData" + }, + new + { + Id = 10, + Name = "Последние данные Шламограммы", + ShortName = "mudLastData" + }, + new + { + Id = 11, + Name = "Последние данные ННБ", + ShortName = "nnbLastData" + }, + new + { + Id = 12, + Name = "Рапорт", + ShortName = "report" + }, + new + { + Id = 13, + Name = "Программа бурения, части", + ShortName = "ПБч" + }, + new + { + Id = 14, + Name = "Программа бурения", + ShortName = "ПБ" + }); + }); + + modelBuilder.Entity("AsbCloudDb.Model.FileInfo", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id") + .UseIdentityByDefaultColumn(); + + b.Property("IdAuthor") + .HasColumnType("integer") + .HasColumnName("id_author") + .HasComment("Id пользователя, загрузившего файл"); + + b.Property("IdCategory") + .HasColumnType("integer") + .HasColumnName("id_category") + .HasComment("id категории файла"); + + b.Property("IdWell") + .HasColumnType("integer") + .HasColumnName("id_well") + .HasComment("id скважины"); + + b.Property("IsDeleted") + .HasColumnType("boolean") + .HasColumnName("is_deleted") + .HasComment("Удален ли файл"); + + b.Property("Name") + .HasColumnType("text") + .HasColumnName("name") + .HasComment("Название файла"); + + b.Property("Size") + .HasColumnType("bigint") + .HasColumnName("file_size") + .HasComment("Размер файла"); + + b.Property("UploadDate") + .HasColumnType("timestamp with time zone") + .HasColumnName("date"); + + b.HasKey("Id"); + + b.HasIndex("IdAuthor"); + + b.HasIndex("IdCategory"); + + b.HasIndex("IdWell"); + + b.ToTable("t_file_info"); + + b + .HasComment("Файлы всех категорий"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.Measure", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id") + .UseIdentityByDefaultColumn(); + + b.Property>("Data") + .HasColumnType("jsonb") + .HasColumnName("data") + .HasComment("Данные таблицы последних данных"); + + b.Property("IdCategory") + .HasColumnType("integer") + .HasColumnName("id_category") + .HasComment("id категории"); + + b.Property("IdWell") + .HasColumnType("integer") + .HasColumnName("id_well") + .HasComment("id скважины"); + + b.Property("IsDeleted") + .HasColumnType("boolean") + .HasColumnName("is_deleted") + .HasComment("Пометка удаленным"); + + b.Property("Timestamp") + .HasColumnType("timestamp without time zone") + .HasColumnName("timestamp") + .HasComment("время добавления"); + + b.HasKey("Id"); + + b.HasIndex("IdCategory"); + + b.HasIndex("IdWell"); + + b.ToTable("t_measure"); + + b + .HasComment("Таблица c данными для вкладки 'Последние данные'"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.MeasureCategory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id") + .UseIdentityByDefaultColumn(); + + b.Property("Name") + .HasColumnType("text") + .HasColumnName("name") + .HasComment("Название категории"); + + b.Property("ShortName") + .HasColumnType("text") + .HasColumnName("short_name") + .HasComment("Короткое название категории"); + + b.HasKey("Id"); + + b.ToTable("t_measure_category"); + + b + .HasComment("Категория последних данных"); + + b.HasData( + new + { + Id = 1, + Name = "Показатели бурового раствора", + ShortName = "Раствор" + }, + new + { + Id = 2, + Name = "Шламограмма", + ShortName = "Шламограмма" + }, + new + { + Id = 3, + Name = "ННБ", + ShortName = "ННБ" + }); + }); + + modelBuilder.Entity("AsbCloudDb.Model.RelationCompanyWell", b => + { + b.Property("IdCompany") + .HasColumnType("integer") + .HasColumnName("id_company"); + + b.Property("IdWell") + .HasColumnType("integer") + .HasColumnName("id_well"); + + b.HasKey("IdCompany", "IdWell"); + + b.HasIndex("IdWell"); + + b.ToTable("t_relation_company_well"); + + b + .HasComment("отношение скважин и компаний"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.ReportProperty", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id") + .UseIdentityByDefaultColumn(); + + b.Property("Begin") + .HasColumnType("timestamp with time zone") + .HasColumnName("begin"); + + b.Property("End") + .HasColumnType("timestamp with time zone") + .HasColumnName("end") + .HasComment("timestamp with time zone"); + + b.Property("Format") + .HasColumnType("integer") + .HasColumnName("format") + .HasComment("Формат отчета"); + + b.Property("IdFile") + .HasColumnType("integer") + .HasColumnName("id_file") + .HasComment("id файла-родителя"); + + b.Property("IdWell") + .HasColumnType("integer") + .HasColumnName("id_well") + .HasComment("id скважины"); + + b.Property("Step") + .HasColumnType("integer") + .HasColumnName("step") + .HasComment("размер шага в секундах"); + + b.HasKey("Id"); + + b.HasIndex("IdFile"); + + b.HasIndex("IdWell"); + + b.ToTable("t_report_property"); + + b + .HasComment("Отчеты с данными по буровым"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.Telemetry", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id") + .UseIdentityByDefaultColumn(); + + b.Property("Info") + .HasColumnType("jsonb") + .HasColumnName("info") + .HasComment("Информация с панели о скважине"); + + b.Property("RemoteUid") + .HasColumnType("text") + .HasColumnName("remote_uid") + .HasComment("Идентификатор передающего устройства. Может повторяться в списке, так как комплекты оборудования переезжают от скв. к скв."); + + b.HasKey("Id"); + + b.HasIndex(new[] { "RemoteUid" }, "t_telemetry_remote_uid_index"); + + b.ToTable("t_telemetry"); + + b + .HasComment("таблица привязки телеметрии от комплектов к конкретной скважине."); + }); + + modelBuilder.Entity("AsbCloudDb.Model.TelemetryAnalysis", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id") + .UseIdentityByDefaultColumn(); + + b.Property("DurationSec") + .HasColumnType("integer") + .HasColumnName("duration_sec") + .HasComment("Кол-во секунд после предыдущей операции"); + + b.Property("IdOperation") + .HasColumnType("integer") + .HasColumnName("id_operation"); + + b.Property("IdTelemetry") + .HasColumnType("integer") + .HasColumnName("id_telemetry"); + + b.Property("IsBitPositionDecreasing") + .HasColumnType("boolean") + .HasColumnName("is_bit_position_decreasing") + .HasComment("Долото поднимается"); + + b.Property("IsBitPositionIncreasing") + .HasColumnType("boolean") + .HasColumnName("is_bit_position_increasing") + .HasComment("Долото спускается"); + + b.Property("IsBitPositionLt20") + .HasColumnType("boolean") + .HasColumnName("is_bit_posision_lt_20") + .HasComment("Положение долота меньше 20м"); + + b.Property("IsBlockPositionDecreasing") + .HasColumnType("boolean") + .HasColumnName("is_block_posision_decresing") + .HasComment("Талевый блок поднимается"); + + b.Property("IsBlockPositionIncreasing") + .HasColumnType("boolean") + .HasColumnName("is_block_posision_incresing") + .HasComment("Талевый блок спускается"); + + b.Property("IsHookWeightLt3") + .HasColumnType("boolean") + .HasColumnName("is_hook_weight_lt_3") + .HasComment("Вес на крюке менее 3т"); + + b.Property("IsHookWeightNotChanges") + .HasColumnType("boolean") + .HasColumnName("is_hook_weight_not_changes") + .HasComment("Вес на крюке не меняется"); + + b.Property("IsPressureGt20") + .HasColumnType("boolean") + .HasColumnName("is_pressure_gt_20") + .HasComment("Давоение более 20"); + + b.Property("IsPressureLt20") + .HasColumnType("boolean") + .HasColumnName("is_pressure_lt_20") + .HasComment("Давление менее 20"); + + b.Property("IsRotorSpeedGt3") + .HasColumnType("boolean") + .HasColumnName("is_rotor_speed_gt_3") + .HasComment("Обороты ротора выше 3"); + + b.Property("IsRotorSpeedLt3") + .HasColumnType("boolean") + .HasColumnName("is_rotor_speed_lt_3") + .HasComment("Обороты ротора ниже 3"); + + b.Property("IsWellDepthDecreasing") + .HasColumnType("boolean") + .HasColumnName("is_well_depth_decreasing") + .HasComment("Глубина забоя не увеличивается"); + + b.Property("IsWellDepthIncreasing") + .HasColumnType("boolean") + .HasColumnName("is_well_depth_increasing") + .HasComment("Глубина забоя увеличивается"); + + b.Property("OperationEndDepth") + .HasColumnType("double precision") + .HasColumnName("operation_end_depth") + .HasComment("Глубина, на которой закончилась операция"); + + b.Property("OperationStartDepth") + .HasColumnType("double precision") + .HasColumnName("operation_start_depth") + .HasComment("Глубина, на которой началась операция"); + + b.Property("UnixDate") + .HasColumnType("bigint") + .HasColumnName("unix_date") + .HasComment("Unix timestamp для Linq запросов с вычислением дат"); + + b.HasKey("Id"); + + b.HasIndex("IdOperation"); + + b.HasIndex("IdTelemetry"); + + b.ToTable("t_telemetry_analysis"); + + b + .HasComment("События на скважине"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.TelemetryDataSaub", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id") + .UseIdentityByDefaultColumn(); + + b.Property("AxialLoad") + .HasColumnType("double precision") + .HasColumnName("axial_load") + .HasComment("Осевая нагрузка"); + + b.Property("AxialLoadLimitMax") + .HasColumnType("double precision") + .HasColumnName("axial_load_limit_max") + .HasComment("Осевая нагрузка. Аварийная макс."); + + b.Property("AxialLoadSp") + .HasColumnType("double precision") + .HasColumnName("axial_load_sp") + .HasComment("Осевая нагрузка. Задание"); + + b.Property("BitDepth") + .HasColumnType("double precision") + .HasColumnName("bit_depth") + .HasComment("Положение инструмента"); + + b.Property("BlockPosition") + .HasColumnType("double precision") + .HasColumnName("block_position") + .HasComment("Высота талевого блока"); + + b.Property("BlockPositionMax") + .HasColumnType("double precision") + .HasColumnName("block_position_max") + .HasComment("Талевый блок. Макс положение"); + + b.Property("BlockPositionMin") + .HasColumnType("double precision") + .HasColumnName("block_position_min") + .HasComment("Талевый блок. Мин положение"); + + b.Property("BlockSpeed") + .HasColumnType("double precision") + .HasColumnName("block_speed") + .HasComment("Скорость талевого блока"); + + b.Property("BlockSpeedSp") + .HasColumnType("double precision") + .HasColumnName("block_speed_sp") + .HasComment("Скорости талевого блока. Задание"); + + b.Property("BlockSpeedSpDevelop") + .HasColumnType("double precision") + .HasColumnName("block_speed_sp_develop") + .HasComment("Талевый блок. Задание скорости для проработки"); + + b.Property("BlockSpeedSpRotor") + .HasColumnType("double precision") + .HasColumnName("block_speed_sp_rotor") + .HasComment("Талевый блок. Задание скорости для роторного бурения"); + + b.Property("BlockSpeedSpSlide") + .HasColumnType("double precision") + .HasColumnName("block_speed_sp_slide") + .HasComment("Талевый блок. Задание скорости для режима слайда"); + + b.Property("Date") + .HasColumnType("timestamp with time zone") + .HasColumnName("date") + .HasComment("'2021-10-19 18:23:54+05'"); + + b.Property("Flow") + .HasColumnType("double precision") + .HasColumnName("flow") + .HasComment("Расход"); + + b.Property("FlowDeltaLimitMax") + .HasColumnType("double precision") + .HasColumnName("flow_delta_limit_max") + .HasComment("Расход. Аварийный макс."); + + b.Property("FlowIdle") + .HasColumnType("double precision") + .HasColumnName("flow_idle") + .HasComment("Расход. Холостой ход"); + + b.Property("HookWeight") + .HasColumnType("double precision") + .HasColumnName("hook_weight") + .HasComment("Вес на крюке"); + + b.Property("HookWeightIdle") + .HasColumnType("double precision") + .HasColumnName("hook_weight_idle") + .HasComment("Вес на крюке. Холостой ход"); + + b.Property("HookWeightLimitMax") + .HasColumnType("double precision") + .HasColumnName("hook_weight_limit_max") + .HasComment("Вес на крюке. Затяжка"); + + b.Property("HookWeightLimitMin") + .HasColumnType("double precision") + .HasColumnName("hook_weight_limit_min") + .HasComment("Вес на крюке. Посадка"); + + b.Property("IdFeedRegulator") + .HasColumnType("double precision") + .HasColumnName("id_feed_regulator") + .HasComment("Текущий критерий бурения"); + + b.Property("IdTelemetry") + .HasColumnType("integer") + .HasColumnName("id_telemetry"); + + b.Property("IdUser") + .HasColumnType("integer") + .HasColumnName("id_user") + .HasComment("Пользователь САУБ"); + + b.Property("Mode") + .HasColumnType("integer") + .HasColumnName("mode") + .HasComment("Режим САУБ"); + + b.Property("MseState") + .HasColumnType("double precision") + .HasColumnName("mse_state") + .HasComment("Текущее состояние работы MSE"); + + b.Property("Pressure") + .HasColumnType("double precision") + .HasColumnName("pressure") + .HasComment("Давление"); + + b.Property("PressureDeltaLimitMax") + .HasColumnType("double precision") + .HasColumnName("pressure_delta_limit_max") + .HasComment("Давление дифф. Аварийное макс."); + + b.Property("PressureIdle") + .HasColumnType("double precision") + .HasColumnName("pressure_idle") + .HasComment("Давление. Холостой ход"); + + b.Property("PressureSp") + .HasColumnType("double precision") + .HasColumnName("pressure_sp") + .HasComment("Давление. Задание"); + + b.Property("PressureSpDevelop") + .HasColumnType("double precision") + .HasColumnName("pressure_sp_develop") + .HasComment("Давление. Задание для проработки"); + + b.Property("PressureSpRotor") + .HasColumnType("double precision") + .HasColumnName("pressure_sp_rotor") + .HasComment("Давление. Задание для роторного бурения"); + + b.Property("PressureSpSlide") + .HasColumnType("double precision") + .HasColumnName("pressure_sp_slide") + .HasComment("Давление. Задание для режима слайда"); + + b.Property("RotorSpeed") + .HasColumnType("double precision") + .HasColumnName("rotor_speed") + .HasComment("Обороты ротора"); + + b.Property("RotorTorque") + .HasColumnType("double precision") + .HasColumnName("rotor_torque") + .HasComment("Момент на роторе"); + + b.Property("RotorTorqueIdle") + .HasColumnType("double precision") + .HasColumnName("rotor_torque_idle") + .HasComment("Момент на роторе. Холостой ход"); + + b.Property("RotorTorqueLimitMax") + .HasColumnType("double precision") + .HasColumnName("rotor_torque_limit_max") + .HasComment("Момент на роторе. Аварийный макс."); + + b.Property("RotorTorqueSp") + .HasColumnType("double precision") + .HasColumnName("rotor_torque_sp") + .HasComment("Момент на роторе. Задание"); + + b.Property("WellDepth") + .HasColumnType("double precision") + .HasColumnName("well_depth") + .HasComment("Глубина забоя"); + + b.HasKey("Id"); + + b.HasIndex("IdTelemetry"); + + b.ToTable("t_telemetry_data_saub"); + + b + .HasComment("набор основных данных по SAUB"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.TelemetryDataSpin", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id") + .UseIdentityByDefaultColumn(); + + b.Property("BreakAngleK") + .HasColumnType("double precision") + .HasColumnName("break_angle_k") + .HasComment("Коэффициент для расчёта за какой угол нужно тормозить"); + + b.Property("BreakAngleLeft") + .HasColumnType("double precision") + .HasColumnName("break_angle_left") + .HasComment("Угол торможения влево при работе по моменту"); + + b.Property("Date") + .HasColumnType("timestamp with time zone") + .HasColumnName("date") + .HasComment("'2021-10-19 18:23:54+05'"); + + b.Property("EncoderResolution") + .HasColumnType("double precision") + .HasColumnName("encoder_resolution ") + .HasComment(" Разрешение энкодера"); + + b.Property("IdTelemetry") + .HasColumnType("integer") + .HasColumnName("id_telemetry"); + + b.Property("Mode") + .HasColumnType("integer") + .HasColumnName("mode") + .HasComment("Выбранный режим управления"); + + b.Property("PidMuxTorqueLeftLimit") + .HasColumnType("double precision") + .HasColumnName("pid_mux_torque_left_limit") + .HasComment(" Момент при котором определяется ехать назад по моменту или по скорости"); + + b.Property("PositionRight") + .HasColumnType("double precision") + .HasColumnName("position_right") + .HasComment("Крайний правый угол осциляции"); + + b.Property("PositionZero") + .HasColumnType("double precision") + .HasColumnName("position_zero") + .HasComment("Нулевая позиция осциляции"); + + b.Property("Ratio") + .HasColumnType("double precision") + .HasColumnName("ratio") + .HasComment(" Коэффициент редукции редектора"); + + b.Property("ReverseKTorque") + .HasColumnType("double precision") + .HasColumnName("reverse_k_torque") + .HasComment("Коэффициент на который умножается момент, для того чтобы система поняла что мы движемся в обратную сторону"); + + b.Property("ReverseSpeedSpZeroTime") + .HasColumnType("integer") + .HasColumnName("reverse_speed_sp_zero_time") + .HasComment("Время выдачи сигнала нулевой скорости на при смене направления"); + + b.Property("RevolsLeftLimit") + .HasColumnType("double precision") + .HasColumnName("revols_left_limit") + .HasComment("Ограничение числа оборотов влево"); + + b.Property("RevolsLeftTotal") + .HasColumnType("double precision") + .HasColumnName("revols_left_total") + .HasComment("Суммарное количество оборотов влево"); + + b.Property("RevolsRightLimit") + .HasColumnType("double precision") + .HasColumnName("revols_right_limit") + .HasComment("Ограничение числа оборотов вправо"); + + b.Property("RevolsRightTotal") + .HasColumnType("double precision") + .HasColumnName("revols_right_total") + .HasComment("Суммарное количество оборотов вправо"); + + b.Property("RotorTorqueAvg") + .HasColumnType("double precision") + .HasColumnName("rotor_torque_avg") + .HasComment(" Момент в роторе средний"); + + b.Property("SpeedLeftSp") + .HasColumnType("double precision") + .HasColumnName("speed_left_sp") + .HasComment("Заданная скорость вращения влево"); + + b.Property("SpeedRightSp") + .HasColumnType("double precision") + .HasColumnName("speed_right_sp") + .HasComment("Заданная скорость вращения вправо"); + + b.Property("State") + .HasColumnType("integer") + .HasColumnName("state") + .HasComment("Переменная этапа"); + + b.Property("TopDriveSpeed") + .HasColumnType("double precision") + .HasColumnName("top_drive_speed") + .HasComment("Скорость СВП"); + + b.Property("TopDriveSpeedErr") + .HasColumnType("integer") + .HasColumnName("top_drive_speed_err"); + + b.Property("TopDriveSpeedMax") + .HasColumnType("double precision") + .HasColumnName("top_drive_speed_max") + .HasComment("верхний предел"); + + b.Property("TopDriveSpeedMin") + .HasColumnType("double precision") + .HasColumnName("top_drive_speed_min") + .HasComment("нижний предел"); + + b.Property("TopDriveSpeedOffset") + .HasColumnType("double precision") + .HasColumnName("top_drive_speed_offset") + .HasComment("смещение"); + + b.Property("TopDriveSpeedSpFrom") + .HasColumnType("double precision") + .HasColumnName("top_drive_speed_sp_from") + .HasComment("Заданная скорость c СВП"); + + b.Property("TopDriveSpeedSpFromErr") + .HasColumnType("integer") + .HasColumnName("top_drive_speed_sp_from_err"); + + b.Property("TopDriveSpeedSpFromMax") + .HasColumnType("double precision") + .HasColumnName("top_drive_speed_sp_from_max"); + + b.Property("TopDriveSpeedSpFromMin") + .HasColumnType("double precision") + .HasColumnName("top_drive_speed_sp_from_min"); + + b.Property("TopDriveSpeedSpFromOffset") + .HasColumnType("double precision") + .HasColumnName("top_drive_speed_sp_from_offset"); + + b.Property("TopDriveSpeedSpTo") + .HasColumnType("double precision") + .HasColumnName("top_drive_speed_sp_to") + .HasComment("Задание скорости на СВП"); + + b.Property("TopDriveSpeedSpToErr") + .HasColumnType("integer") + .HasColumnName("top_drive_speed_sp_to_err"); + + b.Property("TopDriveSpeedSpToMax") + .HasColumnType("double precision") + .HasColumnName("top_drive_speed_sp_to_max"); + + b.Property("TopDriveSpeedSpToMin") + .HasColumnType("double precision") + .HasColumnName("top_drive_speed_sp_to_min"); + + b.Property("TopDriveSpeedSpToOffset") + .HasColumnType("double precision") + .HasColumnName("top_drive_speed_sp_to_offset"); + + b.Property("TopDriveTorque") + .HasColumnType("double precision") + .HasColumnName("top_drive_torque") + .HasComment("Момент СВП"); + + b.Property("TopDriveTorqueErr") + .HasColumnType("integer") + .HasColumnName("top_drive_torque_err"); + + b.Property("TopDriveTorqueMax") + .HasColumnType("double precision") + .HasColumnName("top_drive_torque_max"); + + b.Property("TopDriveTorqueMin") + .HasColumnType("double precision") + .HasColumnName("top_drive_torque_min"); + + b.Property("TopDriveTorqueOffset") + .HasColumnType("double precision") + .HasColumnName("top_drive_torque_offset"); + + b.Property("TopDriveTorqueSpFrom") + .HasColumnType("double precision") + .HasColumnName("top_drive_torque_sp_from") + .HasComment("Заданный момент c СВП"); + + b.Property("TopDriveTorqueSpFromErr") + .HasColumnType("integer") + .HasColumnName("top_drive_torque_sp_from_err"); + + b.Property("TopDriveTorqueSpFromMax") + .HasColumnType("double precision") + .HasColumnName("top_drive_torque_sp_from_max"); + + b.Property("TopDriveTorqueSpFromMin") + .HasColumnType("double precision") + .HasColumnName("top_drive_torque_sp_from_min"); + + b.Property("TopDriveTorqueSpFromOffset") + .HasColumnType("double precision") + .HasColumnName("top_drive_torque_sp_from_offset"); + + b.Property("TopDriveTorqueSpTo") + .HasColumnType("double precision") + .HasColumnName("top_drive_torque_sp_to") + .HasComment("Задание момента на СВП"); + + b.Property("TopDriveTorqueSpToErr") + .HasColumnType("integer") + .HasColumnName("top_drive_torque_sp_to_err"); + + b.Property("TopDriveTorqueSpToMax") + .HasColumnType("double precision") + .HasColumnName("top_drive_torque_sp_to_max"); + + b.Property("TopDriveTorqueSpToMin") + .HasColumnType("double precision") + .HasColumnName("top_drive_torque_sp_to_min"); + + b.Property("TopDriveTorqueSpToOffset") + .HasColumnType("double precision") + .HasColumnName("top_drive_torque_sp_to_offset"); + + b.Property("TorqueLeftLimit") + .HasColumnType("double precision") + .HasColumnName("torque_left_limit") + .HasComment("Ограничение крутящего момента влево"); + + b.Property("TorqueRampTime") + .HasColumnType("double precision") + .HasColumnName("torque_ramp_time") + .HasComment("Время нарастания момента"); + + b.Property("TorqueRightLimit") + .HasColumnType("double precision") + .HasColumnName("torque_right_limit") + .HasComment("Ограничение крутящего момента вправо"); + + b.Property("TorqueStarting") + .HasColumnType("double precision") + .HasColumnName("torque_starting") + .HasComment(" Страгивающий момент"); + + b.Property("TurnLeftOnceByAngle") + .HasColumnType("double precision") + .HasColumnName("turn_left_once_by_angle") + .HasComment("Доворот по градусам единожды влево"); + + b.Property("TurnLeftOnceByRevols") + .HasColumnType("double precision") + .HasColumnName("turn_left_once_by_revols") + .HasComment("Доворот по оборотам единожды влево"); + + b.Property("TurnLeftOnceByTorque") + .HasColumnType("double precision") + .HasColumnName("turn_left_once_by_torque") + .HasComment("Доворот по моменту единожды влево"); + + b.Property("TurnRightOnceByAngle") + .HasColumnType("double precision") + .HasColumnName("turn_right_once_by_angle") + .HasComment("Доворот по градусам единожды вправо"); + + b.Property("TurnRightOnceByRevols") + .HasColumnType("double precision") + .HasColumnName("turn_right_once_by_revols") + .HasComment("Доворот по оборотам единожды вправо"); + + b.Property("TurnRightOnceByTorque") + .HasColumnType("double precision") + .HasColumnName("turn_right_once_by_torque") + .HasComment("Доворот по моменту единожды вправо"); + + b.Property("UnlockBySectorOut") + .HasColumnType("double precision") + .HasColumnName("unlock_by_sector_out") + .HasComment(" Градус отклонения от сектора для автоматического сброса блокировки"); + + b.Property("Ver") + .HasColumnType("double precision") + .HasColumnName("ver") + .HasComment("Версия ПО ПЛК"); + + b.Property("W2800") + .HasColumnType("integer") + .HasColumnName("w2800") + .HasComment("Установка нуля энкодера"); + + b.Property("W2808") + .HasColumnType("integer") + .HasColumnName("w2808") + .HasComment("Неисправность энкодера"); + + b.Property("W2810") + .HasColumnType("integer") + .HasColumnName("w2810") + .HasComment(" автоматический сброс блокировки"); + + b.HasKey("Id"); + + b.HasIndex("IdTelemetry"); + + b.ToTable("t_telemetry_data_spin"); + + b + .HasComment("набор основных данных по SpinMaster"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.TelemetryEvent", b => + { + b.Property("IdTelemetry") + .HasColumnType("integer") + .HasColumnName("id_telemetry"); + + b.Property("IdEvent") + .HasColumnType("integer") + .HasColumnName("id_event"); + + b.Property("IdCategory") + .HasColumnType("integer") + .HasColumnName("id_category"); + + b.Property("MessageTemplate") + .HasColumnType("text") + .HasColumnName("message_template"); + + b.HasKey("IdTelemetry", "IdEvent"); + + b.ToTable("t_telemetry_event"); + + b + .HasComment("Справочник событий. События формируют сообщения. Разделено по версиям посылок от телеметрии."); + }); + + modelBuilder.Entity("AsbCloudDb.Model.TelemetryMessage", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id") + .UseIdentityByDefaultColumn(); + + b.Property("Arg0") + .HasMaxLength(255) + .HasColumnType("character varying(255)") + .HasColumnName("arg0") + .HasComment("Аргумент №0 для вставки в шаблон сообщения"); + + b.Property("Arg1") + .HasMaxLength(255) + .HasColumnType("character varying(255)") + .HasColumnName("arg1"); + + b.Property("Arg2") + .HasMaxLength(255) + .HasColumnType("character varying(255)") + .HasColumnName("arg2"); + + b.Property("Arg3") + .HasMaxLength(255) + .HasColumnType("character varying(255)") + .HasColumnName("arg3"); + + b.Property("Date") + .HasColumnType("timestamp with time zone") + .HasColumnName("date"); + + b.Property("IdEvent") + .HasColumnType("integer") + .HasColumnName("id_event"); + + b.Property("IdTelemetry") + .HasColumnType("integer") + .HasColumnName("id_telemetry"); + + b.Property("IdTelemetryUser") + .HasColumnType("integer") + .HasColumnName("id_telemetry_user") + .HasComment("Пользователь панели отправляющей телеметрию. не пользователь облака."); + + b.Property("WellDepth") + .HasColumnType("double precision") + .HasColumnName("well_depth"); + + b.HasKey("Id"); + + b.HasIndex("IdTelemetry"); + + b.ToTable("t_telemetry_message"); + + b + .HasComment("Сообщения на буровых"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.TelemetryUser", b => + { + b.Property("IdTelemetry") + .HasColumnType("integer") + .HasColumnName("id_telemetry"); + + b.Property("IdUser") + .HasColumnType("integer") + .HasColumnName("id_user"); + + b.Property("Level") + .HasColumnType("integer") + .HasColumnName("level"); + + b.Property("Name") + .HasMaxLength(255) + .HasColumnType("character varying(255)") + .HasColumnName("name"); + + b.Property("Patronymic") + .HasMaxLength(255) + .HasColumnType("character varying(255)") + .HasColumnName("patronymic"); + + b.Property("Surname") + .HasMaxLength(255) + .HasColumnType("character varying(255)") + .HasColumnName("surname"); + + b.HasKey("IdTelemetry", "IdUser"); + + b.ToTable("t_telemetry_user"); + + b + .HasComment("Пользователи панели САУБ. Для сообщений."); + }); + + modelBuilder.Entity("AsbCloudDb.Model.User", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id") + .UseIdentityByDefaultColumn(); + + b.Property("Email") + .HasMaxLength(255) + .HasColumnType("character varying(255)") + .HasColumnName("email") + .HasComment("должность"); + + b.Property("IdCompany") + .HasColumnType("integer") + .HasColumnName("id_company"); + + b.Property("IdRole") + .HasColumnType("integer") + .HasColumnName("id_role"); + + b.Property("Level") + .HasColumnType("integer") + .HasColumnName("level"); + + b.Property("Login") + .HasMaxLength(255) + .HasColumnType("character varying(255)") + .HasColumnName("login"); + + b.Property("Name") + .HasMaxLength(255) + .HasColumnType("character varying(255)") + .HasColumnName("name") + .HasComment("имя"); + + b.Property("PasswordHash") + .HasMaxLength(255) + .HasColumnType("character varying(255)") + .HasColumnName("password_hash") + .HasComment("соленый хэш пароля.\nпервые 5 символов - соль"); + + b.Property("Patronymic") + .HasMaxLength(255) + .HasColumnType("character varying(255)") + .HasColumnName("patronymic") + .HasComment("отчество"); + + b.Property("Phone") + .HasMaxLength(50) + .HasColumnType("character varying(50)") + .HasColumnName("phone") + .HasComment("номер телефона"); + + b.Property("Position") + .HasMaxLength(255) + .HasColumnType("character varying(255)") + .HasColumnName("position") + .HasComment("email"); + + b.Property("State") + .HasColumnType("smallint") + .HasColumnName("state") + .HasComment("состояние:\n100 - удален"); + + b.Property("Surname") + .HasMaxLength(255) + .HasColumnType("character varying(255)") + .HasColumnName("surname") + .HasComment("фамилия"); + + b.HasKey("Id"); + + b.HasIndex("IdCompany"); + + b.HasIndex("IdRole"); + + b.HasIndex("Login") + .IsUnique(); + + b.ToTable("t_user"); + + b + .HasComment("Пользователи облака"); + + b.HasData( + new + { + Id = 1, + IdCompany = 1, + IdRole = 1, + Level = 2147483647, + Login = "dev", + Name = "Разработчик", + PasswordHash = "Vlcj|4fa529103dde7ff72cfe76185f344d4aa87931f8e1b2044e8a7739947c3d18923464eaad93843e4f809c5e126d013072" + }); + }); + + modelBuilder.Entity("AsbCloudDb.Model.UserRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id") + .UseIdentityByDefaultColumn(); + + b.Property("Caption") + .HasMaxLength(255) + .HasColumnType("character varying(255)") + .HasColumnName("caption") + .HasComment("Название"); + + b.HasKey("Id"); + + b.ToTable("t_user_role"); + + b + .HasComment("Роли пользователей в системе"); + + b.HasData( + new + { + Id = 1, + Caption = "Администратор" + }, + new + { + Id = 2, + Caption = "Пользователь" + }); + }); + + modelBuilder.Entity("AsbCloudDb.Model.Well", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id") + .UseIdentityByDefaultColumn(); + + b.Property("Caption") + .HasMaxLength(255) + .HasColumnType("character varying(255)") + .HasColumnName("caption"); + + b.Property("IdCluster") + .HasColumnType("integer") + .HasColumnName("id_cluster"); + + b.Property("IdTelemetry") + .HasColumnType("integer") + .HasColumnName("id_telemetry"); + + b.Property("IdWellType") + .HasColumnType("integer") + .HasColumnName("id_well_type"); + + b.Property("Latitude") + .HasColumnType("double precision") + .HasColumnName("latitude"); + + b.Property("Longitude") + .HasColumnType("double precision") + .HasColumnName("longitude"); + + b.HasKey("Id"); + + b.HasIndex("IdCluster"); + + b.HasIndex("IdTelemetry") + .IsUnique(); + + b.HasIndex("IdWellType"); + + b.ToTable("t_well"); + + b + .HasComment("скважины"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.WellOperation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id") + .UseIdentityByDefaultColumn(); + + b.Property("CategoryInfo") + .HasColumnType("text") + .HasColumnName("category_info") + .HasComment("Доп. информация к выбраной категории"); + + b.Property("Comment") + .HasColumnType("text") + .HasColumnName("comment") + .HasComment("Комментарий"); + + b.Property("DurationHours") + .HasColumnType("double precision") + .HasColumnName("duration_hours") + .HasComment("Продолжительность в часах"); + + b.Property("IdCategory") + .HasColumnType("integer") + .HasColumnName("id_category") + .HasComment("Id категории операции"); + + b.Property("IdType") + .HasColumnType("integer") + .HasColumnName("id_type") + .HasComment("0 = План или 1 = Факт"); + + b.Property("IdWell") + .HasColumnType("integer") + .HasColumnName("id_well") + .HasComment("Id скважины"); + + b.Property("IdWellSectionType") + .HasColumnType("integer") + .HasColumnName("id_well_section_type") + .HasComment("Id тип секции скважины"); + + b.Property("StartDate") + .HasColumnType("timestamp without time zone") + .HasColumnName("date") + .HasComment("Дата начала операции"); + + b.Property("WellDepth") + .HasColumnType("double precision") + .HasColumnName("depth") + .HasComment("Глубина, на которой производилась операция"); + + b.HasKey("Id"); + + b.HasIndex("IdCategory"); + + b.HasIndex("IdWell"); + + b.HasIndex("IdWellSectionType"); + + b.HasIndex("StartDate"); + + b.HasIndex("WellDepth"); + + b.ToTable("t_well_operation"); + + b + .HasComment("Данные по операциям на скважине"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.WellOperationCategory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id") + .UseIdentityByDefaultColumn(); + + b.Property("Code") + .HasColumnType("integer") + .HasColumnName("code") + .HasComment("Код операции"); + + b.Property("Name") + .HasColumnType("text") + .HasColumnName("name") + .HasComment("Название категории операции"); + + b.HasKey("Id"); + + b.ToTable("t_well_operation_category"); + + b + .HasComment("Справочник операций на скважине"); + + b.HasData( + new + { + Id = 1, + Code = 0, + Name = "Невозможно определить операцию" + }, + new + { + Id = 2, + Code = 0, + Name = "Роторное бурение" + }, + new + { + Id = 3, + Code = 0, + Name = "Слайдирование" + }, + new + { + Id = 4, + Code = 0, + Name = "Подъем с проработкой" + }, + new + { + Id = 5, + Code = 0, + Name = "Спуск с проработкой" + }, + new + { + Id = 6, + Code = 0, + Name = "Подъем с промывкой" + }, + new + { + Id = 7, + Code = 0, + Name = "Спуск с промывкой" + }, + new + { + Id = 8, + Code = 0, + Name = "Спуск в скважину" + }, + new + { + Id = 9, + Code = 0, + Name = "Спуск с вращением" + }, + new + { + Id = 10, + Code = 0, + Name = "Подъем из скважины" + }, + new + { + Id = 11, + Code = 0, + Name = "Подъем с вращением" + }, + new + { + Id = 12, + Code = 0, + Name = "Промывка в покое" + }, + new + { + Id = 13, + Code = 0, + Name = "Промывка с вращением" + }, + new + { + Id = 14, + Code = 0, + Name = "Удержание в клиньях" + }, + new + { + Id = 15, + Code = 0, + Name = "Неподвижное состояние" + }, + new + { + Id = 16, + Code = 0, + Name = "Вращение без циркуляции" + }, + new + { + Id = 17, + Code = 0, + Name = "На поверхности" + }, + new + { + Id = 1001, + Code = 0, + Name = "Бурение в интервале" + }, + new + { + Id = 1002, + Code = 0, + Name = "ГИС" + }, + new + { + Id = 1003, + Code = 0, + Name = "ГФР" + }, + new + { + Id = 1004, + Code = 0, + Name = "Монтаж ПВО" + }, + new + { + Id = 1005, + Code = 0, + Name = "Демонтаж ПВО" + }, + new + { + Id = 1006, + Code = 0, + Name = "Установка ФА" + }, + new + { + Id = 1007, + Code = 0, + Name = "Оборудование устья" + }, + new + { + Id = 1008, + Code = 0, + Name = "ОЗЦ" + }, + new + { + Id = 1009, + Code = 0, + Name = "Оборудование устья" + }, + new + { + Id = 1010, + Code = 0, + Name = "ОЗЦ" + }, + new + { + Id = 1011, + Code = 0, + Name = "Начало цикла строительства скважины" + }, + new + { + Id = 1012, + Code = 0, + Name = "Окончание цикла строительства скважины" + }, + new + { + Id = 1013, + Code = 0, + Name = "Опрессовка ПВО" + }, + new + { + Id = 1014, + Code = 0, + Name = "Опресовка Ц.К." + }, + new + { + Id = 1015, + Code = 0, + Name = "Опрессовка ВЗД" + }, + new + { + Id = 1016, + Code = 0, + Name = "Перевод скв на другой тип промывочной жидкости" + }, + new + { + Id = 1017, + Code = 0, + Name = "Перезапись каротажа" + }, + new + { + Id = 1018, + Code = 0, + Name = "Перетяжка талевого каната" + }, + new + { + Id = 1020, + Code = 0, + Name = "Подъем инструмента" + }, + new + { + Id = 1021, + Code = 0, + Name = "Подъем инструмента с промывкой" + }, + new + { + Id = 1022, + Code = 0, + Name = "Обратная проработка" + }, + new + { + Id = 1023, + Code = 0, + Name = "Сборка инструмента" + }, + new + { + Id = 1024, + Code = 0, + Name = "Подготовительные работы" + }, + new + { + Id = 1025, + Code = 0, + Name = "Сборка КНБК" + }, + new + { + Id = 1026, + Code = 0, + Name = "Разборка КНБК" + }, + new + { + Id = 1027, + Code = 0, + Name = "Промывка" + }, + new + { + Id = 1028, + Code = 0, + Name = "Промежуточная промывка" + }, + new + { + Id = 1029, + Code = 0, + Name = "Прокачка пачек" + }, + new + { + Id = 1030, + Code = 0, + Name = "Разбуривание тех.оснастки" + }, + new + { + Id = 1031, + Code = 0, + Name = "Ремонт" + }, + new + { + Id = 1032, + Code = 0, + Name = "Спуск инструмента" + }, + new + { + Id = 1033, + Code = 0, + Name = "Спуск инструмента с промывкой" + }, + new + { + Id = 1034, + Code = 0, + Name = "Прямая проработка" + }, + new + { + Id = 1035, + Code = 0, + Name = "Принудительная проработка" + }, + new + { + Id = 1036, + Code = 0, + Name = "Спуск обсадной колонны" + }, + new + { + Id = 1037, + Code = 0, + Name = "Тех СПО-подъем" + }, + new + { + Id = 1038, + Code = 0, + Name = "Тех СПО-спуск" + }, + new + { + Id = 1039, + Code = 0, + Name = "Техническое обслуживание" + }, + new + { + Id = 1040, + Code = 0, + Name = "Цементаж" + }, + new + { + Id = 1041, + Code = 0, + Name = "Шаблонировка ствола" + }, + new + { + Id = 1042, + Code = 0, + Name = "Геологическое осложнение" + }, + new + { + Id = 1043, + Code = 0, + Name = "НПВ" + }, + new + { + Id = 1044, + Code = 0, + Name = "ВМР" + }, + new + { + Id = 1045, + Code = 0, + Name = "Прочее" + }, + new + { + Id = 1046, + Code = 0, + Name = "Спуск КНБК" + }, + new + { + Id = 1047, + Code = 0, + Name = "Подъем КНБК" + }, + new + { + Id = 1048, + Code = 0, + Name = "Спуск ОК" + }, + new + { + Id = 1050, + Code = 0, + Name = "Промывка при спуске ОК" + }); + }); + + modelBuilder.Entity("AsbCloudDb.Model.WellSectionType", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id") + .UseIdentityByDefaultColumn(); + + b.Property("Caption") + .HasMaxLength(255) + .HasColumnType("character varying(255)") + .HasColumnName("caption") + .HasComment("Название"); + + b.HasKey("Id"); + + b.ToTable("t_well_section_type"); + + b + .HasComment("конструкция секции скважины"); + + b.HasData( + new + { + Id = 1, + Caption = "Пилотный ствол" + }, + new + { + Id = 2, + Caption = "Направление" + }, + new + { + Id = 3, + Caption = "Кондуктор" + }, + new + { + Id = 4, + Caption = "Эксплуатационная колонна" + }, + new + { + Id = 5, + Caption = "Транспортный ствол" + }, + new + { + Id = 6, + Caption = "Хвостовик" + }); + }); + + modelBuilder.Entity("AsbCloudDb.Model.WellType", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id") + .UseIdentityByDefaultColumn(); + + b.Property("Caption") + .HasMaxLength(255) + .HasColumnType("character varying(255)") + .HasColumnName("caption") + .HasComment("Название"); + + b.HasKey("Id"); + + b.ToTable("t_well_type"); + + b + .HasComment("конструкция скважины"); + + b.HasData( + new + { + Id = 1, + Caption = "Наклонно-направленная" + }, + new + { + Id = 2, + Caption = "Горизонтальная" + }); + }); + + modelBuilder.Entity("AsbCloudDb.Model.Cluster", b => + { + b.HasOne("AsbCloudDb.Model.Deposit", "Deposit") + .WithMany("Clusters") + .HasForeignKey("IdDeposit") + .HasConstraintName("t_cluster_t_deposit_id_fk"); + + b.Navigation("Deposit"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.Company", b => + { + b.HasOne("AsbCloudDb.Model.CompanyType", "CompanyType") + .WithMany("Companies") + .HasForeignKey("IdCompanyType") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("CompanyType"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.FileInfo", b => + { + b.HasOne("AsbCloudDb.Model.User", "Author") + .WithMany("Files") + .HasForeignKey("IdAuthor"); + + b.HasOne("AsbCloudDb.Model.FileCategory", "FileCategory") + .WithMany() + .HasForeignKey("IdCategory") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("AsbCloudDb.Model.Well", "Well") + .WithMany() + .HasForeignKey("IdWell") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Author"); + + b.Navigation("FileCategory"); + + b.Navigation("Well"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.Measure", b => + { + b.HasOne("AsbCloudDb.Model.MeasureCategory", "Category") + .WithMany("Measures") + .HasForeignKey("IdCategory") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("AsbCloudDb.Model.Well", "Well") + .WithMany() + .HasForeignKey("IdWell") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Category"); + + b.Navigation("Well"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.RelationCompanyWell", b => + { + b.HasOne("AsbCloudDb.Model.Company", "Company") + .WithMany("RelationCompaniesWells") + .HasForeignKey("IdCompany") + .HasConstraintName("t_relation_company_well_t_company_id_fk") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("AsbCloudDb.Model.Well", "Well") + .WithMany("RelationCompaniesWells") + .HasForeignKey("IdWell") + .HasConstraintName("t_relation_company_well_t_well_id_fk") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Company"); + + b.Navigation("Well"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.ReportProperty", b => + { + b.HasOne("AsbCloudDb.Model.FileInfo", "File") + .WithMany() + .HasForeignKey("IdFile") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("AsbCloudDb.Model.Well", "Well") + .WithMany() + .HasForeignKey("IdWell") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("File"); + + b.Navigation("Well"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.TelemetryAnalysis", b => + { + b.HasOne("AsbCloudDb.Model.WellOperationCategory", "Operation") + .WithMany("Analysis") + .HasForeignKey("IdOperation") + .HasConstraintName("t_analysis_t_operation_id_fk") + .OnDelete(DeleteBehavior.SetNull) + .IsRequired(); + + b.HasOne("AsbCloudDb.Model.Telemetry", "Telemetry") + .WithMany("Analysis") + .HasForeignKey("IdTelemetry") + .HasConstraintName("t_analysis_t_telemetry_id_fk") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Operation"); + + b.Navigation("Telemetry"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.TelemetryDataSaub", b => + { + b.HasOne("AsbCloudDb.Model.Telemetry", "Telemetry") + .WithMany("DataSaub") + .HasForeignKey("IdTelemetry") + .HasConstraintName("t_telemetry_data_saub_t_telemetry_id_fk") + .IsRequired(); + + b.Navigation("Telemetry"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.TelemetryDataSpin", b => + { + b.HasOne("AsbCloudDb.Model.Telemetry", "Telemetry") + .WithMany("DataSpin") + .HasForeignKey("IdTelemetry") + .HasConstraintName("t_telemetry_data_spin_t_telemetry_id_fk") + .IsRequired(); + + b.Navigation("Telemetry"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.TelemetryEvent", b => + { + b.HasOne("AsbCloudDb.Model.Telemetry", "Telemetry") + .WithMany("Events") + .HasForeignKey("IdTelemetry") + .HasConstraintName("t_event_t_telemetry_id_fk") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Telemetry"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.TelemetryMessage", b => + { + b.HasOne("AsbCloudDb.Model.Telemetry", "Telemetry") + .WithMany("Messages") + .HasForeignKey("IdTelemetry") + .HasConstraintName("t_messages_t_telemetry_id_fk") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Telemetry"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.TelemetryUser", b => + { + b.HasOne("AsbCloudDb.Model.Telemetry", "Telemetry") + .WithMany("Users") + .HasForeignKey("IdTelemetry") + .HasConstraintName("t_telemetry_user_t_telemetry_id_fk") + .IsRequired(); + + b.Navigation("Telemetry"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.User", b => + { + b.HasOne("AsbCloudDb.Model.Company", "Company") + .WithMany("Users") + .HasForeignKey("IdCompany") + .HasConstraintName("t_user_t_company_id_fk"); + + b.HasOne("AsbCloudDb.Model.UserRole", "Role") + .WithMany("Users") + .HasForeignKey("IdRole"); + + b.Navigation("Company"); + + b.Navigation("Role"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.Well", b => + { + b.HasOne("AsbCloudDb.Model.Cluster", "Cluster") + .WithMany("Wells") + .HasForeignKey("IdCluster") + .HasConstraintName("t_well_t_cluster_id_fk"); + + b.HasOne("AsbCloudDb.Model.Telemetry", "Telemetry") + .WithOne("Well") + .HasForeignKey("AsbCloudDb.Model.Well", "IdTelemetry") + .HasConstraintName("t_well_t_telemetry_id_fk"); + + b.HasOne("AsbCloudDb.Model.WellType", "WellType") + .WithMany("Wells") + .HasForeignKey("IdWellType"); + + b.Navigation("Cluster"); + + b.Navigation("Telemetry"); + + b.Navigation("WellType"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.WellOperation", b => + { + b.HasOne("AsbCloudDb.Model.WellOperationCategory", "OperationCategory") + .WithMany() + .HasForeignKey("IdCategory") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("AsbCloudDb.Model.Well", "Well") + .WithMany("WellOperations") + .HasForeignKey("IdWell") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("AsbCloudDb.Model.WellSectionType", "WellSectionType") + .WithMany("WellOperations") + .HasForeignKey("IdWellSectionType") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("OperationCategory"); + + b.Navigation("Well"); + + b.Navigation("WellSectionType"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.Cluster", b => + { + b.Navigation("Wells"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.Company", b => + { + b.Navigation("RelationCompaniesWells"); + + b.Navigation("Users"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.CompanyType", b => + { + b.Navigation("Companies"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.Deposit", b => + { + b.Navigation("Clusters"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.MeasureCategory", b => + { + b.Navigation("Measures"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.Telemetry", b => + { + b.Navigation("Analysis"); + + b.Navigation("DataSaub"); + + b.Navigation("DataSpin"); + + b.Navigation("Events"); + + b.Navigation("Messages"); + + b.Navigation("Users"); + + b.Navigation("Well"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.User", b => + { + b.Navigation("Files"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.UserRole", b => + { + b.Navigation("Users"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.Well", b => + { + b.Navigation("RelationCompaniesWells"); + + b.Navigation("WellOperations"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.WellOperationCategory", b => + { + b.Navigation("Analysis"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.WellSectionType", b => + { + b.Navigation("WellOperations"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.WellType", b => + { + b.Navigation("Wells"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/AsbCloudDb/Migrations/20210916094617_AddWellDepthToMessage.cs b/AsbCloudDb/Migrations/20210916094617_AddWellDepthToMessage.cs new file mode 100644 index 00000000..d11a2a70 --- /dev/null +++ b/AsbCloudDb/Migrations/20210916094617_AddWellDepthToMessage.cs @@ -0,0 +1,24 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +namespace AsbCloudDb.Migrations +{ + public partial class AddWellDepthToMessage : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "well_depth", + table: "t_telemetry_message", + type: "double precision", + nullable: false, + defaultValue: 0.0); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "well_depth", + table: "t_telemetry_message"); + } + } +} diff --git a/AsbCloudDb/Migrations/AsbCloudDbContextModelSnapshot.cs b/AsbCloudDb/Migrations/AsbCloudDbContextModelSnapshot.cs index 37b42215..38840fdf 100644 --- a/AsbCloudDb/Migrations/AsbCloudDbContextModelSnapshot.cs +++ b/AsbCloudDb/Migrations/AsbCloudDbContextModelSnapshot.cs @@ -1225,6 +1225,10 @@ namespace AsbCloudDb.Migrations .HasColumnName("id_telemetry_user") .HasComment("Пользователь панели отправляющей телеметрию. не пользователь облака."); + b.Property("WellDepth") + .HasColumnType("double precision") + .HasColumnName("well_depth"); + b.HasKey("Id"); b.HasIndex("IdTelemetry"); @@ -2161,7 +2165,7 @@ namespace AsbCloudDb.Migrations b.HasOne("AsbCloudDb.Model.Telemetry", "Telemetry") .WithMany("DataSaub") .HasForeignKey("IdTelemetry") - .HasConstraintName("t_data_saub_t_telemetry_id_fk") + .HasConstraintName("t_telemetry_data_saub_t_telemetry_id_fk") .IsRequired(); b.Navigation("Telemetry"); @@ -2172,7 +2176,7 @@ namespace AsbCloudDb.Migrations b.HasOne("AsbCloudDb.Model.Telemetry", "Telemetry") .WithMany("DataSpin") .HasForeignKey("IdTelemetry") - .HasConstraintName("t_data_spin_t_telemetry_id_fk") + .HasConstraintName("t_telemetry_data_spin_t_telemetry_id_fk") .IsRequired(); b.Navigation("Telemetry"); diff --git a/AsbCloudDb/Model/AsbCloudDbContext.cs b/AsbCloudDb/Model/AsbCloudDbContext.cs index 59d178ea..c79bf892 100644 --- a/AsbCloudDb/Model/AsbCloudDbContext.cs +++ b/AsbCloudDb/Model/AsbCloudDbContext.cs @@ -362,7 +362,7 @@ namespace AsbCloudDb.Model public async Task<(DateTime From, DateTime To)> GetDatesRangeAsync(int idTelemetry, CancellationToken token = default) - where TEntity : class, IIdTelemetryDate + where TEntity : class, ITelemetryData { var dbSet = Set(); diff --git a/AsbCloudDb/Model/IAsbCloudDbContext.cs b/AsbCloudDb/Model/IAsbCloudDbContext.cs index 3a5cd1d8..99fc54d5 100644 --- a/AsbCloudDb/Model/IAsbCloudDbContext.cs +++ b/AsbCloudDb/Model/IAsbCloudDbContext.cs @@ -41,7 +41,7 @@ namespace AsbCloudDb.Model IQueryable GetWellsForCompany(int idCompany); IQueryable GetUsersByLogin(string login); - Task<(DateTime From, DateTime To)> GetDatesRangeAsync(int idTelemetry, CancellationToken token) where T : class, IIdTelemetryDate; + Task<(DateTime From, DateTime To)> GetDatesRangeAsync(int idTelemetry, CancellationToken token) where T : class, ITelemetryData; Task> GetDepthToIntervalAsync(int telemetryId, int intervalHoursTimestamp, int workStartTimestamp, double timezoneOffset, CancellationToken token); Task CreatePartitionAsync(string propertyName, int id, CancellationToken token = default) where TEntity : class; diff --git a/AsbCloudDb/Model/IId.cs b/AsbCloudDb/Model/IId.cs index 0dda384d..8225abc4 100644 --- a/AsbCloudDb/Model/IId.cs +++ b/AsbCloudDb/Model/IId.cs @@ -2,6 +2,6 @@ { public interface IId { - public int Id { get; } + public int Id { get; set; } } } diff --git a/AsbCloudDb/Model/IIdTelemetryDate.cs b/AsbCloudDb/Model/ITelemetryData.cs similarity index 76% rename from AsbCloudDb/Model/IIdTelemetryDate.cs rename to AsbCloudDb/Model/ITelemetryData.cs index 61fb9dab..20008b60 100644 --- a/AsbCloudDb/Model/IIdTelemetryDate.cs +++ b/AsbCloudDb/Model/ITelemetryData.cs @@ -2,7 +2,7 @@ namespace AsbCloudDb.Model { - public interface IIdTelemetryDate + public interface ITelemetryData: IId { int IdTelemetry { get; set; } DateTime Date { get; set; } diff --git a/AsbCloudDb/Model/TelemetryDataSaub.cs b/AsbCloudDb/Model/TelemetryDataSaub.cs index bddf970f..7ee217f6 100644 --- a/AsbCloudDb/Model/TelemetryDataSaub.cs +++ b/AsbCloudDb/Model/TelemetryDataSaub.cs @@ -9,7 +9,7 @@ using System.Text.Json.Serialization; namespace AsbCloudDb.Model { [Table("t_telemetry_data_saub"), Comment("набор основных данных по SAUB")] - public partial class TelemetryDataSaub : IId, IIdTelemetryDate + public partial class TelemetryDataSaub : ITelemetryData { [Key] [Column("id")] diff --git a/AsbCloudDb/Model/TelemetryDataSpin.cs b/AsbCloudDb/Model/TelemetryDataSpin.cs index c59d7b30..923fb8a2 100644 --- a/AsbCloudDb/Model/TelemetryDataSpin.cs +++ b/AsbCloudDb/Model/TelemetryDataSpin.cs @@ -7,7 +7,7 @@ using System.Text.Json.Serialization; namespace AsbCloudDb.Model { [Table("t_telemetry_data_spin"), Comment("набор основных данных по SpinMaster")] - public class TelemetryDataSpin + public class TelemetryDataSpin: ITelemetryData { [Key] [Column("id")] diff --git a/AsbCloudDb/Model/TelemetryMessage.cs b/AsbCloudDb/Model/TelemetryMessage.cs index 431159c3..af1aa8b2 100644 --- a/AsbCloudDb/Model/TelemetryMessage.cs +++ b/AsbCloudDb/Model/TelemetryMessage.cs @@ -8,7 +8,7 @@ using System.ComponentModel.DataAnnotations.Schema; namespace AsbCloudDb.Model { [Table("t_telemetry_message"), Comment("Сообщения на буровых")] - public partial class TelemetryMessage : IId, IIdTelemetryDate + public partial class TelemetryMessage : IId, ITelemetryData { [Key] [Column("id")] @@ -26,6 +26,9 @@ namespace AsbCloudDb.Model [Column("date", TypeName = "timestamp with time zone")] public DateTime Date { get; set; } + [Column("well_depth")] + public double WellDepth { get; set; } + [Column("arg0"), Comment("Аргумент №0 для вставки в шаблон сообщения")] [StringLength(255)] public string Arg0 { get; set; } diff --git a/AsbCloudInfrastructure/DependencyInjection.cs b/AsbCloudInfrastructure/DependencyInjection.cs index a3d1c356..ea36bfc2 100644 --- a/AsbCloudInfrastructure/DependencyInjection.cs +++ b/AsbCloudInfrastructure/DependencyInjection.cs @@ -50,6 +50,10 @@ namespace AsbCloudInfrastructure services.AddTransient, CrudServiceBase>(); services.AddTransient, CrudServiceBase>(); + // TelemetryData services + services.AddTransient, TelemetryDataSaubService>(); + services.AddTransient, TelemetryDataSpinService>(); + return services; } } diff --git a/AsbCloudInfrastructure/Services/CrudServiceBase.cs b/AsbCloudInfrastructure/Services/CrudServiceBase.cs index c8e7f69c..395a61f4 100644 --- a/AsbCloudInfrastructure/Services/CrudServiceBase.cs +++ b/AsbCloudInfrastructure/Services/CrudServiceBase.cs @@ -11,9 +11,9 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Services { - public class CrudServiceBase : ICrudService + public class CrudServiceBase : ICrudService, IConverter + where TDto : AsbCloudApp.Data.IId where TModel : class, AsbCloudDb.Model.IId - where Tdto : AsbCloudApp.Data.IId { protected readonly IAsbCloudDbContext context; protected readonly DbSet dbSet; @@ -26,14 +26,14 @@ namespace AsbCloudInfrastructure.Services dbSet = context.Set(); } - public virtual async Task> GetPageAsync(int skip = 0, int take = 32, CancellationToken token = default) + public virtual async Task> GetPageAsync(int skip = 0, int take = 32, CancellationToken token = default) { var query = GetQueryWithIncludes(); var count = await query .CountAsync(token) .ConfigureAwait(false); - var container = new PaginationContainer + var container = new PaginationContainer { Skip = skip, Take = take, @@ -54,7 +54,7 @@ namespace AsbCloudInfrastructure.Services return container; } - public virtual async Task> GetAllAsync(CancellationToken token = default) + public virtual async Task> GetAllAsync(CancellationToken token = default) { var query = GetQueryWithIncludes(); var entities = await query @@ -63,7 +63,7 @@ namespace AsbCloudInfrastructure.Services return dto; } - public virtual async Task GetAsync(int id, CancellationToken token = default) + public virtual async Task GetAsync(int id, CancellationToken token = default) { var query = GetQueryWithIncludes(); var entity = await query @@ -72,21 +72,21 @@ namespace AsbCloudInfrastructure.Services return dto; } - public virtual Task InsertAsync(Tdto item, CancellationToken token = default) + public virtual Task InsertAsync(TDto item, CancellationToken token = default) { var entity = Convert(item); dbSet.Add(entity); return context.SaveChangesAsync(token); } - public virtual Task InsertRangeAsync(IEnumerable items, CancellationToken token = default) + public virtual Task InsertRangeAsync(IEnumerable items, CancellationToken token = default) { var entities = items.Select(i => Convert(i)); dbSet.AddRange(entities); return context.SaveChangesAsync(token); } - public virtual Task UpdateAsync(int id, Tdto item, CancellationToken token = default) + public virtual Task UpdateAsync(int id, TDto item, CancellationToken token = default) { var entity = Convert(item); dbSet.Update(entity); @@ -112,9 +112,9 @@ namespace AsbCloudInfrastructure.Services return context.SaveChangesAsync(token); } - public virtual Tdto Convert(TModel src) => src.Adapt(); + public virtual TDto Convert(TModel src) => src.Adapt(); - public virtual TModel Convert(Tdto src) => src.Adapt(); + public virtual TModel Convert(TDto src) => src.Adapt(); private IQueryable GetQueryWithIncludes() { diff --git a/AsbCloudInfrastructure/Services/DataService.cs b/AsbCloudInfrastructure/Services/DataService.cs index 01153242..6af94f90 100644 --- a/AsbCloudInfrastructure/Services/DataService.cs +++ b/AsbCloudInfrastructure/Services/DataService.cs @@ -12,6 +12,7 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Services { + //TODO: delete this public class DataService : IDataService { private readonly IAsbCloudDbContext db; diff --git a/AsbCloudInfrastructure/Services/IConverter.cs b/AsbCloudInfrastructure/Services/IConverter.cs new file mode 100644 index 00000000..a1c6fd54 --- /dev/null +++ b/AsbCloudInfrastructure/Services/IConverter.cs @@ -0,0 +1,8 @@ +namespace AsbCloudInfrastructure.Services +{ + public interface IConverter + { + TModel Convert(TDto src); + TDto Convert(TModel src); + } +} \ No newline at end of file diff --git a/AsbCloudInfrastructure/Services/TelemetryDataSaubService.cs b/AsbCloudInfrastructure/Services/TelemetryDataSaubService.cs new file mode 100644 index 00000000..f29fae45 --- /dev/null +++ b/AsbCloudInfrastructure/Services/TelemetryDataSaubService.cs @@ -0,0 +1,36 @@ +using AsbCloudApp.Data; +using AsbCloudApp.Services; +using AsbCloudDb.Model; +using AsbCloudInfrastructure.Services.Cache; +using Mapster; + +namespace AsbCloudInfrastructure.Services +{ + public class TelemetryDataSaubService: TelemetryDataService + { + public TelemetryDataSaubService( + IAsbCloudDbContext db, + ITelemetryService telemetryService, + CacheDb cacheDb) + :base(db, telemetryService, cacheDb) + {} + + public override TelemetryDataSaub Convert(TelemetryDataSaubDto src) + { + var entity = src.Adapt(); + var telemetryUser = cacheTelemetryUsers + .FirstOrDefault(u => u.IdTelemetry == src.IdTelemetry && (u.Name == src.User || u.Surname == src.User)); + entity.IdUser = telemetryUser.IdUser; + return entity; + } + + public override TelemetryDataSaubDto Convert(TelemetryDataSaub src) + { + var dto = src.Adapt(); + var telemetryUser = cacheTelemetryUsers + .FirstOrDefault(u => u.IdTelemetry == src.IdTelemetry && u.IdUser == src.IdUser); + dto.User = telemetryUser.MakeDisplayName(); + return dto; + } + } +} diff --git a/AsbCloudInfrastructure/Services/TelemetryDataService.cs b/AsbCloudInfrastructure/Services/TelemetryDataService.cs new file mode 100644 index 00000000..568fd352 --- /dev/null +++ b/AsbCloudInfrastructure/Services/TelemetryDataService.cs @@ -0,0 +1,137 @@ +using AsbCloudApp.Data; +using AsbCloudApp.Services; +using AsbCloudDb.Model; +using AsbCloudInfrastructure.Services.Cache; +using Microsoft.EntityFrameworkCore; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace AsbCloudInfrastructure.Services +{ + public abstract class TelemetryDataService : ITelemetryDataService, IConverter + where TDto : AsbCloudApp.Data.ITelemetryData + where TModel : class, AsbCloudDb.Model.ITelemetryData + { + private readonly IAsbCloudDbContext db; + private readonly ITelemetryService telemetryService; + + protected readonly CacheTable cacheTelemetry; + protected readonly CacheTable cacheTelemetryUsers; + protected readonly CacheTable cacheWells; + + public TelemetryDataService( + IAsbCloudDbContext db, + ITelemetryService telemetryService, + CacheDb cacheDb) + { + this.db = db; + this.telemetryService = telemetryService; + + cacheTelemetry = cacheDb.GetCachedTable((AsbCloudDbContext)db); + cacheTelemetryUsers = cacheDb.GetCachedTable((AsbCloudDbContext)db); + cacheWells = cacheDb.GetCachedTable((AsbCloudDbContext)db); + } + + public virtual async Task UpdateDataAsync(string uid, IEnumerable dtos, + CancellationToken token = default) + { + if (dtos == default || !dtos.Any()) + return 0; + + var idTelemetry = telemetryService.GetOrCreateTemetryIdByUid(uid); + var dtoMinDate = dtos.Min(d => d.Date); + var dtoMaxDate = dtos.Max(d => d.Date); + var dataSet = db.Set(); + + var oldData = await (from d in dataSet + where d.IdTelemetry == idTelemetry + && d.Date > dtoMinDate + && d.Date < dtoMaxDate + select d) + .AsNoTracking() + .ToListAsync(token) + .ConfigureAwait(false); + + if (oldData.Any()) + { + dataSet.RemoveRange(oldData); + await db.SaveChangesAsync(token).ConfigureAwait(false); + } + + foreach (var dto in dtos) + { + dto.IdTelemetry = idTelemetry; + var data = Convert(dto); + data.Id = 0; + dataSet.Add(data); + } + + return await db.SaveChangesAsync(token).ConfigureAwait(false); + } + + public virtual async Task> GetAsync(int idWell, + DateTime dateBegin = default, double intervalSec = 600d, + int approxPointsCount = 1024, CancellationToken token = default) + { + var well = cacheWells.FirstOrDefault(w => w.Id == idWell); + if (well is null) + return default; + + var telemetry = cacheTelemetry.FirstOrDefault(t => t.Id == well.IdTelemetry); + if (telemetry is null) + return default; + + if (dateBegin == default) + dateBegin = DateTime.Now.AddSeconds(-intervalSec); + + var datEnd = dateBegin.AddSeconds(intervalSec); + var dbSet = db.Set(); + + var query = from data in dbSet + where data.IdTelemetry == telemetry.Id + && data.Date >= dateBegin && data.Date < datEnd + select data; + + var fullDataCount = await query.CountAsync(token) + .ConfigureAwait(false); + + if (fullDataCount == 0) + return default; + + if (fullDataCount > 1.75 * approxPointsCount) + { + var m = (int)Math.Round(1d * fullDataCount / approxPointsCount); + if (m > 1) + query = query.Where(d => d.Id % m == 0); + } + + var entities = await query.AsNoTracking() + .ToListAsync(token).ConfigureAwait(false); + + var dtos = entities.Select(e => Convert(e)); + + return dtos; + } + + public virtual async Task GetDataDatesRangeAsync(int idWell, + CancellationToken token = default) + { + var telemetryId = telemetryService.GetIdTelemetryByIdWell(idWell); + if (telemetryId is null) + return null; + + var (From, To) = await db.GetDatesRangeAsync((int)telemetryId, token) + .ConfigureAwait(false); + + return new DatesRangeDto { From = From, To = To }; + } + + public abstract TDto Convert(TModel src); + + public abstract TModel Convert(TDto src); + } +} diff --git a/AsbCloudInfrastructure/Services/TelemetryDataSpinService.cs b/AsbCloudInfrastructure/Services/TelemetryDataSpinService.cs new file mode 100644 index 00000000..ebbe306a --- /dev/null +++ b/AsbCloudInfrastructure/Services/TelemetryDataSpinService.cs @@ -0,0 +1,30 @@ +using AsbCloudApp.Data; +using AsbCloudApp.Services; +using AsbCloudDb.Model; +using AsbCloudInfrastructure.Services.Cache; +using Mapster; + +namespace AsbCloudInfrastructure.Services +{ + public class TelemetryDataSpinService : TelemetryDataService + { + public TelemetryDataSpinService( + IAsbCloudDbContext db, + ITelemetryService telemetryService, + CacheDb cacheDb) + : base(db, telemetryService, cacheDb) + { } + + public override TelemetryDataSpin Convert(TelemetryDataSpinDto src) + { + var entity = src.Adapt(); + return entity; + } + + public override TelemetryDataSpinDto Convert(TelemetryDataSpin src) + { + var dto = src.Adapt(); + return dto; + } + } +} diff --git a/AsbCloudInfrastructure/Services/TelemetryService.cs b/AsbCloudInfrastructure/Services/TelemetryService.cs index d3d495b2..5e14c310 100644 --- a/AsbCloudInfrastructure/Services/TelemetryService.cs +++ b/AsbCloudInfrastructure/Services/TelemetryService.cs @@ -24,7 +24,7 @@ namespace AsbCloudInfrastructure.Services => GetWellByTelemetryUid(uid)?.Id; public double GetTimezoneOffsetByTelemetryId(int idTelemetry) => - cacheTelemetry.FirstOrDefault(t => t.Id == idTelemetry).Info.TimeZoneOffsetTotalHours; + cacheTelemetry.FirstOrDefault(t => t.Id == idTelemetry).Info?.TimeZoneOffsetTotalHours??0d; public void UpdateInfo(string uid, TelemetryInfoDto info) { diff --git a/AsbCloudInfrastructure/Services/WellOperationService.cs b/AsbCloudInfrastructure/Services/WellOperationService.cs index 2be323fd..5f55f171 100644 --- a/AsbCloudInfrastructure/Services/WellOperationService.cs +++ b/AsbCloudInfrastructure/Services/WellOperationService.cs @@ -124,7 +124,7 @@ namespace AsbCloudInfrastructure.Services foreach (var operationDto in wellOperationDtos) { var entity = operationDto.Adapt(); - entity.Id = default; + entity.Id = 0; entity.IdWell = idWell; context.WellOperations.Add(entity); } diff --git a/AsbCloudInfrastructure/Services/_CachedCrudService.cs b/AsbCloudInfrastructure/Services/_CachedCrudService.cs index 8571e201..ffb4545a 100644 --- a/AsbCloudInfrastructure/Services/_CachedCrudService.cs +++ b/AsbCloudInfrastructure/Services/_CachedCrudService.cs @@ -1,4 +1,5 @@ using AsbCloudApp.Data; +using AsbCloudApp.Services; using AsbCloudDb.Model; using AsbCloudInfrastructure.Services.Cache; using Mapster; diff --git a/AsbCloudWebApi/Controllers/TelemetryController.cs b/AsbCloudWebApi/Controllers/TelemetryController.cs index 709db782..a1767274 100644 --- a/AsbCloudWebApi/Controllers/TelemetryController.cs +++ b/AsbCloudWebApi/Controllers/TelemetryController.cs @@ -58,6 +58,7 @@ namespace AsbCloudWebApi.Controllers return Ok(); } + //TODO: remove when panels update will be done. /// /// Принимает данные от разных систем по скважине /// @@ -75,7 +76,7 @@ namespace AsbCloudWebApi.Controllers if (idWell != null && dtos.Any()) await Task.Run(() => telemetryHubContext.Clients.Group($"well_{idWell}") - .SendAsync(nameof(ITelemetryHubClient.ReceiveDataSaub), dtos), token).ConfigureAwait(false); + .SendAsync("ReceiveDataSaub", dtos), token).ConfigureAwait(false); telemetryTracker.SaveRequestDate(uid); return Ok(); @@ -98,7 +99,7 @@ namespace AsbCloudWebApi.Controllers if (dtos.Any()) await Task.Run(() => telemetryHubContext.Clients.Group($"well_{idWell}") - .SendAsync(nameof(ITelemetryHubClient.ReceiveMessages), dtos), token).ConfigureAwait(false); + .SendAsync("ReceiveMessages", dtos), token).ConfigureAwait(false); telemetryTracker.SaveRequestDate(uid); return Ok(); diff --git a/AsbCloudWebApi/Controllers/TelemetryDataBaseController.cs b/AsbCloudWebApi/Controllers/TelemetryDataBaseController.cs index 91a65af2..c33cf30a 100644 --- a/AsbCloudWebApi/Controllers/TelemetryDataBaseController.cs +++ b/AsbCloudWebApi/Controllers/TelemetryDataBaseController.cs @@ -1,8 +1,12 @@ using AsbCloudApp.Data; +using AsbCloudApp.Services; +using AsbCloudWebApi.SignalR; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.SignalR; using System; using System.Collections.Generic; +using System.Linq; using System.Threading; using System.Threading.Tasks; @@ -11,8 +15,30 @@ namespace AsbCloudWebApi.Controllers [ApiController] [Authorize] [Route("api/[controller]")] - public abstract class TelemetryDataBaseController : ControllerBase + public abstract class TelemetryDataBaseController : ControllerBase + where TDto: ITelemetryData { + private readonly ITelemetryTracker telemetryTracker; + private readonly ITelemetryService telemetryService; + private readonly ITelemetryDataService telemetryDataService; + private readonly IWellService wellService; + private readonly IHubContext telemetryHubContext; + + public string SirnalRMethodGetDataName { get; protected set; } = "ReceiveData"; + + public TelemetryDataBaseController( + ITelemetryTracker telemetryTracker, + ITelemetryService telemetryService, + ITelemetryDataService telemetryDataService, + IWellService wellService, + IHubContext telemetryHubContext) + { + this.telemetryTracker = telemetryTracker; + this.telemetryService = telemetryService; + this.telemetryDataService = telemetryDataService; + this.wellService = wellService; + this.telemetryHubContext = telemetryHubContext; + } /// /// Принимает данные от разных систем по скважине @@ -23,17 +49,18 @@ namespace AsbCloudWebApi.Controllers /// [HttpPost] [Route("{uid}")] - public virtual async Task PostDataAsync(string uid, [FromBody] IEnumerable dtos, + [AllowAnonymous] + public virtual async Task PostDataAsync(string uid, [FromBody] IEnumerable dtos, CancellationToken token = default) { - //var idWell = telemetryService.GetidWellByTelemetryUid(uid); - //await DataService.UpdateDataAsync(uid, dtos, token).ConfigureAwait(false); + var idWell = telemetryService.GetidWellByTelemetryUid(uid); + await telemetryDataService.UpdateDataAsync(uid, dtos, token).ConfigureAwait(false); - //if (idWell != null && dtos.Any()) - // await Task.Run(() => telemetryHubContext.Clients.Group($"well_{idWell}") - // .SendAsync(nameof(ITelemetryHubClient.ReceiveDataSaub), dtos), token).ConfigureAwait(false); + if (idWell != null && dtos.Any()) + await Task.Run(() => telemetryHubContext.Clients.Group($"well_{idWell}") + .SendAsync(SirnalRMethodGetDataName, dtos), token).ConfigureAwait(false); - //telemetryTracker.SaveRequestDate(uid); + telemetryTracker.SaveRequestDate(uid); return Ok(); } @@ -52,13 +79,13 @@ namespace AsbCloudWebApi.Controllers public virtual async Task GetDataAsync(int idWell, DateTime begin = default, int intervalSec = 600, int approxPointsCount = 1024, CancellationToken token = default) { - //if (begin == default) - // begin = DateTime.Now.AddSeconds(-intervalSec); - //var content = await telemetryDataService.GetAsync(idWell, begin, - // intervalSec, approxPointsCount, token).ConfigureAwait(false); + if (begin == default) + begin = DateTime.Now.AddSeconds(-intervalSec); + var content = await telemetryDataService.GetAsync(idWell, begin, + intervalSec, approxPointsCount, token).ConfigureAwait(false); - //if (content is null || !content.Any()) - // return NoContent(); + if (content is null || !content.Any()) + return NoContent(); return Ok(null); } @@ -75,19 +102,19 @@ namespace AsbCloudWebApi.Controllers public virtual async Task GetDataDatesRangeAsync(int idWell, CancellationToken token = default) { - //int? idCompany = User.GetCompanyId(); + int? idCompany = User.GetCompanyId(); - //if (idCompany is null) - // return Forbid(); + if (idCompany is null) + return Forbid(); - //bool isCompanyOwnsWell = await wellService.IsCompanyInvolvedInWellAsync((int)idCompany, - // idWell, token).ConfigureAwait(false); + bool isCompanyOwnsWell = await wellService.IsCompanyInvolvedInWellAsync((int)idCompany, + idWell, token).ConfigureAwait(false); - //if (!isCompanyOwnsWell) - // return Forbid(); + if (!isCompanyOwnsWell) + return Forbid(); - //DatesRangeDto dataDatesRange = await telemetryDataService.GetDataDatesRangeAsync(idWell, - // token).ConfigureAwait(false); + DatesRangeDto dataDatesRange = await telemetryDataService.GetDataDatesRangeAsync(idWell, + token).ConfigureAwait(false); return Ok(null); } diff --git a/AsbCloudWebApi/Controllers/TelemetryDataSaub.cs b/AsbCloudWebApi/Controllers/TelemetryDataSaub.cs deleted file mode 100644 index a8ac9838..00000000 --- a/AsbCloudWebApi/Controllers/TelemetryDataSaub.cs +++ /dev/null @@ -1,16 +0,0 @@ -using AsbCloudApp.Data; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace AsbCloudWebApi.Controllers -{ - [Route("api/[controller]")] - [ApiController] - public class TelemetryDataSaub : TelemetryDataBaseController - { - } -} diff --git a/AsbCloudWebApi/Controllers/TelemetryDataSaubController.cs b/AsbCloudWebApi/Controllers/TelemetryDataSaubController.cs new file mode 100644 index 00000000..bd704681 --- /dev/null +++ b/AsbCloudWebApi/Controllers/TelemetryDataSaubController.cs @@ -0,0 +1,29 @@ +using AsbCloudApp.Data; +using AsbCloudApp.Services; +using AsbCloudWebApi.SignalR; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.SignalR; + +namespace AsbCloudWebApi.Controllers +{ + [Route("api/[controller]")] + [ApiController] + public class TelemetryDataSaubController : TelemetryDataBaseController + { + public TelemetryDataSaubController( + ITelemetryTracker telemetryTracker, + ITelemetryService telemetryService, + ITelemetryDataService telemetryDataService, + IWellService wellService, + IHubContext telemetryHubContext) + : base( + telemetryTracker, + telemetryService, + telemetryDataService, + wellService, + telemetryHubContext) + { + SirnalRMethodGetDataName = "ReceiveDataSaub"; + } + } +} diff --git a/AsbCloudWebApi/Controllers/TelemetryDataSpin.cs b/AsbCloudWebApi/Controllers/TelemetryDataSpin.cs deleted file mode 100644 index 179fb52a..00000000 --- a/AsbCloudWebApi/Controllers/TelemetryDataSpin.cs +++ /dev/null @@ -1,11 +0,0 @@ -using AsbCloudApp.Data; -using Microsoft.AspNetCore.Mvc; - -namespace AsbCloudWebApi.Controllers -{ - [Route("api/[controller]")] - [ApiController] - public class TelemetryDataSpin : TelemetryDataBaseController - { - } -} diff --git a/AsbCloudWebApi/Controllers/TelemetryDataSpinController.cs b/AsbCloudWebApi/Controllers/TelemetryDataSpinController.cs new file mode 100644 index 00000000..a1c132e4 --- /dev/null +++ b/AsbCloudWebApi/Controllers/TelemetryDataSpinController.cs @@ -0,0 +1,29 @@ +using AsbCloudApp.Data; +using AsbCloudApp.Services; +using AsbCloudWebApi.SignalR; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.SignalR; + +namespace AsbCloudWebApi.Controllers +{ + [Route("api/[controller]")] + [ApiController] + public class TelemetryDataSpinController : TelemetryDataBaseController + { + public TelemetryDataSpinController( + ITelemetryTracker telemetryTracker, + ITelemetryService telemetryService, + ITelemetryDataService telemetryDataService, + IWellService wellService, + IHubContext telemetryHubContext) + : base( + telemetryTracker, + telemetryService, + telemetryDataService, + wellService, + telemetryHubContext) + { + SirnalRMethodGetDataName = "ReceiveDataSpin"; + } + } +} diff --git a/AsbCloudWebApi/SignalR/ITelemetryHubClient.cs b/AsbCloudWebApi/SignalR/ITelemetryHubClient.cs deleted file mode 100644 index a568279a..00000000 --- a/AsbCloudWebApi/SignalR/ITelemetryHubClient.cs +++ /dev/null @@ -1,13 +0,0 @@ -using AsbCloudApp.Data; -using System.Collections.Generic; -using System.Threading.Tasks; - -namespace AsbCloudWebApi.SignalR -{ - public interface ITelemetryHubClient - { - Task ReceiveDataSaub(IEnumerable dtos); - - Task ReceiveMessages(IEnumerable dtos); - } -} diff --git a/AsbCloudWebApi/SignalR/TelemetryHub.cs b/AsbCloudWebApi/SignalR/TelemetryHub.cs index e67417c3..698e7b37 100644 --- a/AsbCloudWebApi/SignalR/TelemetryHub.cs +++ b/AsbCloudWebApi/SignalR/TelemetryHub.cs @@ -10,16 +10,12 @@ namespace AsbCloudWebApi.SignalR // https://docs.microsoft.com/ru-ru/aspnet/core/signalr/introduction?view=aspnetcore-5.0 [Authorize] - public class TelemetryHub : Hub + public class TelemetryHub : Hub { public Task AddToGroup(string groupName) => Groups.AddToGroupAsync(Context.ConnectionId, groupName.ToString()); public Task RemoveFromGroup(string groupName) => Groups.RemoveFromGroupAsync(Context.ConnectionId, groupName); - - public Task SendDataSaub(string groupName, IEnumerable data) - => Clients.Group(groupName).ReceiveDataSaub(data); - } } \ No newline at end of file diff --git a/AsbCloudWebApi/Startup.cs b/AsbCloudWebApi/Startup.cs index 9e37481e..8e4be2c1 100644 --- a/AsbCloudWebApi/Startup.cs +++ b/AsbCloudWebApi/Startup.cs @@ -10,11 +10,6 @@ namespace AsbCloudWebApi { public class Startup { - private static readonly System.Text.Json.JsonSerializerOptions jsonSerializerOptions = new System.Text.Json.JsonSerializerOptions - { - NumberHandling = System.Text.Json.Serialization.JsonNumberHandling.AllowNamedFloatingPointLiterals, - }; - public Startup(IConfiguration configuration) { Configuration = configuration; @@ -27,9 +22,8 @@ namespace AsbCloudWebApi services.AddControllers() .AddJsonOptions(new System.Action(opts => { - opts.JsonSerializerOptions.NumberHandling = System.Text.Json.Serialization.JsonNumberHandling.AllowNamedFloatingPointLiterals; - } - )); + opts.JsonSerializerOptions.NumberHandling = System.Text.Json.Serialization.JsonNumberHandling.AllowNamedFloatingPointLiterals | System.Text.Json.Serialization.JsonNumberHandling.AllowReadingFromString; + })); services.AddSwagger(); diff --git a/AsbCloudWebApi/wwwroot/asset-manifest.json b/AsbCloudWebApi/wwwroot/asset-manifest.json index cc3ee1d2..f0d7b068 100644 --- a/AsbCloudWebApi/wwwroot/asset-manifest.json +++ b/AsbCloudWebApi/wwwroot/asset-manifest.json @@ -1,23 +1,23 @@ { "files": { "main.css": "/static/css/main.99536867.chunk.css", - "main.js": "/static/js/main.18d0dab1.chunk.js", - "main.js.map": "/static/js/main.18d0dab1.chunk.js.map", - "runtime-main.js": "/static/js/runtime-main.7bbed929.js", - "runtime-main.js.map": "/static/js/runtime-main.7bbed929.js.map", - "static/js/2.2d4c3e2b.chunk.js": "/static/js/2.2d4c3e2b.chunk.js", - "static/js/2.2d4c3e2b.chunk.js.map": "/static/js/2.2d4c3e2b.chunk.js.map", - "static/js/3.58b81d69.chunk.js": "/static/js/3.58b81d69.chunk.js", - "static/js/3.58b81d69.chunk.js.map": "/static/js/3.58b81d69.chunk.js.map", + "main.js": "/static/js/main.5222c3aa.chunk.js", + "main.js.map": "/static/js/main.5222c3aa.chunk.js.map", + "runtime-main.js": "/static/js/runtime-main.c0bb1130.js", + "runtime-main.js.map": "/static/js/runtime-main.c0bb1130.js.map", + "static/js/2.e07a64f5.chunk.js": "/static/js/2.e07a64f5.chunk.js", + "static/js/2.e07a64f5.chunk.js.map": "/static/js/2.e07a64f5.chunk.js.map", + "static/js/3.ffc36876.chunk.js": "/static/js/3.ffc36876.chunk.js", + "static/js/3.ffc36876.chunk.js.map": "/static/js/3.ffc36876.chunk.js.map", "index.html": "/index.html", "static/css/main.99536867.chunk.css.map": "/static/css/main.99536867.chunk.css.map", - "static/js/2.2d4c3e2b.chunk.js.LICENSE.txt": "/static/js/2.2d4c3e2b.chunk.js.LICENSE.txt", + "static/js/2.e07a64f5.chunk.js.LICENSE.txt": "/static/js/2.e07a64f5.chunk.js.LICENSE.txt", "static/media/pointer.e8df778c.svg": "/static/media/pointer.e8df778c.svg" }, "entrypoints": [ - "static/js/runtime-main.7bbed929.js", - "static/js/2.2d4c3e2b.chunk.js", + "static/js/runtime-main.c0bb1130.js", + "static/js/2.e07a64f5.chunk.js", "static/css/main.99536867.chunk.css", - "static/js/main.18d0dab1.chunk.js" + "static/js/main.5222c3aa.chunk.js" ] } \ No newline at end of file diff --git a/AsbCloudWebApi/wwwroot/index.html b/AsbCloudWebApi/wwwroot/index.html index 2dceca13..aaf46e19 100644 --- a/AsbCloudWebApi/wwwroot/index.html +++ b/AsbCloudWebApi/wwwroot/index.html @@ -1 +1 @@ -АСБ Vision
\ No newline at end of file +АСБ Vision
\ No newline at end of file