From 88f9236b8ab28a2b49ba2e2092775abc1eb959ce Mon Sep 17 00:00:00 2001 From: KharchenkoVladimir Date: Tue, 16 Nov 2021 13:14:31 +0500 Subject: [PATCH 1/7] CS2-119: Added Telemetry Timezone object and update timezone functionality --- AsbCloudApp/Data/TelemetryTimeZoneDto.cs | 9 + AsbCloudApp/Services/ITelemetryService.cs | 3 +- ...6080138_Add_Telemetry_TimeZone.Designer.cs | 2768 +++++++++++++++++ .../20211116080138_Add_Telemetry_TimeZone.cs | 25 + .../AsbCloudDbContextModelSnapshot.cs | 5 + AsbCloudDb/Model/Telemetry.cs | 4 +- AsbCloudDb/Model/TelemetryTimeZone.cs | 9 + .../Services/TelemetryService.cs | 28 +- .../Controllers/TelemetryController.cs | 24 +- 9 files changed, 2868 insertions(+), 7 deletions(-) create mode 100644 AsbCloudApp/Data/TelemetryTimeZoneDto.cs create mode 100644 AsbCloudDb/Migrations/20211116080138_Add_Telemetry_TimeZone.Designer.cs create mode 100644 AsbCloudDb/Migrations/20211116080138_Add_Telemetry_TimeZone.cs create mode 100644 AsbCloudDb/Model/TelemetryTimeZone.cs diff --git a/AsbCloudApp/Data/TelemetryTimeZoneDto.cs b/AsbCloudApp/Data/TelemetryTimeZoneDto.cs new file mode 100644 index 00000000..ae4b4b9f --- /dev/null +++ b/AsbCloudApp/Data/TelemetryTimeZoneDto.cs @@ -0,0 +1,9 @@ +namespace AsbCloudApp.Data +{ + public class TelemetryTimeZoneDto + { + public double Hours { get; set; } + public string TimeZoneId { get; set; } + public bool IsOverride { get; set; } + } +} \ No newline at end of file diff --git a/AsbCloudApp/Services/ITelemetryService.cs b/AsbCloudApp/Services/ITelemetryService.cs index f94627f9..a8fd483e 100644 --- a/AsbCloudApp/Services/ITelemetryService.cs +++ b/AsbCloudApp/Services/ITelemetryService.cs @@ -11,7 +11,8 @@ namespace AsbCloudApp.Services int? GetidWellByTelemetryUid(string uid); int GetOrCreateTemetryIdByUid(string uid); double GetTimezoneOffsetByTelemetryId(int idTelemetry); - void UpdateInfo(string uid, TelemetryInfoDto info); + Task UpdateInfoAsync(string uid, TelemetryInfoDto info, CancellationToken token); + Task UpdateTimeZoneAsync(string uid, TelemetryTimeZoneDto telemetryTimeZoneInfo, CancellationToken token); int? GetIdTelemetryByIdWell(int idWell); int Merge(IEnumerable telemetryIds); IEnumerable<(string Key, int[] Ids)> GetRedundentRemoteUids(); diff --git a/AsbCloudDb/Migrations/20211116080138_Add_Telemetry_TimeZone.Designer.cs b/AsbCloudDb/Migrations/20211116080138_Add_Telemetry_TimeZone.Designer.cs new file mode 100644 index 00000000..0ff12472 --- /dev/null +++ b/AsbCloudDb/Migrations/20211116080138_Add_Telemetry_TimeZone.Designer.cs @@ -0,0 +1,2768 @@ +// +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("20211116080138_Add_Telemetry_TimeZone")] + partial class Add_Telemetry_TimeZone + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasPostgresExtension("adminpack") + .HasAnnotation("Relational:Collation", "Russian_Russia.1251") + .HasAnnotation("Relational:MaxIdentifierLength", 63) + .HasAnnotation("ProductVersion", "5.0.10") + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); + + modelBuilder.Entity("AsbCloudDb.Model.Cluster", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id") + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); + + 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") + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); + + 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") + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); + + 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") + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); + + 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.DrillFlowChart", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id") + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); + + b.Property("AxialLoadMax") + .HasColumnType("double precision") + .HasColumnName("axial_load_max") + .HasComment("Максимальная нагрузка"); + + b.Property("AxialLoadMin") + .HasColumnType("double precision") + .HasColumnName("axial_load_min") + .HasComment("Минимальная нагрузка"); + + b.Property("DepthEnd") + .HasColumnType("double precision") + .HasColumnName("depth_end") + .HasComment("Глубина окончания интервала"); + + b.Property("DepthStart") + .HasColumnType("double precision") + .HasColumnName("depth_start") + .HasComment("Стартовая глубина"); + + b.Property("FlowMax") + .HasColumnType("double precision") + .HasColumnName("flow_max") + .HasComment("Максимальный расход"); + + b.Property("FlowMin") + .HasColumnType("double precision") + .HasColumnName("flow_min") + .HasComment("Минимальный расход"); + + b.Property("IdWell") + .HasColumnType("integer") + .HasColumnName("well_id") + .HasComment("Id скважины"); + + b.Property("IdWellOperationCategory") + .HasColumnType("integer") + .HasColumnName("id_operation_category") + .HasComment("Id типа операции"); + + b.Property("LastUpdate") + .HasColumnType("timestamp without time zone") + .HasColumnName("last_update") + .HasComment("Дата последнего изменения"); + + b.Property("PressureMax") + .HasColumnType("double precision") + .HasColumnName("pressure_max") + .HasComment("Максимальное давление"); + + b.Property("PressureMin") + .HasColumnType("double precision") + .HasColumnName("pressure_min") + .HasComment("Минимальное давление"); + + b.Property("RotorSpeedMax") + .HasColumnType("double precision") + .HasColumnName("rotor_speed_max") + .HasComment("Максимальные обороты на ВСП"); + + b.Property("RotorSpeedMin") + .HasColumnType("double precision") + .HasColumnName("rotor_speed_min") + .HasComment("Минимальные обороты на ВСП"); + + b.Property("RotorTorqueMax") + .HasColumnType("double precision") + .HasColumnName("rotor_torque_max") + .HasComment("Максимальный момент на ВСП"); + + b.Property("RotorTorqueMin") + .HasColumnType("double precision") + .HasColumnName("rotor_torque_min") + .HasComment("Минимальный момент на ВСП"); + + b.HasKey("Id"); + + b.HasIndex("IdWell"); + + b.HasIndex("IdWellOperationCategory"); + + b.ToTable("t_drill_flow_chart"); + + b + .HasComment("Параметры корридоров бурения (диапазоны параметров бурения)"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.DrillParams", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id") + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); + + b.Property("AxialLoadAvg") + .HasColumnType("double precision") + .HasColumnName("axial_load_avg") + .HasComment("Средняя нагрузка"); + + b.Property("AxialLoadMax") + .HasColumnType("double precision") + .HasColumnName("axial_load_max") + .HasComment("Максимальная нагрузка"); + + b.Property("AxialLoadMin") + .HasColumnType("double precision") + .HasColumnName("axial_load_min") + .HasComment("Минимальная нагрузка"); + + b.Property("DepthEnd") + .HasColumnType("double precision") + .HasColumnName("depth_end") + .HasComment("Глубина окончания интервала"); + + b.Property("DepthStart") + .HasColumnType("double precision") + .HasColumnName("depth_start") + .HasComment("Стартовая глубина"); + + b.Property("FlowAvg") + .HasColumnType("double precision") + .HasColumnName("flow_avg") + .HasComment("Средний расход"); + + b.Property("FlowMax") + .HasColumnType("double precision") + .HasColumnName("flow_max") + .HasComment("Максимальный расход"); + + b.Property("FlowMin") + .HasColumnType("double precision") + .HasColumnName("flow_min") + .HasComment("Минимальный расход"); + + b.Property("IdWell") + .HasColumnType("integer") + .HasColumnName("well_id") + .HasComment("Id скважины"); + + b.Property("IdWellSectionType") + .HasColumnType("integer") + .HasColumnName("id_wellsection_type") + .HasComment("Id с типом секции скважины"); + + b.Property("PressureAvg") + .HasColumnType("double precision") + .HasColumnName("pressure_avg") + .HasComment("Среднее давление"); + + b.Property("PressureMax") + .HasColumnType("double precision") + .HasColumnName("pressure_max") + .HasComment("Максимальное давление"); + + b.Property("PressureMin") + .HasColumnType("double precision") + .HasColumnName("pressure_min") + .HasComment("Минимальное давление"); + + b.Property("RotorSpeedAvg") + .HasColumnType("double precision") + .HasColumnName("rotor_speed_avg") + .HasComment("Средние обороты на ВСП"); + + b.Property("RotorSpeedMax") + .HasColumnType("double precision") + .HasColumnName("rotor_speed_max") + .HasComment("Максимальные обороты на ВСП"); + + b.Property("RotorSpeedMin") + .HasColumnType("double precision") + .HasColumnName("rotor_speed_min") + .HasComment("Минимальные обороты на ВСП"); + + b.Property("RotorTorqueAvg") + .HasColumnType("double precision") + .HasColumnName("rotor_torque_avg") + .HasComment("Средний момент на ВСП"); + + b.Property("RotorTorqueMax") + .HasColumnType("double precision") + .HasColumnName("rotor_torque_max") + .HasComment("Максимальный момент на ВСП"); + + b.Property("RotorTorqueMin") + .HasColumnType("double precision") + .HasColumnName("rotor_torque_min") + .HasComment("Минимальный момент на ВСП"); + + b.HasKey("Id"); + + b.HasIndex("IdWell"); + + b.HasIndex("IdWellSectionType"); + + b.ToTable("t_drill_params"); + + b + .HasComment("Режим бурения в секции (диапазоны параметров бурения)"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.FileCategory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id") + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); + + 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") + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); + + 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("PublishInfo") + .HasColumnType("jsonb") + .HasColumnName("publish_info") + .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.FileMark", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id") + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); + + b.Property("Comment") + .HasMaxLength(255) + .HasColumnType("character varying(255)") + .HasColumnName("comment") + .HasComment("Комментарий"); + + b.Property("DateCreated") + .HasColumnType("timestamp without time zone") + .HasColumnName("date_created") + .HasComment("Дата совершенного действия"); + + b.Property("IdFile") + .HasColumnType("integer") + .HasColumnName("id_file") + .HasComment("id файла"); + + b.Property("IdMarkType") + .HasColumnType("integer") + .HasColumnName("id_mark_type") + .HasComment("0 - Согласован"); + + b.Property("IdUser") + .HasColumnType("integer") + .HasColumnName("id_user") + .HasComment("id пользователя"); + + b.Property("IsDeleted") + .HasColumnType("boolean") + .HasColumnName("is_deleted") + .HasComment("Помечен ли файл как удаленный"); + + b.HasKey("Id"); + + b.HasIndex("IdFile"); + + b.HasIndex("IdUser"); + + b.ToTable("t_file_mark"); + + b + .HasComment("Действия с файлами."); + }); + + modelBuilder.Entity("AsbCloudDb.Model.Measure", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id") + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); + + 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") + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); + + 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") + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); + + 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") + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); + + b.Property("Info") + .HasColumnType("jsonb") + .HasColumnName("info") + .HasComment("Информация с панели о скважине"); + + b.Property("RemoteUid") + .HasColumnType("text") + .HasColumnName("remote_uid") + .HasComment("Идентификатор передающего устройства. Может повторяться в списке, так как комплекты оборудования переезжают от скв. к скв."); + + b.Property("TelemetryTimeZone") + .HasColumnType("jsonb") + .HasColumnName("timezone") + .HasComment("Смещение часового пояса от UTC"); + + 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") + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); + + 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("IsRotorSpeedGt5") + .HasColumnType("boolean") + .HasColumnName("is_rotor_speed_gt_3") + .HasComment("Обороты ротора выше 3"); + + b.Property("IsRotorSpeedLt5") + .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("IdTelemetry") + .HasColumnType("integer") + .HasColumnName("id_telemetry"); + + b.Property("Date") + .HasColumnType("timestamp with time zone") + .HasColumnName("date") + .HasComment("'2021-10-19 18:23:54+05'"); + + b.Property("AxialLoad") + .HasColumnType("real") + .HasColumnName("axial_load") + .HasComment("Осевая нагрузка"); + + b.Property("AxialLoadLimitMax") + .HasColumnType("real") + .HasColumnName("axial_load_limit_max") + .HasComment("Осевая нагрузка. Аварийная макс."); + + b.Property("AxialLoadSp") + .HasColumnType("real") + .HasColumnName("axial_load_sp") + .HasComment("Осевая нагрузка. Задание"); + + b.Property("BitDepth") + .HasColumnType("real") + .HasColumnName("bit_depth") + .HasComment("Положение инструмента"); + + b.Property("BlockPosition") + .HasColumnType("real") + .HasColumnName("block_position") + .HasComment("Высота талевого блока"); + + b.Property("BlockPositionMax") + .HasColumnType("real") + .HasColumnName("block_position_max") + .HasComment("Талевый блок. Макс положение"); + + b.Property("BlockPositionMin") + .HasColumnType("real") + .HasColumnName("block_position_min") + .HasComment("Талевый блок. Мин положение"); + + b.Property("BlockSpeed") + .HasColumnType("real") + .HasColumnName("block_speed") + .HasComment("Скорость талевого блока"); + + b.Property("BlockSpeedSp") + .HasColumnType("real") + .HasColumnName("block_speed_sp") + .HasComment("Скорости талевого блока. Задание"); + + b.Property("BlockSpeedSpDevelop") + .HasColumnType("real") + .HasColumnName("block_speed_sp_develop") + .HasComment("Талевый блок. Задание скорости для проработки"); + + b.Property("BlockSpeedSpRotor") + .HasColumnType("real") + .HasColumnName("block_speed_sp_rotor") + .HasComment("Талевый блок. Задание скорости для роторного бурения"); + + b.Property("BlockSpeedSpSlide") + .HasColumnType("real") + .HasColumnName("block_speed_sp_slide") + .HasComment("Талевый блок. Задание скорости для режима слайда"); + + b.Property("Flow") + .HasColumnType("real") + .HasColumnName("flow") + .HasComment("Расход"); + + b.Property("FlowDeltaLimitMax") + .HasColumnType("real") + .HasColumnName("flow_delta_limit_max") + .HasComment("Расход. Аварийный макс."); + + b.Property("FlowIdle") + .HasColumnType("real") + .HasColumnName("flow_idle") + .HasComment("Расход. Холостой ход"); + + b.Property("HookWeight") + .HasColumnType("real") + .HasColumnName("hook_weight") + .HasComment("Вес на крюке"); + + b.Property("HookWeightIdle") + .HasColumnType("real") + .HasColumnName("hook_weight_idle") + .HasComment("Вес на крюке. Холостой ход"); + + b.Property("HookWeightLimitMax") + .HasColumnType("real") + .HasColumnName("hook_weight_limit_max") + .HasComment("Вес на крюке. Затяжка"); + + b.Property("HookWeightLimitMin") + .HasColumnType("real") + .HasColumnName("hook_weight_limit_min") + .HasComment("Вес на крюке. Посадка"); + + b.Property("IdFeedRegulator") + .HasColumnType("smallint") + .HasColumnName("id_feed_regulator") + .HasComment("Текущий критерий бурения"); + + b.Property("IdUser") + .HasColumnType("integer") + .HasColumnName("id_user") + .HasComment("Пользователь САУБ"); + + b.Property("Mode") + .HasColumnType("smallint") + .HasColumnName("mode") + .HasComment("Режим САУБ"); + + b.Property("MseState") + .HasColumnType("smallint") + .HasColumnName("mse_state") + .HasComment("Текущее состояние работы MSE"); + + b.Property("Pressure") + .HasColumnType("real") + .HasColumnName("pressure") + .HasComment("Давление"); + + b.Property("PressureDeltaLimitMax") + .HasColumnType("real") + .HasColumnName("pressure_delta_limit_max") + .HasComment("Давление дифф. Аварийное макс."); + + b.Property("PressureIdle") + .HasColumnType("real") + .HasColumnName("pressure_idle") + .HasComment("Давление. Холостой ход"); + + b.Property("PressureSp") + .HasColumnType("real") + .HasColumnName("pressure_sp") + .HasComment("Давление. Задание"); + + b.Property("PressureSpDevelop") + .HasColumnType("real") + .HasColumnName("pressure_sp_develop") + .HasComment("Давление. Задание для проработки"); + + b.Property("PressureSpRotor") + .HasColumnType("real") + .HasColumnName("pressure_sp_rotor") + .HasComment("Давление. Задание для роторного бурения"); + + b.Property("PressureSpSlide") + .HasColumnType("real") + .HasColumnName("pressure_sp_slide") + .HasComment("Давление. Задание для режима слайда"); + + b.Property("RotorSpeed") + .HasColumnType("real") + .HasColumnName("rotor_speed") + .HasComment("Обороты ротора"); + + b.Property("RotorTorque") + .HasColumnType("real") + .HasColumnName("rotor_torque") + .HasComment("Момент на роторе"); + + b.Property("RotorTorqueIdle") + .HasColumnType("real") + .HasColumnName("rotor_torque_idle") + .HasComment("Момент на роторе. Холостой ход"); + + b.Property("RotorTorqueLimitMax") + .HasColumnType("real") + .HasColumnName("rotor_torque_limit_max") + .HasComment("Момент на роторе. Аварийный макс."); + + b.Property("RotorTorqueSp") + .HasColumnType("real") + .HasColumnName("rotor_torque_sp") + .HasComment("Момент на роторе. Задание"); + + b.Property("WellDepth") + .HasColumnType("real") + .HasColumnName("well_depth") + .HasComment("Глубина забоя"); + + b.HasKey("IdTelemetry", "Date"); + + b.ToTable("t_telemetry_data_saub"); + + b + .HasComment("набор основных данных по SAUB"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.TelemetryDataSpin", b => + { + b.Property("IdTelemetry") + .HasColumnType("integer") + .HasColumnName("id_telemetry"); + + b.Property("Date") + .HasColumnType("timestamp with time zone") + .HasColumnName("date") + .HasComment("'2021-10-19 18:23:54+05'"); + + b.Property("BreakAngleK") + .HasColumnType("real") + .HasColumnName("break_angle_k") + .HasComment("Коэффициент для расчёта за какой угол нужно тормозить"); + + b.Property("BreakAngleLeft") + .HasColumnType("real") + .HasColumnName("break_angle_left") + .HasComment("Угол торможения влево при работе по моменту"); + + b.Property("EncoderResolution") + .HasColumnType("real") + .HasColumnName("encoder_resolution") + .HasComment(" Разрешение энкодера"); + + b.Property("Mode") + .HasColumnType("smallint") + .HasColumnName("mode") + .HasComment("Выбранный режим управления"); + + b.Property("PidMuxTorqueLeftLimit") + .HasColumnType("real") + .HasColumnName("pid_mux_torque_left_limit") + .HasComment(" Момент при котором определяется ехать назад по моменту или по скорости"); + + b.Property("PositionRight") + .HasColumnType("real") + .HasColumnName("position_right") + .HasComment("Крайний правый угол осциляции"); + + b.Property("PositionZero") + .HasColumnType("real") + .HasColumnName("position_zero") + .HasComment("Нулевая позиция осциляции"); + + b.Property("Ratio") + .HasColumnType("real") + .HasColumnName("ratio") + .HasComment(" Коэффициент редукции редектора"); + + b.Property("ReverseKTorque") + .HasColumnType("real") + .HasColumnName("reverse_k_torque") + .HasComment("Коэффициент на который умножается момент, для того чтобы система поняла что мы движемся в обратную сторону"); + + b.Property("ReverseSpeedSpZeroTime") + .HasColumnType("smallint") + .HasColumnName("reverse_speed_sp_zero_time") + .HasComment("Время выдачи сигнала нулевой скорости на при смене направления"); + + b.Property("RevolsLeftLimit") + .HasColumnType("real") + .HasColumnName("revols_left_limit") + .HasComment("Ограничение числа оборотов влево"); + + b.Property("RevolsLeftTotal") + .HasColumnType("real") + .HasColumnName("revols_left_total") + .HasComment("Суммарное количество оборотов влево"); + + b.Property("RevolsRightLimit") + .HasColumnType("real") + .HasColumnName("revols_right_limit") + .HasComment("Ограничение числа оборотов вправо"); + + b.Property("RevolsRightTotal") + .HasColumnType("real") + .HasColumnName("revols_right_total") + .HasComment("Суммарное количество оборотов вправо"); + + b.Property("RotorTorqueAvg") + .HasColumnType("real") + .HasColumnName("rotor_torque_avg") + .HasComment(" Момент в роторе средний"); + + b.Property("SpeedLeftSp") + .HasColumnType("real") + .HasColumnName("speed_left_sp") + .HasComment("Заданная скорость вращения влево"); + + b.Property("SpeedRightSp") + .HasColumnType("real") + .HasColumnName("speed_right_sp") + .HasComment("Заданная скорость вращения вправо"); + + b.Property("State") + .HasColumnType("smallint") + .HasColumnName("state") + .HasComment("Переменная этапа"); + + b.Property("TopDriveSpeed") + .HasColumnType("real") + .HasColumnName("top_drive_speed") + .HasComment("Скорость СВП"); + + b.Property("TopDriveSpeedErr") + .HasColumnType("smallint") + .HasColumnName("top_drive_speed_err"); + + b.Property("TopDriveSpeedMax") + .HasColumnType("real") + .HasColumnName("top_drive_speed_max") + .HasComment("верхний предел"); + + b.Property("TopDriveSpeedMin") + .HasColumnType("real") + .HasColumnName("top_drive_speed_min") + .HasComment("нижний предел"); + + b.Property("TopDriveSpeedOffset") + .HasColumnType("real") + .HasColumnName("top_drive_speed_offset") + .HasComment("смещение"); + + b.Property("TopDriveSpeedSpFrom") + .HasColumnType("real") + .HasColumnName("top_drive_speed_sp_from") + .HasComment("Заданная скорость c СВП"); + + b.Property("TopDriveSpeedSpFromErr") + .HasColumnType("smallint") + .HasColumnName("top_drive_speed_sp_from_err"); + + b.Property("TopDriveSpeedSpFromMax") + .HasColumnType("real") + .HasColumnName("top_drive_speed_sp_from_max"); + + b.Property("TopDriveSpeedSpFromMin") + .HasColumnType("real") + .HasColumnName("top_drive_speed_sp_from_min"); + + b.Property("TopDriveSpeedSpFromOffset") + .HasColumnType("real") + .HasColumnName("top_drive_speed_sp_from_offset"); + + b.Property("TopDriveSpeedSpTo") + .HasColumnType("real") + .HasColumnName("top_drive_speed_sp_to") + .HasComment("Задание скорости на СВП"); + + b.Property("TopDriveSpeedSpToErr") + .HasColumnType("smallint") + .HasColumnName("top_drive_speed_sp_to_err"); + + b.Property("TopDriveSpeedSpToMax") + .HasColumnType("real") + .HasColumnName("top_drive_speed_sp_to_max"); + + b.Property("TopDriveSpeedSpToMin") + .HasColumnType("real") + .HasColumnName("top_drive_speed_sp_to_min"); + + b.Property("TopDriveSpeedSpToOffset") + .HasColumnType("real") + .HasColumnName("top_drive_speed_sp_to_offset"); + + b.Property("TopDriveTorque") + .HasColumnType("real") + .HasColumnName("top_drive_torque") + .HasComment("Момент СВП"); + + b.Property("TopDriveTorqueErr") + .HasColumnType("smallint") + .HasColumnName("top_drive_torque_err"); + + b.Property("TopDriveTorqueMax") + .HasColumnType("real") + .HasColumnName("top_drive_torque_max"); + + b.Property("TopDriveTorqueMin") + .HasColumnType("real") + .HasColumnName("top_drive_torque_min"); + + b.Property("TopDriveTorqueOffset") + .HasColumnType("real") + .HasColumnName("top_drive_torque_offset"); + + b.Property("TopDriveTorqueSpFrom") + .HasColumnType("real") + .HasColumnName("top_drive_torque_sp_from") + .HasComment("Заданный момент c СВП"); + + b.Property("TopDriveTorqueSpFromErr") + .HasColumnType("smallint") + .HasColumnName("top_drive_torque_sp_from_err"); + + b.Property("TopDriveTorqueSpFromMax") + .HasColumnType("real") + .HasColumnName("top_drive_torque_sp_from_max"); + + b.Property("TopDriveTorqueSpFromMin") + .HasColumnType("real") + .HasColumnName("top_drive_torque_sp_from_min"); + + b.Property("TopDriveTorqueSpFromOffset") + .HasColumnType("real") + .HasColumnName("top_drive_torque_sp_from_offset"); + + b.Property("TopDriveTorqueSpTo") + .HasColumnType("real") + .HasColumnName("top_drive_torque_sp_to") + .HasComment("Задание момента на СВП"); + + b.Property("TopDriveTorqueSpToErr") + .HasColumnType("smallint") + .HasColumnName("top_drive_torque_sp_to_err"); + + b.Property("TopDriveTorqueSpToMax") + .HasColumnType("real") + .HasColumnName("top_drive_torque_sp_to_max"); + + b.Property("TopDriveTorqueSpToMin") + .HasColumnType("real") + .HasColumnName("top_drive_torque_sp_to_min"); + + b.Property("TopDriveTorqueSpToOffset") + .HasColumnType("real") + .HasColumnName("top_drive_torque_sp_to_offset"); + + b.Property("TorqueLeftLimit") + .HasColumnType("real") + .HasColumnName("torque_left_limit") + .HasComment("Ограничение крутящего момента влево"); + + b.Property("TorqueRampTime") + .HasColumnType("real") + .HasColumnName("torque_ramp_time") + .HasComment("Время нарастания момента"); + + b.Property("TorqueRightLimit") + .HasColumnType("real") + .HasColumnName("torque_right_limit") + .HasComment("Ограничение крутящего момента вправо"); + + b.Property("TorqueStarting") + .HasColumnType("real") + .HasColumnName("torque_starting") + .HasComment(" Страгивающий момент"); + + b.Property("TurnLeftOnceByAngle") + .HasColumnType("real") + .HasColumnName("turn_left_once_by_angle") + .HasComment("Доворот по градусам единожды влево"); + + b.Property("TurnLeftOnceByRevols") + .HasColumnType("real") + .HasColumnName("turn_left_once_by_revols") + .HasComment("Доворот по оборотам единожды влево"); + + b.Property("TurnLeftOnceByTorque") + .HasColumnType("real") + .HasColumnName("turn_left_once_by_torque") + .HasComment("Доворот по моменту единожды влево"); + + b.Property("TurnRightOnceByAngle") + .HasColumnType("real") + .HasColumnName("turn_right_once_by_angle") + .HasComment("Доворот по градусам единожды вправо"); + + b.Property("TurnRightOnceByRevols") + .HasColumnType("real") + .HasColumnName("turn_right_once_by_revols") + .HasComment("Доворот по оборотам единожды вправо"); + + b.Property("TurnRightOnceByTorque") + .HasColumnType("real") + .HasColumnName("turn_right_once_by_torque") + .HasComment("Доворот по моменту единожды вправо"); + + b.Property("UnlockBySectorOut") + .HasColumnType("real") + .HasColumnName("unlock_by_sector_out") + .HasComment(" Градус отклонения от сектора для автоматического сброса блокировки"); + + b.Property("Ver") + .HasColumnType("real") + .HasColumnName("ver") + .HasComment("Версия ПО ПЛК"); + + b.Property("W2800") + .HasColumnType("smallint") + .HasColumnName("w2800") + .HasComment("Установка нуля энкодера"); + + b.Property("W2808") + .HasColumnType("smallint") + .HasColumnName("w2808") + .HasComment("Неисправность энкодера"); + + b.Property("W2810") + .HasColumnType("smallint") + .HasColumnName("w2810") + .HasComment(" автоматический сброс блокировки"); + + b.HasKey("IdTelemetry", "Date"); + + 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") + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); + + 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") + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); + + 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") + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); + + 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") + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); + + b.Property("Caption") + .HasMaxLength(255) + .HasColumnType("character varying(255)") + .HasColumnName("caption"); + + b.Property("IdCluster") + .HasColumnType("integer") + .HasColumnName("id_cluster"); + + b.Property("IdState") + .HasColumnType("integer") + .HasColumnName("state") + .HasComment("0 - неизвестно, 1 - в работе, 2 - завершена"); + + 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.WellComposite", b => + { + b.Property("IdWell") + .HasColumnType("integer") + .HasColumnName("id_well") + .HasComment("Id скважины получателя"); + + b.Property("IdWellSrc") + .HasColumnType("integer") + .HasColumnName("id_well_src") + .HasComment("Id скважины композита"); + + b.Property("IdWellSectionType") + .HasColumnType("integer") + .HasColumnName("id_well_section_type") + .HasComment("Id тип секции композита"); + + b.HasKey("IdWell", "IdWellSrc", "IdWellSectionType"); + + b.HasIndex("IdWellSectionType"); + + b.HasIndex("IdWellSrc"); + + b.ToTable("t_well_сomposite"); + + b + .HasComment("Композитная скважина"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.WellOperation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id") + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); + + b.Property("CategoryInfo") + .HasColumnType("text") + .HasColumnName("category_info") + .HasComment("Доп. информация к выбраной категории"); + + b.Property("Comment") + .HasColumnType("text") + .HasColumnName("comment") + .HasComment("Комментарий"); + + b.Property("DateStart") + .HasColumnType("timestamp without time zone") + .HasColumnName("date_start") + .HasComment("Дата начала операции"); + + b.Property("DepthEnd") + .HasColumnType("double precision") + .HasColumnName("depth_end") + .HasComment("Глубина после завершения операции, м"); + + b.Property("DepthStart") + .HasColumnType("double precision") + .HasColumnName("depth_start") + .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.HasKey("Id"); + + b.HasIndex("DateStart"); + + b.HasIndex("DepthEnd"); + + b.HasIndex("IdCategory"); + + b.HasIndex("IdWell"); + + b.HasIndex("IdWellSectionType"); + + b.ToTable("t_well_operation"); + + b + .HasComment("Данные по операциям на скважине"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.WellOperationCategory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("id") + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); + + 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 = 1019, + 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") + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); + + 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") + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); + + 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.DrillFlowChart", b => + { + b.HasOne("AsbCloudDb.Model.Well", "Well") + .WithMany() + .HasForeignKey("IdWell") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Well"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.DrillParams", b => + { + b.HasOne("AsbCloudDb.Model.Well", "Well") + .WithMany() + .HasForeignKey("IdWell") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("AsbCloudDb.Model.WellSectionType", "WellSectionType") + .WithMany("DrillParamsCollection") + .HasForeignKey("IdWellSectionType") + .HasConstraintName("t_drill_params_t_well_section_type_id_fk") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Well"); + + b.Navigation("WellSectionType"); + }); + + 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.FileMark", b => + { + b.HasOne("AsbCloudDb.Model.FileInfo", "FileInfo") + .WithMany("FileMarks") + .HasForeignKey("IdFile") + .HasConstraintName("t_file_mark_t_file_info_fk") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("AsbCloudDb.Model.User", "User") + .WithMany("FileMarks") + .HasForeignKey("IdUser") + .HasConstraintName("t_user_t_file_mark_fk") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("FileInfo"); + + b.Navigation("User"); + }); + + 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") + .OnDelete(DeleteBehavior.Cascade) + .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") + .OnDelete(DeleteBehavior.Cascade) + .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") + .OnDelete(DeleteBehavior.Cascade) + .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") + .OnDelete(DeleteBehavior.SetNull); + + 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") + .OnDelete(DeleteBehavior.SetNull); + + b.HasOne("AsbCloudDb.Model.WellType", "WellType") + .WithMany("Wells") + .HasForeignKey("IdWellType"); + + b.Navigation("Cluster"); + + b.Navigation("Telemetry"); + + b.Navigation("WellType"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.WellComposite", b => + { + b.HasOne("AsbCloudDb.Model.Well", "Well") + .WithMany("WellComposites") + .HasForeignKey("IdWell") + .HasConstraintName("t_well_сomposite_t_well_id_fk") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("AsbCloudDb.Model.WellSectionType", "WellSectionType") + .WithMany("WellComposites") + .HasForeignKey("IdWellSectionType") + .HasConstraintName("t_well_сomposite_t_well_section_type_id_fk") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("AsbCloudDb.Model.Well", "WellSrc") + .WithMany("WellCompositeSrcs") + .HasForeignKey("IdWellSrc") + .HasConstraintName("t_well_сomposite_src_t_well_id_fk") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Well"); + + b.Navigation("WellSectionType"); + + b.Navigation("WellSrc"); + }); + + 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.FileInfo", b => + { + b.Navigation("FileMarks"); + }); + + 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("FileMarks"); + + b.Navigation("Files"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.UserRole", b => + { + b.Navigation("Users"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.Well", b => + { + b.Navigation("RelationCompaniesWells"); + + b.Navigation("WellComposites"); + + b.Navigation("WellCompositeSrcs"); + + b.Navigation("WellOperations"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.WellOperationCategory", b => + { + b.Navigation("Analysis"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.WellSectionType", b => + { + b.Navigation("DrillParamsCollection"); + + b.Navigation("WellComposites"); + + b.Navigation("WellOperations"); + }); + + modelBuilder.Entity("AsbCloudDb.Model.WellType", b => + { + b.Navigation("Wells"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/AsbCloudDb/Migrations/20211116080138_Add_Telemetry_TimeZone.cs b/AsbCloudDb/Migrations/20211116080138_Add_Telemetry_TimeZone.cs new file mode 100644 index 00000000..47b31e5d --- /dev/null +++ b/AsbCloudDb/Migrations/20211116080138_Add_Telemetry_TimeZone.cs @@ -0,0 +1,25 @@ +using AsbCloudDb.Model; +using Microsoft.EntityFrameworkCore.Migrations; + +namespace AsbCloudDb.Migrations +{ + public partial class Add_Telemetry_TimeZone : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "timezone", + table: "t_telemetry", + type: "jsonb", + nullable: true, + comment: "Смещение часового пояса от UTC"); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "timezone", + table: "t_telemetry"); + } + } +} diff --git a/AsbCloudDb/Migrations/AsbCloudDbContextModelSnapshot.cs b/AsbCloudDb/Migrations/AsbCloudDbContextModelSnapshot.cs index ece92be7..22260841 100644 --- a/AsbCloudDb/Migrations/AsbCloudDbContextModelSnapshot.cs +++ b/AsbCloudDb/Migrations/AsbCloudDbContextModelSnapshot.cs @@ -768,6 +768,11 @@ namespace AsbCloudDb.Migrations .HasColumnName("remote_uid") .HasComment("Идентификатор передающего устройства. Может повторяться в списке, так как комплекты оборудования переезжают от скв. к скв."); + b.Property("TelemetryTimeZone") + .HasColumnType("jsonb") + .HasColumnName("timezone") + .HasComment("Смещение часового пояса от UTC"); + b.HasKey("Id"); b.HasIndex(new[] { "RemoteUid" }, "t_telemetry_remote_uid_index"); diff --git a/AsbCloudDb/Model/Telemetry.cs b/AsbCloudDb/Model/Telemetry.cs index 403f0c81..2f18c729 100644 --- a/AsbCloudDb/Model/Telemetry.cs +++ b/AsbCloudDb/Model/Telemetry.cs @@ -1,5 +1,4 @@ using Microsoft.EntityFrameworkCore; -using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; @@ -27,6 +26,9 @@ namespace AsbCloudDb.Model [Column("info", TypeName = "jsonb"), Comment("Информация с панели о скважине")] public TelemetryInfo Info { get; set; } + + [Column("timezone", TypeName = "jsonb"), Comment("Смещение часового пояса от UTC")] + public TelemetryTimeZone TelemetryTimeZone { get; set; } [InverseProperty(nameof(Model.Well.Telemetry))] public virtual Well Well { get; set; } diff --git a/AsbCloudDb/Model/TelemetryTimeZone.cs b/AsbCloudDb/Model/TelemetryTimeZone.cs new file mode 100644 index 00000000..d1074840 --- /dev/null +++ b/AsbCloudDb/Model/TelemetryTimeZone.cs @@ -0,0 +1,9 @@ +namespace AsbCloudDb.Model +{ + public class TelemetryTimeZone + { + public double Hours { get; set; } + public string TimeZoneId { get; set; } + public bool IsOverride { get; set; } + } +} \ No newline at end of file diff --git a/AsbCloudInfrastructure/Services/TelemetryService.cs b/AsbCloudInfrastructure/Services/TelemetryService.cs index 5bf4a11a..34a74f7c 100644 --- a/AsbCloudInfrastructure/Services/TelemetryService.cs +++ b/AsbCloudInfrastructure/Services/TelemetryService.cs @@ -5,7 +5,9 @@ using AsbCloudInfrastructure.Services.Cache; using Mapster; using System.Collections.Generic; using System.Linq; +using System.Threading.Tasks; using System; +using System.Threading; using Microsoft.EntityFrameworkCore; namespace AsbCloudInfrastructure.Services @@ -69,11 +71,33 @@ namespace AsbCloudInfrastructure.Services public double GetTimezoneOffsetByTelemetryId(int idTelemetry) => cacheTelemetry.FirstOrDefault(t => t.Id == idTelemetry).Info?.TimeZoneOffsetTotalHours ?? 0d; - public void UpdateInfo(string uid, TelemetryInfoDto info) + public async Task UpdateInfoAsync(string uid, TelemetryInfoDto info, + CancellationToken token) { var telemetry = GetOrCreateTelemetryByUid(uid); telemetry.Info = info.Adapt(); - cacheTelemetry.Upsert(telemetry); + + var isTimeZoneToUpdate = telemetry.TelemetryTimeZone is null || telemetry.TelemetryTimeZone.IsOverride || + (!telemetry.TelemetryTimeZone.IsOverride && + telemetry.TelemetryTimeZone.Hours != info.TimeZoneOffsetTotalHours); + + if (isTimeZoneToUpdate) + telemetry.TelemetryTimeZone = new TelemetryTimeZone() + { + Hours = info.TimeZoneOffsetTotalHours, // TODO: Добавить получение имени часового пояса + TimeZoneId = info.TimeZoneId + }; + + await cacheTelemetry.UpsertAsync(telemetry, token); + } + + public async Task UpdateTimeZoneAsync(string uid, TelemetryTimeZoneDto timeZoneInfo, + CancellationToken token) + { + var telemetry = GetOrCreateTelemetryByUid(uid); + telemetry.TelemetryTimeZone = timeZoneInfo.Adapt(); + + await cacheTelemetry.UpsertAsync(telemetry, token); } public int? GetIdTelemetryByIdWell(int idWell) diff --git a/AsbCloudWebApi/Controllers/TelemetryController.cs b/AsbCloudWebApi/Controllers/TelemetryController.cs index 77736f10..49023a88 100644 --- a/AsbCloudWebApi/Controllers/TelemetryController.cs +++ b/AsbCloudWebApi/Controllers/TelemetryController.cs @@ -42,13 +42,31 @@ namespace AsbCloudWebApi.Controllers /// Принимает общую информацию по скважине /// /// Уникальный идентификатор отправителя - /// нформация об отправителе + /// Информация об отправителе + /// Токен отмены задачи /// [HttpPost] [Route("{uid}/info")] - public IActionResult PostInfo(string uid, [FromBody] TelemetryInfoDto info) + public async Task PostInfoAsync(string uid, [FromBody] TelemetryInfoDto info, + CancellationToken token = default) { - telemetryService.UpdateInfo(uid, info); + await telemetryService.UpdateInfoAsync(uid, info, token); + return Ok(); + } + + /// + /// Обновляет часовой пояс скважины + /// + /// Уникальный идентификатор отправителя + /// Информация о часовом поясе + /// Токен отмены задачи + /// + [HttpPost] + [Route("{uid}/timeZone")] + public async Task UpdateTimeZoneAsync(string uid, TelemetryTimeZoneDto timeZoneInfo, + CancellationToken token = default) + { + await telemetryService.UpdateTimeZoneAsync(uid, timeZoneInfo, token); return Ok(); } From 53dbb2d95923853f1f3bee2d1244dcf95f1962d8 Mon Sep 17 00:00:00 2001 From: KharchenkoVladimir Date: Tue, 16 Nov 2021 17:14:36 +0500 Subject: [PATCH 2/7] CS2-119: Added timezone info receive method in TelemetryService --- AsbCloudApp/Data/TimeZoneInfo.cs | 17 ++++++++ AsbCloudApp/Services/ITelemetryService.cs | 2 + .../Services/TelemetryService.cs | 40 +++++++++++++++++-- .../Docs/Timezone info api credentials.md | 12 ++++++ 4 files changed, 68 insertions(+), 3 deletions(-) create mode 100644 AsbCloudApp/Data/TimeZoneInfo.cs create mode 100644 AsbCloudWebApi/Docs/Timezone info api credentials.md diff --git a/AsbCloudApp/Data/TimeZoneInfo.cs b/AsbCloudApp/Data/TimeZoneInfo.cs new file mode 100644 index 00000000..84fca14e --- /dev/null +++ b/AsbCloudApp/Data/TimeZoneInfo.cs @@ -0,0 +1,17 @@ +namespace AsbCloudApp.Data +{ + public class TimeZoneInfo + { + public string Sunrise { get; set; } + public double Lng { get; set; } + public double Lat { get; set; } + public string CountryCode { get; set; } + public double GmtOffset { get; set; } + public double RawOffset { get; set; } + public string Sunset { get; set; } + public string TimezoneId { get; set; } + public double DstOffset { get; set; } + public string CountryName { get; set; } + public string Time { get; set; } + } +} \ No newline at end of file diff --git a/AsbCloudApp/Services/ITelemetryService.cs b/AsbCloudApp/Services/ITelemetryService.cs index a8fd483e..567d4a50 100644 --- a/AsbCloudApp/Services/ITelemetryService.cs +++ b/AsbCloudApp/Services/ITelemetryService.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; +using TimeZoneInfo = AsbCloudApp.Data.TimeZoneInfo; namespace AsbCloudApp.Services { @@ -12,6 +13,7 @@ namespace AsbCloudApp.Services int GetOrCreateTemetryIdByUid(string uid); double GetTimezoneOffsetByTelemetryId(int idTelemetry); Task UpdateInfoAsync(string uid, TelemetryInfoDto info, CancellationToken token); + Task GetTimeZoneInfoAsync(int idWell, CancellationToken token); Task UpdateTimeZoneAsync(string uid, TelemetryTimeZoneDto telemetryTimeZoneInfo, CancellationToken token); int? GetIdTelemetryByIdWell(int idWell); int Merge(IEnumerable telemetryIds); diff --git a/AsbCloudInfrastructure/Services/TelemetryService.cs b/AsbCloudInfrastructure/Services/TelemetryService.cs index 34a74f7c..e257686b 100644 --- a/AsbCloudInfrastructure/Services/TelemetryService.cs +++ b/AsbCloudInfrastructure/Services/TelemetryService.cs @@ -7,8 +7,11 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using System; +using System.Text.Json; +using System.Net.Http; using System.Threading; using Microsoft.EntityFrameworkCore; +using TimeZoneInfo = AsbCloudApp.Data.TimeZoneInfo; namespace AsbCloudInfrastructure.Services { @@ -18,6 +21,8 @@ namespace AsbCloudInfrastructure.Services private readonly CacheTable cacheWells; private readonly IAsbCloudDbContext db; private readonly ITelemetryTracker telemetryTracker; + private readonly string timeZoneApiUrl = "http://api.geonames.org/timezoneJSON"; + private readonly string timezoneApiUserName = "asbautodrilling"; public TelemetryService(IAsbCloudDbContext db, ITelemetryTracker telemetryTracker, CacheDb cacheDb) @@ -84,11 +89,39 @@ namespace AsbCloudInfrastructure.Services if (isTimeZoneToUpdate) telemetry.TelemetryTimeZone = new TelemetryTimeZone() { - Hours = info.TimeZoneOffsetTotalHours, // TODO: Добавить получение имени часового пояса + Hours = info.TimeZoneOffsetTotalHours, TimeZoneId = info.TimeZoneId }; - await cacheTelemetry.UpsertAsync(telemetry, token); + await cacheTelemetry.UpsertAsync(telemetry, token) + .ConfigureAwait(false); + } + + public async Task GetTimeZoneInfoAsync(int idWell, CancellationToken token) + { + var well = await db.Wells.FirstOrDefaultAsync(w => w.Id == idWell, token) + .ConfigureAwait(false); + + using var client = new HttpClient(); + + var latitude = $"{well.Latitude}".Replace(',', '.'); + var longitude = $"{well.Longitude}".Replace(',', '.'); + + var url = + $"{timeZoneApiUrl}?lat={latitude}&lng={longitude}&username={timezoneApiUserName}"; + + var response = await client.GetAsync(url, token).ConfigureAwait(false); + + var responseJson = await response.Content.ReadAsStringAsync(token) + .ConfigureAwait(false); + + var options = new JsonSerializerOptions + { + PropertyNameCaseInsensitive = true + }; + var timeZoneInfo = JsonSerializer.Deserialize(responseJson, options); + + return timeZoneInfo; } public async Task UpdateTimeZoneAsync(string uid, TelemetryTimeZoneDto timeZoneInfo, @@ -97,7 +130,8 @@ namespace AsbCloudInfrastructure.Services var telemetry = GetOrCreateTelemetryByUid(uid); telemetry.TelemetryTimeZone = timeZoneInfo.Adapt(); - await cacheTelemetry.UpsertAsync(telemetry, token); + await cacheTelemetry.UpsertAsync(telemetry, token) + .ConfigureAwait(false); } public int? GetIdTelemetryByIdWell(int idWell) diff --git a/AsbCloudWebApi/Docs/Timezone info api credentials.md b/AsbCloudWebApi/Docs/Timezone info api credentials.md new file mode 100644 index 00000000..43d38ee0 --- /dev/null +++ b/AsbCloudWebApi/Docs/Timezone info api credentials.md @@ -0,0 +1,12 @@ +# url +https://www.geonames.org/commercial-webservices.html + +# учетная запись для аутентификации на сайте +Имя пользователя: asbautodrilling +Пароль: asbautodrilling1! + +# имя пользователя для запросов +asbautodrilling + +# Пример запроса +http://api.geonames.org/timezoneJSON?lat=60.8705722222222&lng=70.3811888888889&username=asbautodrilling \ No newline at end of file From c273a9eb5c4e2cee7db8bf92fe6a98e1fd82ae05 Mon Sep 17 00:00:00 2001 From: KharchenkoVladimir Date: Wed, 17 Nov 2021 15:54:01 +0500 Subject: [PATCH 3/7] CS2-119: Added telemetry date fix method according to well timezone --- AsbCloudApp/Services/ITelemetryService.cs | 2 + .../Services/TelemetryDataBaseService.cs | 16 ++-- .../Services/TelemetryService.cs | 81 ++++++++++++++++++- 3 files changed, 89 insertions(+), 10 deletions(-) diff --git a/AsbCloudApp/Services/ITelemetryService.cs b/AsbCloudApp/Services/ITelemetryService.cs index 567d4a50..ff3605a5 100644 --- a/AsbCloudApp/Services/ITelemetryService.cs +++ b/AsbCloudApp/Services/ITelemetryService.cs @@ -13,6 +13,8 @@ namespace AsbCloudApp.Services int GetOrCreateTemetryIdByUid(string uid); double GetTimezoneOffsetByTelemetryId(int idTelemetry); Task UpdateInfoAsync(string uid, TelemetryInfoDto info, CancellationToken token); + Task FixDateToTimeZoneAsync(int idTelemetry, DateTime date, + CancellationToken token); Task GetTimeZoneInfoAsync(int idWell, CancellationToken token); Task UpdateTimeZoneAsync(string uid, TelemetryTimeZoneDto telemetryTimeZoneInfo, CancellationToken token); int? GetIdTelemetryByIdWell(int idWell); diff --git a/AsbCloudInfrastructure/Services/TelemetryDataBaseService.cs b/AsbCloudInfrastructure/Services/TelemetryDataBaseService.cs index e23be42b..f8258785 100644 --- a/AsbCloudInfrastructure/Services/TelemetryDataBaseService.cs +++ b/AsbCloudInfrastructure/Services/TelemetryDataBaseService.cs @@ -60,20 +60,24 @@ namespace AsbCloudInfrastructure.Services dtosList.Remove(duplicate); } - var enitties = dtosList.Select(d => { - var e = Convert(d); - e.IdTelemetry = idTelemetry; - return e; + var tasks = dtosList.Select(async d => { + var e = Convert(d); + e.IdTelemetry = idTelemetry; + e.Date = await telemetryService.FixDateToTimeZoneAsync(idTelemetry, d.Date, token) + .ConfigureAwait(false); + return e; }); + var entities = await Task.WhenAll(tasks); + var dbset = db.Set(); try { - return await db.Database.ExecInsertOrUpdateAsync(dbset, enitties, token).ConfigureAwait(false); + return await db.Database.ExecInsertOrUpdateAsync(dbset, entities, token).ConfigureAwait(false); } catch(Exception ex) { - Trace.WriteLine($"Fail to save data telemerty uid: {uid}, idTelemetry {idTelemetry} count: {enitties.Count()} dataDate: {enitties.FirstOrDefault()?.Date}. Message: {ex.Message}"); + Trace.WriteLine($"Fail to save data telemerty uid: {uid}, idTelemetry {idTelemetry} count: {entities.Count()} dataDate: {entities.FirstOrDefault()?.Date}. Message: {ex.Message}"); return 0; } } diff --git a/AsbCloudInfrastructure/Services/TelemetryService.cs b/AsbCloudInfrastructure/Services/TelemetryService.cs index e257686b..b0b4945c 100644 --- a/AsbCloudInfrastructure/Services/TelemetryService.cs +++ b/AsbCloudInfrastructure/Services/TelemetryService.cs @@ -19,6 +19,8 @@ namespace AsbCloudInfrastructure.Services { private readonly CacheTable cacheTelemetry; private readonly CacheTable cacheWells; + private readonly CacheTable cacheClusters; + private readonly CacheTable cacheDeposits; private readonly IAsbCloudDbContext db; private readonly ITelemetryTracker telemetryTracker; private readonly string timeZoneApiUrl = "http://api.geonames.org/timezoneJSON"; @@ -96,16 +98,60 @@ namespace AsbCloudInfrastructure.Services await cacheTelemetry.UpsertAsync(telemetry, token) .ConfigureAwait(false); } + + public async Task FixDateToTimeZoneAsync(int idTelemetry, DateTime date, + CancellationToken token) + { + if(date.Kind == DateTimeKind.Utc) + return date; + + if (date.Kind == DateTimeKind.Local) + return date.ToUniversalTime(); + + var telemetry = + await cacheTelemetry.FirstOrDefaultAsync(t => t.Id == idTelemetry, token); + + if (telemetry is null) + return date; + + if (telemetry.TelemetryTimeZone is null) + { + var well = await cacheWells.FirstOrDefaultAsync(w => w.IdTelemetry == telemetry.Id, token) + .ConfigureAwait(false); + + if (well is null) + return date; + + var requestedTimeZoneInfo = await GetTimeZoneInfoAsync(well.Id, token) + .ConfigureAwait(false); + + if (requestedTimeZoneInfo.TimezoneId is null) + return date; + + telemetry.TelemetryTimeZone = new TelemetryTimeZone() + { + Hours = requestedTimeZoneInfo.GmtOffset, + TimeZoneId = requestedTimeZoneInfo.TimezoneId + }; + + await cacheTelemetry.UpsertAsync(telemetry, token).ConfigureAwait(false); + } + + var offsetHours = telemetry.TelemetryTimeZone.Hours; + return date.AddHours(offsetHours * -1); + } public async Task GetTimeZoneInfoAsync(int idWell, CancellationToken token) { - var well = await db.Wells.FirstOrDefaultAsync(w => w.Id == idWell, token) - .ConfigureAwait(false); + var coordinates = await GetWellCoordinatesAsync(idWell, token); + + if (coordinates is null) + return null; using var client = new HttpClient(); - var latitude = $"{well.Latitude}".Replace(',', '.'); - var longitude = $"{well.Longitude}".Replace(',', '.'); + var latitude = coordinates.Value.latitude.Replace(',', '.'); + var longitude = coordinates.Value.longitude.Replace(',', '.'); var url = $"{timeZoneApiUrl}?lat={latitude}&lng={longitude}&username={timezoneApiUserName}"; @@ -143,6 +189,33 @@ namespace AsbCloudInfrastructure.Services return well.IdTelemetry; } + private async Task<(string latitude, string longitude)?> GetWellCoordinatesAsync(int idWell, + CancellationToken token) + { + var well = await cacheWells.FirstOrDefaultAsync(w => w.Id == idWell, token) + .ConfigureAwait(false); + + if (well is null) + return null; + + if (well.Latitude is not null && well.Longitude is not null) + return ($"{well.Latitude}", $"{well.Longitude}"); + + var cluster = await cacheClusters.FirstOrDefaultAsync(c => c.Id == well.IdCluster, token) + .ConfigureAwait(false); + + if (cluster.Latitude is not null && cluster.Longitude is not null) + return ($"{cluster.Latitude}", $"{cluster.Longitude}"); + + var deposit = await cacheDeposits.FirstOrDefaultAsync(d => d.Id == cluster.IdDeposit, token) + .ConfigureAwait(false); + + if (deposit.Latitude is not null && deposit.Longitude is not null) + return ($"{deposit.Latitude}", $"{deposit.Longitude}"); + + return null; + } + private Well GetWellByTelemetryUid(string uid) { var tele = cacheTelemetry.FirstOrDefault(t => t.RemoteUid == uid); From 4bed0623f1e147c6b90d3dcfcc795735c036852c Mon Sep 17 00:00:00 2001 From: KharchenkoVladimir Date: Thu, 18 Nov 2021 11:24:21 +0500 Subject: [PATCH 4/7] CS2-119: Added dates change to well timezone if requested --- AsbCloudApp/Services/IMessageService.cs | 5 ++- AsbCloudApp/Services/ITelemetryDataService.cs | 7 +++- .../Services/MessageService.cs | 18 +++++++++ .../Services/TelemetryDataBaseService.cs | 39 +++++++++++++++++-- .../Controllers/MessageController.cs | 4 +- .../TelemetryDataBaseController.cs | 10 +++-- 6 files changed, 71 insertions(+), 12 deletions(-) diff --git a/AsbCloudApp/Services/IMessageService.cs b/AsbCloudApp/Services/IMessageService.cs index e51b56df..5909a89a 100644 --- a/AsbCloudApp/Services/IMessageService.cs +++ b/AsbCloudApp/Services/IMessageService.cs @@ -9,9 +9,10 @@ namespace AsbCloudApp.Services public interface IMessageService { Task> GetMessagesAsync(int idWell, - IEnumerable categoryids = null, DateTime begin = default, + IEnumerable categoryids = default, DateTime begin = default, DateTime end = default, string searchString = default, - int skip = 0, int take = 32, CancellationToken token = default); + int skip = 0, int take = 32, bool isUtc = true, + CancellationToken token = default); Task GetMessagesDatesRangeAsync(int idWell, CancellationToken token = default); Task InsertAsync(string uid, IEnumerable dtos, diff --git a/AsbCloudApp/Services/ITelemetryDataService.cs b/AsbCloudApp/Services/ITelemetryDataService.cs index c9839126..c7530027 100644 --- a/AsbCloudApp/Services/ITelemetryDataService.cs +++ b/AsbCloudApp/Services/ITelemetryDataService.cs @@ -8,8 +8,11 @@ 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> GetAsync(int idWell, + DateTime dateBegin = default, double intervalSec = 600d, + int approxPointsCount = 1024, bool isUtc = false, CancellationToken token = default); + Task GetDataDatesRangeAsync(int idWell, bool isUtc, + CancellationToken token = default); Task UpdateDataAsync(string uid, IEnumerable dtos, CancellationToken token = default); } } \ No newline at end of file diff --git a/AsbCloudInfrastructure/Services/MessageService.cs b/AsbCloudInfrastructure/Services/MessageService.cs index 07f08283..6b79043b 100644 --- a/AsbCloudInfrastructure/Services/MessageService.cs +++ b/AsbCloudInfrastructure/Services/MessageService.cs @@ -16,6 +16,7 @@ namespace AsbCloudInfrastructure.Services { private readonly IAsbCloudDbContext db; private readonly ITelemetryService telemetryService; + private readonly CacheTable cacheTelemetry; private readonly CacheTable cacheEvents; private readonly CacheTable cacheTUsers; @@ -23,6 +24,7 @@ namespace AsbCloudInfrastructure.Services { this.db = db; this.telemetryService = telemetryService; + cacheTelemetry = cacheDb.GetCachedTable((AsbCloudDbContext)db); cacheEvents = cacheDb.GetCachedTable((AsbCloudDbContext)db); cacheTUsers = cacheDb.GetCachedTable((AsbCloudDbContext)db); } @@ -35,6 +37,7 @@ namespace AsbCloudInfrastructure.Services string searchString = default, int skip = 0, int take = 32, + bool isUtc = true, CancellationToken token = default) { var telemetryId = telemetryService.GetIdTelemetryByIdWell(idWell); @@ -121,6 +124,21 @@ namespace AsbCloudInfrastructure.Services result.Items.Add(messageDto); } + if (isUtc) + return result; + + var telemetry = await cacheTelemetry.FirstOrDefaultAsync(t => t.Id == telemetryId, + token).ConfigureAwait(false); + + if (telemetry?.TelemetryTimeZone is null) + return result; + + result.Items = result.Items.Select(m => + { + m.Date = m.Date.AddHours(telemetry.TelemetryTimeZone.Hours); + return m; + }).ToList(); + return result; } diff --git a/AsbCloudInfrastructure/Services/TelemetryDataBaseService.cs b/AsbCloudInfrastructure/Services/TelemetryDataBaseService.cs index f8258785..3f92febc 100644 --- a/AsbCloudInfrastructure/Services/TelemetryDataBaseService.cs +++ b/AsbCloudInfrastructure/Services/TelemetryDataBaseService.cs @@ -84,7 +84,7 @@ namespace AsbCloudInfrastructure.Services public virtual async Task> GetAsync(int idWell, DateTime dateBegin = default, double intervalSec = 600d, - int approxPointsCount = 1024, CancellationToken token = default) + int approxPointsCount = 1024, bool isUtc = true, CancellationToken token = default) { var well = cacheWells.FirstOrDefault(w => w.Id == idWell); if (well?.IdTelemetry is null) @@ -132,10 +132,25 @@ namespace AsbCloudInfrastructure.Services var dtos = entities.Select(e => Convert(e)); + if (isUtc) + return dtos; + + var telemetry = await cacheTelemetry.FirstOrDefaultAsync(t => t.Id == well.IdTelemetry, + token).ConfigureAwait(false); + + if (telemetry?.TelemetryTimeZone is null) + return dtos; + + dtos = dtos.Select(d => + { + d.Date = d.Date.AddHours(telemetry.TelemetryTimeZone.Hours); + return d; + }); + return dtos; } - public virtual async Task GetDataDatesRangeAsync(int idWell, + public virtual async Task GetDataDatesRangeAsync(int idWell, bool isUtc, CancellationToken token = default) { var telemetryId = telemetryService.GetIdTelemetryByIdWell(idWell); @@ -145,7 +160,25 @@ namespace AsbCloudInfrastructure.Services var (From, To) = await db.GetDatesRangeAsync((int)telemetryId, token) .ConfigureAwait(false); - return new DatesRangeDto { From = From, To = To }; + var result = new DatesRangeDto {From = From, To = To}; + + if (isUtc) + return result; + + var telemetry = await cacheTelemetry.FirstOrDefaultAsync(t => t.Id == telemetryId, + token).ConfigureAwait(false); + + if (telemetry?.TelemetryTimeZone is null) + return result; + + result = new DatesRangeDto() + { + From = From.AddHours(telemetry.TelemetryTimeZone.Hours), + To = To.AddHours(telemetry.TelemetryTimeZone.Hours) + }; + + return result; + } public abstract TDto Convert(TModel src); diff --git a/AsbCloudWebApi/Controllers/MessageController.cs b/AsbCloudWebApi/Controllers/MessageController.cs index f63fcd1d..6dcc9321 100644 --- a/AsbCloudWebApi/Controllers/MessageController.cs +++ b/AsbCloudWebApi/Controllers/MessageController.cs @@ -31,6 +31,7 @@ namespace AsbCloudWebApi.Controllers /// для пагинации кол-во записей пропустить /// для пагинации кол-во записей /// Строка поиска + /// Даты в формате UTC или часового пояса скважины /// Токен для отмены задачи /// список сообщений по скважине [HttpGet] @@ -39,6 +40,7 @@ namespace AsbCloudWebApi.Controllers [FromQuery] IEnumerable categoryids = default, DateTime begin = default, DateTime end = default, string searchString = default, + bool isUtc = true, CancellationToken token = default) { if (take > 1024) @@ -49,7 +51,7 @@ namespace AsbCloudWebApi.Controllers var result = await messageService.GetMessagesAsync(idWell, categoryids, begin, end, searchString, - skip, take, token).ConfigureAwait(false); + skip, take, isUtc, token).ConfigureAwait(false); if (result is null || result.Count == 0) return NoContent(); diff --git a/AsbCloudWebApi/Controllers/TelemetryDataBaseController.cs b/AsbCloudWebApi/Controllers/TelemetryDataBaseController.cs index 04fdc659..1b201cd8 100644 --- a/AsbCloudWebApi/Controllers/TelemetryDataBaseController.cs +++ b/AsbCloudWebApi/Controllers/TelemetryDataBaseController.cs @@ -68,11 +68,12 @@ namespace AsbCloudWebApi.Controllers /// дата начала выборки. По умолчанию: текущее время - intervalSec /// интервал времени даты начала выборки, секунды /// желаемое количество точек. Если в выборке точек будет больше, то выборка будет прорежена. + /// Даты в формате UTC или часового пояса скважины /// Токен завершения задачи /// [HttpGet("{idWell}")] public virtual async Task> GetDataAsync(int idWell, DateTime begin = default, - int intervalSec = 600, int approxPointsCount = 1024, CancellationToken token = default) + int intervalSec = 600, int approxPointsCount = 1024, bool isUtc = true, CancellationToken token = default) { int? idCompany = User.GetCompanyId(); @@ -86,7 +87,7 @@ namespace AsbCloudWebApi.Controllers return Forbid(); var content = await telemetryDataService.GetAsync(idWell, begin, - intervalSec, approxPointsCount, token).ConfigureAwait(false); + intervalSec, approxPointsCount, isUtc, token).ConfigureAwait(false); return Ok(content); } @@ -95,12 +96,13 @@ namespace AsbCloudWebApi.Controllers /// Возвращает диапазон дат сохраненных данных. /// /// id скважины + /// Даты в формате UTC или часового пояса скважины /// Токен завершения задачи /// [HttpGet] [Route("{idWell}/datesRange")] [ProducesResponseType(typeof(DatesRangeDto), (int)System.Net.HttpStatusCode.OK)] - public virtual async Task GetDataDatesRangeAsync(int idWell, + public virtual async Task GetDataDatesRangeAsync(int idWell, bool isUtc = true, CancellationToken token = default) { int? idCompany = User.GetCompanyId(); @@ -114,7 +116,7 @@ namespace AsbCloudWebApi.Controllers if (!isCompanyOwnsWell) return Forbid(); - var dataDatesRange = await telemetryDataService.GetDataDatesRangeAsync(idWell, + var dataDatesRange = await telemetryDataService.GetDataDatesRangeAsync(idWell, isUtc, token).ConfigureAwait(false); return Ok(dataDatesRange); From e62ac96bd7267a0c1f7d3f5d7da9a2cde340ffd3 Mon Sep 17 00:00:00 2001 From: KharchenkoVladimir Date: Thu, 18 Nov 2021 12:03:59 +0500 Subject: [PATCH 5/7] CS2-119: Added .FixDatesRangeByTimeZoneAsync() to fix dates ranges to well timezone everywhere --- AsbCloudApp/Services/IMessageService.cs | 2 +- AsbCloudApp/Services/IReportService.cs | 5 ++--- .../Services/ITelemetryAnalyticsService.cs | 2 +- AsbCloudApp/Services/ITelemetryService.cs | 2 ++ .../Analysis/TelemetryAnalyticsService.cs | 12 ++++++++++-- .../Services/MessageService.cs | 12 ++++++++++-- AsbCloudInfrastructure/Services/ReportService.cs | 12 ++++++++++-- .../Services/TelemetryDataBaseService.cs | 13 ++----------- .../Services/TelemetryService.cs | 16 ++++++++++++++++ AsbCloudWebApi/Controllers/MessageController.cs | 7 ++++--- AsbCloudWebApi/Controllers/ReportController.cs | 5 +++-- .../Controllers/TelemetryAnalyticsController.cs | 7 ++++--- .../Controllers/TelemetryDataBaseController.cs | 2 +- 13 files changed, 66 insertions(+), 31 deletions(-) diff --git a/AsbCloudApp/Services/IMessageService.cs b/AsbCloudApp/Services/IMessageService.cs index 5909a89a..9b4221c9 100644 --- a/AsbCloudApp/Services/IMessageService.cs +++ b/AsbCloudApp/Services/IMessageService.cs @@ -13,7 +13,7 @@ namespace AsbCloudApp.Services DateTime end = default, string searchString = default, int skip = 0, int take = 32, bool isUtc = true, CancellationToken token = default); - Task GetMessagesDatesRangeAsync(int idWell, + Task GetMessagesDatesRangeAsync(int idWell, bool isUtc, CancellationToken token = default); Task InsertAsync(string uid, IEnumerable dtos, CancellationToken token); diff --git a/AsbCloudApp/Services/IReportService.cs b/AsbCloudApp/Services/IReportService.cs index 0d7d80b4..7de24ed1 100644 --- a/AsbCloudApp/Services/IReportService.cs +++ b/AsbCloudApp/Services/IReportService.cs @@ -14,12 +14,11 @@ namespace AsbCloudApp.Services Action handleReportProgress); int GetReportPagesCount(int idWell, DateTime begin, DateTime end, int stepSeconds, int format); - Task> GetSuitableReportsAsync(int idWell, DateTime begin, DateTime end, int stepSeconds, int format, CancellationToken token); - Task GetReportsDatesRangeAsync(int idWell, - CancellationToken token); + Task GetReportsDatesRangeAsync(int idWell, bool isUtc, + CancellationToken token = default); Task> GetAllReportsByWellAsync(int idWell, CancellationToken token); } } diff --git a/AsbCloudApp/Services/ITelemetryAnalyticsService.cs b/AsbCloudApp/Services/ITelemetryAnalyticsService.cs index e8753c02..18994812 100644 --- a/AsbCloudApp/Services/ITelemetryAnalyticsService.cs +++ b/AsbCloudApp/Services/ITelemetryAnalyticsService.cs @@ -24,7 +24,7 @@ namespace AsbCloudApp.Services int intervalHoursTimestamp, int workBeginTimestamp, CancellationToken token = default); Task AnalyzeAndSaveTelemetriesAsync(CancellationToken token = default); - Task GetOperationsDateRangeAsync(int idWell, + Task GetOperationsDateRangeAsync(int idWell, bool isUtc, CancellationToken token = default); } } diff --git a/AsbCloudApp/Services/ITelemetryService.cs b/AsbCloudApp/Services/ITelemetryService.cs index ff3605a5..2eac845f 100644 --- a/AsbCloudApp/Services/ITelemetryService.cs +++ b/AsbCloudApp/Services/ITelemetryService.cs @@ -15,6 +15,8 @@ namespace AsbCloudApp.Services Task UpdateInfoAsync(string uid, TelemetryInfoDto info, CancellationToken token); Task FixDateToTimeZoneAsync(int idTelemetry, DateTime date, CancellationToken token); + Task FixDatesRangeByTimeZoneAsync(int telemetryId, DatesRangeDto result, + CancellationToken token); Task GetTimeZoneInfoAsync(int idWell, CancellationToken token); Task UpdateTimeZoneAsync(string uid, TelemetryTimeZoneDto telemetryTimeZoneInfo, CancellationToken token); int? GetIdTelemetryByIdWell(int idWell); diff --git a/AsbCloudInfrastructure/Services/Analysis/TelemetryAnalyticsService.cs b/AsbCloudInfrastructure/Services/Analysis/TelemetryAnalyticsService.cs index ff86b651..42d60940 100644 --- a/AsbCloudInfrastructure/Services/Analysis/TelemetryAnalyticsService.cs +++ b/AsbCloudInfrastructure/Services/Analysis/TelemetryAnalyticsService.cs @@ -294,7 +294,7 @@ namespace AsbCloudInfrastructure.Services.Analysis } } - public async Task GetOperationsDateRangeAsync(int idWell, + public async Task GetOperationsDateRangeAsync(int idWell, bool isUtc, CancellationToken token = default) { var telemetryId = telemetryService.GetIdTelemetryByIdWell(idWell); @@ -315,13 +315,21 @@ namespace AsbCloudInfrastructure.Services.Analysis .FirstOrDefaultAsync(token) .ConfigureAwait(false); - return new DatesRangeDto + var result = new DatesRangeDto { From = DateTimeOffset.FromUnixTimeSeconds(datesRange.From).DateTime, To = datesRange.To == default ? DateTime.MaxValue : DateTimeOffset.FromUnixTimeSeconds(datesRange.To).DateTime }; + + if (isUtc) + return result; + + result = await telemetryService.FixDatesRangeByTimeZoneAsync((int)telemetryId, result, token) + .ConfigureAwait(false); + + return result; } private async Task GetLastAnalysisDateAsync(int idTelemetry, CancellationToken token = default) diff --git a/AsbCloudInfrastructure/Services/MessageService.cs b/AsbCloudInfrastructure/Services/MessageService.cs index 6b79043b..355b25e2 100644 --- a/AsbCloudInfrastructure/Services/MessageService.cs +++ b/AsbCloudInfrastructure/Services/MessageService.cs @@ -142,7 +142,7 @@ namespace AsbCloudInfrastructure.Services return result; } - public async Task GetMessagesDatesRangeAsync(int idWell, + public async Task GetMessagesDatesRangeAsync(int idWell, bool isUtc, CancellationToken token = default) { var telemetryId = telemetryService.GetIdTelemetryByIdWell(idWell); @@ -152,7 +152,15 @@ namespace AsbCloudInfrastructure.Services var (From, To) = await db.GetDatesRangeAsync((int)telemetryId, token) .ConfigureAwait(false); - return new DatesRangeDto { From = From, To = To }; + var result = new DatesRangeDto { From = From, To = To }; + + if (isUtc) + return result; + + result = await telemetryService.FixDatesRangeByTimeZoneAsync((int)telemetryId, result, token) + .ConfigureAwait(false); + + return result; } public Task InsertAsync(string uid, IEnumerable dtos, diff --git a/AsbCloudInfrastructure/Services/ReportService.cs b/AsbCloudInfrastructure/Services/ReportService.cs index 931fd344..949f613c 100644 --- a/AsbCloudInfrastructure/Services/ReportService.cs +++ b/AsbCloudInfrastructure/Services/ReportService.cs @@ -97,7 +97,7 @@ namespace AsbCloudInfrastructure.Services return generator.GetPagesCount(); } - public async Task GetReportsDatesRangeAsync(int idWell, + public async Task GetReportsDatesRangeAsync(int idWell, bool isUtc, CancellationToken token = default) { var telemetryId = telemetryService.GetIdTelemetryByIdWell(idWell); @@ -121,11 +121,19 @@ namespace AsbCloudInfrastructure.Services .FirstOrDefaultAsync(token) .ConfigureAwait(false); - return new DatesRangeDto + var result = new DatesRangeDto { From = datesRange.From, To = datesRange.To.Year == 1 ? DateTime.MaxValue : datesRange.To }; + + if (isUtc) + return result; + + result = await telemetryService.FixDatesRangeByTimeZoneAsync((int)telemetryId, result, token) + .ConfigureAwait(false); + + return result; } public Task> GetSuitableReportsAsync(int idWell, DateTime begin, DateTime end, int stepSeconds, int format, CancellationToken token) => diff --git a/AsbCloudInfrastructure/Services/TelemetryDataBaseService.cs b/AsbCloudInfrastructure/Services/TelemetryDataBaseService.cs index 3f92febc..c39ea5ab 100644 --- a/AsbCloudInfrastructure/Services/TelemetryDataBaseService.cs +++ b/AsbCloudInfrastructure/Services/TelemetryDataBaseService.cs @@ -164,18 +164,9 @@ namespace AsbCloudInfrastructure.Services if (isUtc) return result; - - var telemetry = await cacheTelemetry.FirstOrDefaultAsync(t => t.Id == telemetryId, - token).ConfigureAwait(false); - if (telemetry?.TelemetryTimeZone is null) - return result; - - result = new DatesRangeDto() - { - From = From.AddHours(telemetry.TelemetryTimeZone.Hours), - To = To.AddHours(telemetry.TelemetryTimeZone.Hours) - }; + result = await telemetryService.FixDatesRangeByTimeZoneAsync((int)telemetryId, result, token) + .ConfigureAwait(false); return result; diff --git a/AsbCloudInfrastructure/Services/TelemetryService.cs b/AsbCloudInfrastructure/Services/TelemetryService.cs index b0b4945c..1adf88d7 100644 --- a/AsbCloudInfrastructure/Services/TelemetryService.cs +++ b/AsbCloudInfrastructure/Services/TelemetryService.cs @@ -141,6 +141,22 @@ namespace AsbCloudInfrastructure.Services return date.AddHours(offsetHours * -1); } + public async Task FixDatesRangeByTimeZoneAsync(int telemetryId, DatesRangeDto result, + CancellationToken token) + { + var telemetry = await cacheTelemetry.FirstOrDefaultAsync(t => t.Id == telemetryId, + token).ConfigureAwait(false); + + if (telemetry?.TelemetryTimeZone is null) + return result; + + return new DatesRangeDto() + { + From = result.From.AddHours(telemetry.TelemetryTimeZone.Hours), + To = result.To.AddHours(telemetry.TelemetryTimeZone.Hours) + }; + } + public async Task GetTimeZoneInfoAsync(int idWell, CancellationToken token) { var coordinates = await GetWellCoordinatesAsync(idWell, token); diff --git a/AsbCloudWebApi/Controllers/MessageController.cs b/AsbCloudWebApi/Controllers/MessageController.cs index 6dcc9321..b4bbd35d 100644 --- a/AsbCloudWebApi/Controllers/MessageController.cs +++ b/AsbCloudWebApi/Controllers/MessageController.cs @@ -64,11 +64,12 @@ namespace AsbCloudWebApi.Controllers /// /// id скважины /// Токен для отмены задачи + /// Смена дат с UTC формата на часовой пояс скважины /// список сообщений по скважине [HttpGet] [Route("datesRange")] [ProducesResponseType(typeof(DatesRangeDto), (int)System.Net.HttpStatusCode.OK)] - public async Task GetMessagesDateRangeAsync(int idWell, + public async Task GetMessagesDateRangeAsync(int idWell, bool isUtc = true, CancellationToken token = default) { int? idCompany = User.GetCompanyId(); @@ -82,8 +83,8 @@ namespace AsbCloudWebApi.Controllers if (!isCompanyOwnsWell) return Forbid(); - DatesRangeDto wellMessagesDatesRange = await messageService.GetMessagesDatesRangeAsync(idWell, - token); + var wellMessagesDatesRange = await messageService.GetMessagesDatesRangeAsync(idWell, + isUtc, token); return Ok(wellMessagesDatesRange); } diff --git a/AsbCloudWebApi/Controllers/ReportController.cs b/AsbCloudWebApi/Controllers/ReportController.cs index 121739a5..5777ce4f 100644 --- a/AsbCloudWebApi/Controllers/ReportController.cs +++ b/AsbCloudWebApi/Controllers/ReportController.cs @@ -167,11 +167,12 @@ namespace AsbCloudWebApi.Controllers /// /// id скважины /// Токен для отмены задачи + /// Смена дат с UTC формата на часовой пояс скважины /// Даты самого старого и самого свежего отчетов в БД [HttpGet] [Route("datesRange")] [ProducesResponseType(typeof(DatesRangeDto), (int)System.Net.HttpStatusCode.OK)] - public async Task GetReportsDateRangeAsync(int idWell, + public async Task GetReportsDateRangeAsync(int idWell, bool isUtc = true, CancellationToken token = default) { int? idCompany = User.GetCompanyId(); @@ -183,7 +184,7 @@ namespace AsbCloudWebApi.Controllers idWell, token).ConfigureAwait(false)) return Forbid(); - DatesRangeDto wellReportsDatesRange = await reportService.GetReportsDatesRangeAsync(idWell, + var wellReportsDatesRange = await reportService.GetReportsDatesRangeAsync(idWell, isUtc, token).ConfigureAwait(false); return Ok(wellReportsDatesRange); diff --git a/AsbCloudWebApi/Controllers/TelemetryAnalyticsController.cs b/AsbCloudWebApi/Controllers/TelemetryAnalyticsController.cs index 7880e039..f6f86485 100644 --- a/AsbCloudWebApi/Controllers/TelemetryAnalyticsController.cs +++ b/AsbCloudWebApi/Controllers/TelemetryAnalyticsController.cs @@ -176,11 +176,12 @@ namespace AsbCloudWebApi.Controllers /// /// id скважины /// Токен для отмены задачи + /// Смена дат с UTC формата на часовой пояс скважины /// Даты самой первой и самой последней операций на скважине [HttpGet] [Route("datesRange")] [ProducesResponseType(typeof(DatesRangeDto), (int)System.Net.HttpStatusCode.OK)] - public async Task GetOperationsDateRangeAsync(int idWell, + public async Task GetOperationsDateRangeAsync(int idWell, bool isUtc = true, CancellationToken token = default) { int? idCompany = User.GetCompanyId(); @@ -192,8 +193,8 @@ namespace AsbCloudWebApi.Controllers idWell, token).ConfigureAwait(false)) return Forbid(); - DatesRangeDto wellOperationsDatesRange = await analyticsService.GetOperationsDateRangeAsync(idWell, - token).ConfigureAwait(false); + var wellOperationsDatesRange = await analyticsService.GetOperationsDateRangeAsync(idWell, + isUtc, token).ConfigureAwait(false); return Ok(wellOperationsDatesRange); } diff --git a/AsbCloudWebApi/Controllers/TelemetryDataBaseController.cs b/AsbCloudWebApi/Controllers/TelemetryDataBaseController.cs index 1b201cd8..0a1d46f2 100644 --- a/AsbCloudWebApi/Controllers/TelemetryDataBaseController.cs +++ b/AsbCloudWebApi/Controllers/TelemetryDataBaseController.cs @@ -96,7 +96,7 @@ namespace AsbCloudWebApi.Controllers /// Возвращает диапазон дат сохраненных данных. /// /// id скважины - /// Даты в формате UTC или часового пояса скважины + /// Смена дат с UTC формата на часовой пояс скважины /// Токен завершения задачи /// [HttpGet] From 6b7f589ddc78e1a5e32058f94243a62e390518e8 Mon Sep 17 00:00:00 2001 From: KharchenkoVladimir Date: Thu, 18 Nov 2021 14:25:11 +0500 Subject: [PATCH 6/7] CS2-119: Fixed incoming telemetry date transform --- AsbCloudApp/Services/ITelemetryService.cs | 3 +- .../Services/TelemetryDataBaseService.cs | 10 +-- .../Services/TelemetryService.cs | 70 ++++++++++--------- 3 files changed, 43 insertions(+), 40 deletions(-) diff --git a/AsbCloudApp/Services/ITelemetryService.cs b/AsbCloudApp/Services/ITelemetryService.cs index 2eac845f..fbd9c2e5 100644 --- a/AsbCloudApp/Services/ITelemetryService.cs +++ b/AsbCloudApp/Services/ITelemetryService.cs @@ -13,7 +13,8 @@ namespace AsbCloudApp.Services int GetOrCreateTemetryIdByUid(string uid); double GetTimezoneOffsetByTelemetryId(int idTelemetry); Task UpdateInfoAsync(string uid, TelemetryInfoDto info, CancellationToken token); - Task FixDateToTimeZoneAsync(int idTelemetry, DateTime date, + Task GetTelemetryTimeZoneOffsetAsync(int idTelemetry, CancellationToken token); + DateTime FixDateToTimeZone(DateTime date, double offsetHours, CancellationToken token); Task FixDatesRangeByTimeZoneAsync(int telemetryId, DatesRangeDto result, CancellationToken token); diff --git a/AsbCloudInfrastructure/Services/TelemetryDataBaseService.cs b/AsbCloudInfrastructure/Services/TelemetryDataBaseService.cs index c39ea5ab..b1cf029d 100644 --- a/AsbCloudInfrastructure/Services/TelemetryDataBaseService.cs +++ b/AsbCloudInfrastructure/Services/TelemetryDataBaseService.cs @@ -59,17 +59,17 @@ namespace AsbCloudInfrastructure.Services foreach (var duplicate in duplicates) dtosList.Remove(duplicate); } + + var offsetHours = await telemetryService.GetTelemetryTimeZoneOffsetAsync(idTelemetry, token); - var tasks = dtosList.Select(async d => { + var entities = dtosList.Select(d => { var e = Convert(d); e.IdTelemetry = idTelemetry; - e.Date = await telemetryService.FixDateToTimeZoneAsync(idTelemetry, d.Date, token) - .ConfigureAwait(false); + if(offsetHours is not null) + e.Date = telemetryService.FixDateToTimeZone(d.Date, (double)offsetHours, token); return e; }); - var entities = await Task.WhenAll(tasks); - var dbset = db.Set(); try { diff --git a/AsbCloudInfrastructure/Services/TelemetryService.cs b/AsbCloudInfrastructure/Services/TelemetryService.cs index 1adf88d7..9acb53b5 100644 --- a/AsbCloudInfrastructure/Services/TelemetryService.cs +++ b/AsbCloudInfrastructure/Services/TelemetryService.cs @@ -31,6 +31,8 @@ namespace AsbCloudInfrastructure.Services { cacheTelemetry = cacheDb.GetCachedTable((AsbCloudDbContext)db); cacheWells = cacheDb.GetCachedTable((AsbCloudDbContext)db); + cacheClusters = cacheDb.GetCachedTable((AsbCloudDbContext)db); + cacheDeposits = cacheDb.GetCachedTable((AsbCloudDbContext)db); this.db = db; this.telemetryTracker = telemetryTracker; } @@ -98,47 +100,47 @@ namespace AsbCloudInfrastructure.Services await cacheTelemetry.UpsertAsync(telemetry, token) .ConfigureAwait(false); } - - public async Task FixDateToTimeZoneAsync(int idTelemetry, DateTime date, - CancellationToken token) - { - if(date.Kind == DateTimeKind.Utc) - return date; - - if (date.Kind == DateTimeKind.Local) - return date.ToUniversalTime(); + public async Task GetTelemetryTimeZoneOffsetAsync(int idTelemetry, CancellationToken token) + { var telemetry = await cacheTelemetry.FirstOrDefaultAsync(t => t.Id == idTelemetry, token); - - if (telemetry is null) - return date; - if (telemetry.TelemetryTimeZone is null) + if (telemetry.TelemetryTimeZone is not null) + return telemetry.TelemetryTimeZone.Hours; + + var well = await cacheWells.FirstOrDefaultAsync(w => w.IdTelemetry == telemetry.Id, token) + .ConfigureAwait(false); + + if (well is null) + return null; + + var requestedTimeZoneInfo = await GetTimeZoneInfoAsync(well.Id, token) + .ConfigureAwait(false); + + if (requestedTimeZoneInfo.TimezoneId is null) + return null; + + telemetry.TelemetryTimeZone = new TelemetryTimeZone() { - var well = await cacheWells.FirstOrDefaultAsync(w => w.IdTelemetry == telemetry.Id, token) - .ConfigureAwait(false); - - if (well is null) - return date; - - var requestedTimeZoneInfo = await GetTimeZoneInfoAsync(well.Id, token) - .ConfigureAwait(false); + Hours = requestedTimeZoneInfo.GmtOffset, + TimeZoneId = requestedTimeZoneInfo.TimezoneId + }; - if (requestedTimeZoneInfo.TimezoneId is null) - return date; - - telemetry.TelemetryTimeZone = new TelemetryTimeZone() - { - Hours = requestedTimeZoneInfo.GmtOffset, - TimeZoneId = requestedTimeZoneInfo.TimezoneId - }; - - await cacheTelemetry.UpsertAsync(telemetry, token).ConfigureAwait(false); - } + await cacheTelemetry.UpsertAsync(telemetry, token).ConfigureAwait(false); - var offsetHours = telemetry.TelemetryTimeZone.Hours; - return date.AddHours(offsetHours * -1); + return telemetry.TelemetryTimeZone.Hours; + } + + public DateTime FixDateToTimeZone(DateTime date, double offsetHours, + CancellationToken token) + { + return date.Kind switch + { + DateTimeKind.Utc => date, + DateTimeKind.Local => date.ToUniversalTime(), + _ => date.AddHours(-offsetHours) + }; } public async Task FixDatesRangeByTimeZoneAsync(int telemetryId, DatesRangeDto result, From 1eaa1efb034fa304bc3294a86cbabee8adc3658b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A4=D1=80=D0=BE=D0=BB=D0=BE=D0=B2?= Date: Mon, 22 Nov 2021 11:30:08 +0500 Subject: [PATCH 7/7] Refactor. Extract TimezoneService. --- AsbCloudApp/Data/TelemetryTimeZoneDto.cs | 15 ++ AsbCloudApp/Data/TimeZoneInfo.cs | 15 +- AsbCloudApp/Services/ITelemetryDataService.cs | 2 +- AsbCloudApp/Services/ITelemetryService.cs | 8 +- AsbCloudApp/Services/ITimeZoneService.cs | 13 ++ AsbCloudInfrastructure/DependencyInjection.cs | 1 + .../TelemetryAnalyticsBackgroundService.cs | 3 +- .../Services/MessageService.cs | 30 ++-- .../Services/TelemetryDataBaseService.cs | 34 +++-- .../Services/TelemetryDataSaubService.cs | 2 +- .../Services/TelemetryDataSpinService.cs | 2 +- .../Services/TelemetryService.cs | 140 +++++++----------- .../Services/TelemetryTracker.cs | 23 +-- .../Services/TimeZoneService.cs | 86 +++++++++++ .../Controllers/TelemetryController.cs | 33 +---- .../TelemetryDataBaseController.cs | 4 +- 16 files changed, 234 insertions(+), 177 deletions(-) create mode 100644 AsbCloudApp/Services/ITimeZoneService.cs create mode 100644 AsbCloudInfrastructure/Services/TimeZoneService.cs diff --git a/AsbCloudApp/Data/TelemetryTimeZoneDto.cs b/AsbCloudApp/Data/TelemetryTimeZoneDto.cs index ae4b4b9f..b8cd7e2b 100644 --- a/AsbCloudApp/Data/TelemetryTimeZoneDto.cs +++ b/AsbCloudApp/Data/TelemetryTimeZoneDto.cs @@ -5,5 +5,20 @@ namespace AsbCloudApp.Data public double Hours { get; set; } public string TimeZoneId { get; set; } public bool IsOverride { get; set; } + + public override bool Equals(object obj) + { + if(obj is TelemetryTimeZoneDto tTimeZone + && tTimeZone.Hours == Hours + && tTimeZone.TimeZoneId == TimeZoneId + && tTimeZone.IsOverride == IsOverride) + return true; + return false; + } + + public override int GetHashCode() + => Hours.GetHashCode() + | TimeZoneId.GetHashCode() + | IsOverride.GetHashCode(); } } \ No newline at end of file diff --git a/AsbCloudApp/Data/TimeZoneInfo.cs b/AsbCloudApp/Data/TimeZoneInfo.cs index 84fca14e..d8763ecb 100644 --- a/AsbCloudApp/Data/TimeZoneInfo.cs +++ b/AsbCloudApp/Data/TimeZoneInfo.cs @@ -1,17 +1,4 @@ namespace AsbCloudApp.Data { - public class TimeZoneInfo - { - public string Sunrise { get; set; } - public double Lng { get; set; } - public double Lat { get; set; } - public string CountryCode { get; set; } - public double GmtOffset { get; set; } - public double RawOffset { get; set; } - public string Sunset { get; set; } - public string TimezoneId { get; set; } - public double DstOffset { get; set; } - public string CountryName { get; set; } - public string Time { get; set; } - } + } \ No newline at end of file diff --git a/AsbCloudApp/Services/ITelemetryDataService.cs b/AsbCloudApp/Services/ITelemetryDataService.cs index c7530027..6cb8228f 100644 --- a/AsbCloudApp/Services/ITelemetryDataService.cs +++ b/AsbCloudApp/Services/ITelemetryDataService.cs @@ -11,7 +11,7 @@ namespace AsbCloudApp.Services Task> GetAsync(int idWell, DateTime dateBegin = default, double intervalSec = 600d, int approxPointsCount = 1024, bool isUtc = false, CancellationToken token = default); - Task GetDataDatesRangeAsync(int idWell, bool isUtc, + Task GetDataDatesRangeAsync(int idWell, bool isUtc = false, CancellationToken token = default); Task UpdateDataAsync(string uid, IEnumerable dtos, CancellationToken token = default); } diff --git a/AsbCloudApp/Services/ITelemetryService.cs b/AsbCloudApp/Services/ITelemetryService.cs index fbd9c2e5..604ab753 100644 --- a/AsbCloudApp/Services/ITelemetryService.cs +++ b/AsbCloudApp/Services/ITelemetryService.cs @@ -3,22 +3,20 @@ using System; using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -using TimeZoneInfo = AsbCloudApp.Data.TimeZoneInfo; namespace AsbCloudApp.Services { public interface ITelemetryService { + ITimeZoneService TimeZoneService { get; } + int? GetidWellByTelemetryUid(string uid); int GetOrCreateTemetryIdByUid(string uid); double GetTimezoneOffsetByTelemetryId(int idTelemetry); Task UpdateInfoAsync(string uid, TelemetryInfoDto info, CancellationToken token); Task GetTelemetryTimeZoneOffsetAsync(int idTelemetry, CancellationToken token); - DateTime FixDateToTimeZone(DateTime date, double offsetHours, - CancellationToken token); Task FixDatesRangeByTimeZoneAsync(int telemetryId, DatesRangeDto result, - CancellationToken token); - Task GetTimeZoneInfoAsync(int idWell, CancellationToken token); + CancellationToken token); Task UpdateTimeZoneAsync(string uid, TelemetryTimeZoneDto telemetryTimeZoneInfo, CancellationToken token); int? GetIdTelemetryByIdWell(int idWell); int Merge(IEnumerable telemetryIds); diff --git a/AsbCloudApp/Services/ITimeZoneService.cs b/AsbCloudApp/Services/ITimeZoneService.cs new file mode 100644 index 00000000..87be0d67 --- /dev/null +++ b/AsbCloudApp/Services/ITimeZoneService.cs @@ -0,0 +1,13 @@ +using System; +using System.Threading; +using System.Threading.Tasks; + +namespace AsbCloudApp.Services +{ + public interface ITimeZoneService + { + DateTime DateToUtc(DateTime date, double remoteOTimezoneffsetHours); + DateTime DateToTimeZone(DateTime date, double remoteOTimezoneffsetHours); + Task GetByCoordinatesAsync(double latitude, double longitude, CancellationToken token); + } +} \ No newline at end of file diff --git a/AsbCloudInfrastructure/DependencyInjection.cs b/AsbCloudInfrastructure/DependencyInjection.cs index 92805779..580bb356 100644 --- a/AsbCloudInfrastructure/DependencyInjection.cs +++ b/AsbCloudInfrastructure/DependencyInjection.cs @@ -47,6 +47,7 @@ namespace AsbCloudInfrastructure services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); // admin crud services: services.AddTransient, CrudServiceBase>(); diff --git a/AsbCloudInfrastructure/Services/Analysis/TelemetryAnalyticsBackgroundService.cs b/AsbCloudInfrastructure/Services/Analysis/TelemetryAnalyticsBackgroundService.cs index 9d41fbb5..cee3d994 100644 --- a/AsbCloudInfrastructure/Services/Analysis/TelemetryAnalyticsBackgroundService.cs +++ b/AsbCloudInfrastructure/Services/Analysis/TelemetryAnalyticsBackgroundService.cs @@ -37,7 +37,8 @@ namespace AsbCloudInfrastructure.Services.Analysis try { using var context = new AsbCloudDbContext(options); - var telemetryService = new TelemetryService(context, telemetryTracker, cacheDb); + var timeZoneService = new TimeZoneService(); + var telemetryService = new TelemetryService(context, telemetryTracker, timeZoneService, cacheDb); var analyticsService = new TelemetryAnalyticsService(context, telemetryService, cacheDb); diff --git a/AsbCloudInfrastructure/Services/MessageService.cs b/AsbCloudInfrastructure/Services/MessageService.cs index 355b25e2..56fd30e6 100644 --- a/AsbCloudInfrastructure/Services/MessageService.cs +++ b/AsbCloudInfrastructure/Services/MessageService.cs @@ -40,16 +40,16 @@ namespace AsbCloudInfrastructure.Services bool isUtc = true, CancellationToken token = default) { - var telemetryId = telemetryService.GetIdTelemetryByIdWell(idWell); - if (telemetryId is null) + var idTelemetry = telemetryService.GetIdTelemetryByIdWell(idWell); + if (idTelemetry is null) return null; - var events = cacheEvents.Where(e => e.IdTelemetry == telemetryId); + var events = cacheEvents.Where(e => e.IdTelemetry == idTelemetry); if (!events.Any()) return null; - var query = db.TelemetryMessages.Where(m => m.IdTelemetry == telemetryId) + var query = db.TelemetryMessages.Where(m => m.IdTelemetry == idTelemetry) .OrderBy(m => m.Date).AsNoTracking(); if ((categoryids?.Any() == true) || !string.IsNullOrEmpty(searchString)) @@ -70,6 +70,16 @@ namespace AsbCloudInfrastructure.Services query = query.OrderByDescending(m => m.Date); + + var timeOffset = await telemetryService.GetTelemetryTimeZoneOffsetAsync(idTelemetry??default, token) + .ConfigureAwait(false); + + if (timeOffset is not null) + { + begin = telemetryService.TimeZoneService.DateToUtc(begin, timeOffset ?? default); + end = telemetryService.TimeZoneService.DateToUtc(end, timeOffset ?? default); + } + if (begin != default) query = query.Where(m => m.Date >= begin); @@ -92,7 +102,7 @@ namespace AsbCloudInfrastructure.Services if (messagesList.Count == 0) return result; - var users = cacheTUsers.Where(u => u.IdTelemetry == telemetryId); + var users = cacheTUsers.Where(u => u.IdTelemetry == idTelemetry); foreach (var message in messagesList) { @@ -124,18 +134,12 @@ namespace AsbCloudInfrastructure.Services result.Items.Add(messageDto); } - if (isUtc) + if (isUtc && timeOffset is not null) return result; - var telemetry = await cacheTelemetry.FirstOrDefaultAsync(t => t.Id == telemetryId, - token).ConfigureAwait(false); - - if (telemetry?.TelemetryTimeZone is null) - return result; - result.Items = result.Items.Select(m => { - m.Date = m.Date.AddHours(telemetry.TelemetryTimeZone.Hours); + m.Date = telemetryService.TimeZoneService.DateToTimeZone( m.Date, timeOffset ?? default); return m; }).ToList(); diff --git a/AsbCloudInfrastructure/Services/TelemetryDataBaseService.cs b/AsbCloudInfrastructure/Services/TelemetryDataBaseService.cs index b1cf029d..2d8c4852 100644 --- a/AsbCloudInfrastructure/Services/TelemetryDataBaseService.cs +++ b/AsbCloudInfrastructure/Services/TelemetryDataBaseService.cs @@ -4,7 +4,6 @@ using AsbCloudDb.Model; using AsbCloudDb; using AsbCloudInfrastructure.Services.Cache; using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.ChangeTracking; using System; using System.Collections.Generic; using System.Diagnostics; @@ -20,7 +19,6 @@ namespace AsbCloudInfrastructure.Services { private readonly IAsbCloudDbContext db; private readonly ITelemetryService telemetryService; - protected readonly CacheTable cacheTelemetry; protected readonly CacheTable cacheTelemetryUsers; protected readonly CacheTable cacheWells; @@ -32,7 +30,6 @@ namespace AsbCloudInfrastructure.Services { this.db = db; this.telemetryService = telemetryService; - cacheTelemetry = cacheDb.GetCachedTable((AsbCloudDbContext)db); cacheTelemetryUsers = cacheDb.GetCachedTable((AsbCloudDbContext)db); cacheWells = cacheDb.GetCachedTable((AsbCloudDbContext)db); @@ -66,7 +63,7 @@ namespace AsbCloudInfrastructure.Services var e = Convert(d); e.IdTelemetry = idTelemetry; if(offsetHours is not null) - e.Date = telemetryService.FixDateToTimeZone(d.Date, (double)offsetHours, token); + e.Date = telemetryService.TimeZoneService.DateToUtc(d.Date, (double)offsetHours); return e; }); @@ -84,15 +81,17 @@ namespace AsbCloudInfrastructure.Services public virtual async Task> GetAsync(int idWell, DateTime dateBegin = default, double intervalSec = 600d, - int approxPointsCount = 1024, bool isUtc = true, CancellationToken token = default) + int approxPointsCount = 1024, bool isUtc = false, CancellationToken token = default) { var well = cacheWells.FirstOrDefault(w => w.Id == idWell); if (well?.IdTelemetry is null) return default; + var idTelemetry = well?.IdTelemetry ?? default; + if (dateBegin == default) { - dateBegin = telemetryService.GetLastTelemetryDate(well.IdTelemetry ?? 0); + dateBegin = telemetryService.GetLastTelemetryDate(idTelemetry); if (dateBegin != default) dateBegin = dateBegin.AddSeconds(-intervalSec); } @@ -103,13 +102,19 @@ namespace AsbCloudInfrastructure.Services if (dateBegin.Kind == DateTimeKind.Unspecified) dateBegin = DateTime.SpecifyKind(dateBegin, DateTimeKind.Utc); - var datEnd = dateBegin.AddSeconds(intervalSec); + var timeOffset = await telemetryService.GetTelemetryTimeZoneOffsetAsync(idTelemetry, token) + .ConfigureAwait(false); + + if(timeOffset is not null) + dateBegin = telemetryService.TimeZoneService.DateToUtc(dateBegin, timeOffset?? default); + + var dateEnd = dateBegin.AddSeconds(intervalSec); var dbSet = db.Set(); - var query = from data in dbSet - where data.IdTelemetry == well.IdTelemetry - && data.Date >= dateBegin && data.Date < datEnd - select data; + var query = dbSet + .Where(d => d.IdTelemetry == idTelemetry + && d.Date >= dateBegin + && d.Date < dateEnd); var fullDataCount = await query.CountAsync(token) .ConfigureAwait(false); @@ -134,16 +139,13 @@ namespace AsbCloudInfrastructure.Services if (isUtc) return dtos; - - var telemetry = await cacheTelemetry.FirstOrDefaultAsync(t => t.Id == well.IdTelemetry, - token).ConfigureAwait(false); - if (telemetry?.TelemetryTimeZone is null) + if (timeOffset is null) return dtos; dtos = dtos.Select(d => { - d.Date = d.Date.AddHours(telemetry.TelemetryTimeZone.Hours); + d.Date = telemetryService.TimeZoneService.DateToTimeZone(d.Date, timeOffset ?? default); return d; }); diff --git a/AsbCloudInfrastructure/Services/TelemetryDataSaubService.cs b/AsbCloudInfrastructure/Services/TelemetryDataSaubService.cs index c2b1248f..5ac438c9 100644 --- a/AsbCloudInfrastructure/Services/TelemetryDataSaubService.cs +++ b/AsbCloudInfrastructure/Services/TelemetryDataSaubService.cs @@ -6,7 +6,7 @@ using Mapster; namespace AsbCloudInfrastructure.Services { - public class TelemetryDataSaubService: TelemetryDataBaseService + public class TelemetryDataSaubService: TelemetryDataBaseService { public TelemetryDataSaubService( IAsbCloudDbContext db, diff --git a/AsbCloudInfrastructure/Services/TelemetryDataSpinService.cs b/AsbCloudInfrastructure/Services/TelemetryDataSpinService.cs index a753da67..86ce23b5 100644 --- a/AsbCloudInfrastructure/Services/TelemetryDataSpinService.cs +++ b/AsbCloudInfrastructure/Services/TelemetryDataSpinService.cs @@ -6,7 +6,7 @@ using Mapster; namespace AsbCloudInfrastructure.Services { - public class TelemetryDataSpinService : TelemetryDataBaseService + public class TelemetryDataSpinService : TelemetryDataBaseService { public TelemetryDataSpinService( IAsbCloudDbContext db, diff --git a/AsbCloudInfrastructure/Services/TelemetryService.cs b/AsbCloudInfrastructure/Services/TelemetryService.cs index 9acb53b5..6c833fdd 100644 --- a/AsbCloudInfrastructure/Services/TelemetryService.cs +++ b/AsbCloudInfrastructure/Services/TelemetryService.cs @@ -7,11 +7,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using System; -using System.Text.Json; -using System.Net.Http; using System.Threading; using Microsoft.EntityFrameworkCore; -using TimeZoneInfo = AsbCloudApp.Data.TimeZoneInfo; namespace AsbCloudInfrastructure.Services { @@ -23,10 +20,14 @@ namespace AsbCloudInfrastructure.Services private readonly CacheTable cacheDeposits; private readonly IAsbCloudDbContext db; private readonly ITelemetryTracker telemetryTracker; - private readonly string timeZoneApiUrl = "http://api.geonames.org/timezoneJSON"; - private readonly string timezoneApiUserName = "asbautodrilling"; + private readonly ITimeZoneService timeZoneService; - public TelemetryService(IAsbCloudDbContext db, ITelemetryTracker telemetryTracker, + public ITimeZoneService TimeZoneService => timeZoneService; + + public TelemetryService( + IAsbCloudDbContext db, + ITelemetryTracker telemetryTracker, + ITimeZoneService timeZoneService, CacheDb cacheDb) { cacheTelemetry = cacheDb.GetCachedTable((AsbCloudDbContext)db); @@ -35,6 +36,7 @@ namespace AsbCloudInfrastructure.Services cacheDeposits = cacheDb.GetCachedTable((AsbCloudDbContext)db); this.db = db; this.telemetryTracker = telemetryTracker; + this.timeZoneService = timeZoneService; } public IEnumerable GetTransmittingTelemetriesAsync(int idCompany) @@ -86,11 +88,8 @@ namespace AsbCloudInfrastructure.Services var telemetry = GetOrCreateTelemetryByUid(uid); telemetry.Info = info.Adapt(); - var isTimeZoneToUpdate = telemetry.TelemetryTimeZone is null || telemetry.TelemetryTimeZone.IsOverride || - (!telemetry.TelemetryTimeZone.IsOverride && - telemetry.TelemetryTimeZone.Hours != info.TimeZoneOffsetTotalHours); - - if (isTimeZoneToUpdate) + if (!string.IsNullOrEmpty(info.TimeZoneId) && + telemetry.TelemetryTimeZone?.IsOverride != true) telemetry.TelemetryTimeZone = new TelemetryTimeZone() { Hours = info.TimeZoneOffsetTotalHours, @@ -106,94 +105,67 @@ namespace AsbCloudInfrastructure.Services var telemetry = await cacheTelemetry.FirstOrDefaultAsync(t => t.Id == idTelemetry, token); - if (telemetry.TelemetryTimeZone is not null) + if (!string.IsNullOrEmpty(telemetry.TelemetryTimeZone?.TimeZoneId)) return telemetry.TelemetryTimeZone.Hours; - - var well = await cacheWells.FirstOrDefaultAsync(w => w.IdTelemetry == telemetry.Id, token) - .ConfigureAwait(false); - if (well is null) - return null; - - var requestedTimeZoneInfo = await GetTimeZoneInfoAsync(well.Id, token) - .ConfigureAwait(false); - - if (requestedTimeZoneInfo.TimezoneId is null) - return null; - - telemetry.TelemetryTimeZone = new TelemetryTimeZone() + if (!string.IsNullOrEmpty(telemetry.Info?.TimeZoneId)) { - Hours = requestedTimeZoneInfo.GmtOffset, - TimeZoneId = requestedTimeZoneInfo.TimezoneId - }; - + telemetry.TelemetryTimeZone = new TelemetryTimeZone + { + Hours = telemetry.Info.TimeZoneOffsetTotalHours, + IsOverride = false, + TimeZoneId = telemetry.Info.TimeZoneId, + }; + } + else + { + var well = await cacheWells.FirstOrDefaultAsync(t => t.IdTelemetry == telemetry.Id, token) + .ConfigureAwait(false); + + if (well is null) + return null; + + var coordinates = await GetWellCoordinatesAsync(well.Id, token); + + if (coordinates is null) + return null; + + var requestedTimeZone = await timeZoneService.GetByCoordinatesAsync(coordinates.Value.latitude, coordinates.Value.longitude, token) + .ConfigureAwait(false); + + if (requestedTimeZone is null) + return null; + + telemetry.TelemetryTimeZone = requestedTimeZone.Adapt(); + } + await cacheTelemetry.UpsertAsync(telemetry, token).ConfigureAwait(false); return telemetry.TelemetryTimeZone.Hours; } - public DateTime FixDateToTimeZone(DateTime date, double offsetHours, + public async Task FixDatesRangeByTimeZoneAsync(int idTelemetry, DatesRangeDto range, CancellationToken token) { - return date.Kind switch - { - DateTimeKind.Utc => date, - DateTimeKind.Local => date.ToUniversalTime(), - _ => date.AddHours(-offsetHours) - }; - } + var offset = await GetTelemetryTimeZoneOffsetAsync(idTelemetry, token); - public async Task FixDatesRangeByTimeZoneAsync(int telemetryId, DatesRangeDto result, - CancellationToken token) - { - var telemetry = await cacheTelemetry.FirstOrDefaultAsync(t => t.Id == telemetryId, - token).ConfigureAwait(false); - - if (telemetry?.TelemetryTimeZone is null) - return result; + if (offset is null) + return range; return new DatesRangeDto() { - From = result.From.AddHours(telemetry.TelemetryTimeZone.Hours), - To = result.To.AddHours(telemetry.TelemetryTimeZone.Hours) + From = timeZoneService.DateToTimeZone(range.From, offset ?? default), + To = timeZoneService.DateToTimeZone(range.To, offset ?? default), }; } - public async Task GetTimeZoneInfoAsync(int idWell, CancellationToken token) - { - var coordinates = await GetWellCoordinatesAsync(idWell, token); - - if (coordinates is null) - return null; - - using var client = new HttpClient(); - - var latitude = coordinates.Value.latitude.Replace(',', '.'); - var longitude = coordinates.Value.longitude.Replace(',', '.'); - - var url = - $"{timeZoneApiUrl}?lat={latitude}&lng={longitude}&username={timezoneApiUserName}"; - - var response = await client.GetAsync(url, token).ConfigureAwait(false); - - var responseJson = await response.Content.ReadAsStringAsync(token) - .ConfigureAwait(false); - - var options = new JsonSerializerOptions - { - PropertyNameCaseInsensitive = true - }; - var timeZoneInfo = JsonSerializer.Deserialize(responseJson, options); - - return timeZoneInfo; - } - public async Task UpdateTimeZoneAsync(string uid, TelemetryTimeZoneDto timeZoneInfo, CancellationToken token) { - var telemetry = GetOrCreateTelemetryByUid(uid); - telemetry.TelemetryTimeZone = timeZoneInfo.Adapt(); - + var telemetry = GetOrCreateTelemetryByUid(uid); + var newTelemetryTimeZone = timeZoneInfo.Adapt(); + if (newTelemetryTimeZone?.Equals(telemetry.TelemetryTimeZone) == true) + return; await cacheTelemetry.UpsertAsync(telemetry, token) .ConfigureAwait(false); } @@ -207,7 +179,7 @@ namespace AsbCloudInfrastructure.Services return well.IdTelemetry; } - private async Task<(string latitude, string longitude)?> GetWellCoordinatesAsync(int idWell, + private async Task<(double latitude, double longitude)?> GetWellCoordinatesAsync(int idWell, CancellationToken token) { var well = await cacheWells.FirstOrDefaultAsync(w => w.Id == idWell, token) @@ -217,19 +189,19 @@ namespace AsbCloudInfrastructure.Services return null; if (well.Latitude is not null && well.Longitude is not null) - return ($"{well.Latitude}", $"{well.Longitude}"); + return (well.Latitude ?? default, well.Longitude??default); var cluster = await cacheClusters.FirstOrDefaultAsync(c => c.Id == well.IdCluster, token) .ConfigureAwait(false); if (cluster.Latitude is not null && cluster.Longitude is not null) - return ($"{cluster.Latitude}", $"{cluster.Longitude}"); + return (cluster.Latitude ?? default, cluster.Longitude ?? default); var deposit = await cacheDeposits.FirstOrDefaultAsync(d => d.Id == cluster.IdDeposit, token) .ConfigureAwait(false); if (deposit.Latitude is not null && deposit.Longitude is not null) - return ($"{deposit.Latitude}", $"{deposit.Longitude}"); + return (deposit.Latitude ?? default, deposit.Longitude ?? default); return null; } @@ -396,5 +368,7 @@ namespace AsbCloudInfrastructure.Services return rows; } + + } } diff --git a/AsbCloudInfrastructure/Services/TelemetryTracker.cs b/AsbCloudInfrastructure/Services/TelemetryTracker.cs index 4c05c883..36f72c2c 100644 --- a/AsbCloudInfrastructure/Services/TelemetryTracker.cs +++ b/AsbCloudInfrastructure/Services/TelemetryTracker.cs @@ -42,10 +42,11 @@ namespace AsbCloudInfrastructure.Services var keyValuePairs = new Dictionary(cacheTelemetry.Count()); foreach (var telemetry in cacheTelemetry) { - var date = telemetry.Info?.DrillingStartDate + var date = telemetry.Info?.DrillingStartDate ?? GetDateByUidOrDefault(telemetry.RemoteUid, DateTime.MinValue); - keyValuePairs[telemetry.RemoteUid] = new TrackerStat { + keyValuePairs[telemetry.RemoteUid] = new TrackerStat + { RemoteUid = telemetry.RemoteUid, LastTimeRemote = date, LastTimeServer = date, @@ -53,14 +54,16 @@ namespace AsbCloudInfrastructure.Services } requests = new ConcurrentDictionary(keyValuePairs); - Task.Run(async() => { + Task.Run(async () => + { db.Database.SetCommandTimeout(2 * 60); var dates = await db.TelemetryDataSaub .GroupBy(d => d.IdTelemetry) .Select(g => new { IdTelemetry = g.Key, - Date = g.Max(d=>d.Date) + DateMax = g.Max(d => d.Date), + DateMin = g.Min(d => d.Date), }) .AsNoTracking() .ToListAsync() @@ -70,18 +73,18 @@ namespace AsbCloudInfrastructure.Services var oldReqs = dates.Select(t => new { Uid = cacheTelemetry.FirstOrDefault(c => c.Id == t.IdTelemetry).RemoteUid, - t.Date, + t.DateMax, }); foreach (var oldReq in oldReqs) { var request = requests.GetValueOrDefault(oldReq.Uid); - if(request is not null) + if (request is not null) { - if (request.LastTimeRemote < oldReq.Date) - request.LastTimeRemote = oldReq.Date; - if (request.LastTimeServer < oldReq.Date) - request.LastTimeServer = oldReq.Date; + if (request.LastTimeRemote < oldReq.DateMax) + request.LastTimeRemote = oldReq.DateMax; + if (request.LastTimeServer < oldReq.DateMax) + request.LastTimeServer = oldReq.DateMax; } } }); diff --git a/AsbCloudInfrastructure/Services/TimeZoneService.cs b/AsbCloudInfrastructure/Services/TimeZoneService.cs new file mode 100644 index 00000000..2b69c2d0 --- /dev/null +++ b/AsbCloudInfrastructure/Services/TimeZoneService.cs @@ -0,0 +1,86 @@ +using AsbCloudApp.Services; +using System.Net.Http; +using AsbCloudApp.Data; +using System.Text.Json; +using System.Threading; +using System.Threading.Tasks; +using System; + +namespace AsbCloudInfrastructure.Services +{ + public class TimeZoneService : ITimeZoneService + { + class TimeZoneInfo + { + public string Sunrise { get; set; } + public double Lng { get; set; } + public double Lat { get; set; } + public string CountryCode { get; set; } + public double GmtOffset { get; set; } + public double RawOffset { get; set; } + public string Sunset { get; set; } + public string TimezoneId { get; set; } + public double DstOffset { get; set; } + public string CountryName { get; set; } + public string Time { get; set; } + } + + private readonly string timeZoneApiUrl = "http://api.geonames.org/timezoneJSON"; + private readonly string timezoneApiUserName = "asbautodrilling"; + + public async Task GetByCoordinatesAsync(double latitude, double longitude, CancellationToken token) + { + var lat = latitude.ToString(System.Globalization.CultureInfo.InvariantCulture); + var lng = longitude.ToString(System.Globalization.CultureInfo.InvariantCulture); + + var url = + $"{timeZoneApiUrl}?lat={lat}&lng={lng}&username={timezoneApiUserName}"; + + using var client = new HttpClient(); + + var response = await client.GetAsync(url, token) + .ConfigureAwait(false); + + var responseJson = await response.Content.ReadAsStringAsync(token) + .ConfigureAwait(false); + + if (!(responseJson.Contains("timezoneId") && responseJson.Contains("dstOffset"))) + return null; + + var options = new JsonSerializerOptions + { + PropertyNameCaseInsensitive = true + }; + var timeZoneInfo = JsonSerializer.Deserialize(responseJson, options); + + return new TelemetryTimeZoneDto + { + Hours = timeZoneInfo.DstOffset, + IsOverride = false, + TimeZoneId = timeZoneInfo.TimezoneId, + }; + } + + public DateTime DateToUtc(DateTime date, double remoteTimezoneOffsetHours) + { + var newDate = date.Kind switch + { + DateTimeKind.Local => date.ToUniversalTime(), + DateTimeKind.Unspecified => date.AddHours(-remoteTimezoneOffsetHours), + _ => date, + }; + return DateTime.SpecifyKind(newDate, DateTimeKind.Utc); + } + + public DateTime DateToTimeZone(DateTime date, double remoteTimezoneOffsetHours) + { + var newDate = date.Kind switch + { + DateTimeKind.Local => date.ToUniversalTime().AddHours(remoteTimezoneOffsetHours), + DateTimeKind.Utc => date.AddHours(remoteTimezoneOffsetHours), + _ => date, + }; + return DateTime.SpecifyKind(newDate, DateTimeKind.Unspecified); + } + } +} diff --git a/AsbCloudWebApi/Controllers/TelemetryController.cs b/AsbCloudWebApi/Controllers/TelemetryController.cs index 49023a88..765c2e99 100644 --- a/AsbCloudWebApi/Controllers/TelemetryController.cs +++ b/AsbCloudWebApi/Controllers/TelemetryController.cs @@ -50,7 +50,7 @@ namespace AsbCloudWebApi.Controllers public async Task PostInfoAsync(string uid, [FromBody] TelemetryInfoDto info, CancellationToken token = default) { - await telemetryService.UpdateInfoAsync(uid, info, token); + await telemetryService.UpdateInfoAsync(uid, info, token).ConfigureAwait(false); return Ok(); } @@ -66,7 +66,8 @@ namespace AsbCloudWebApi.Controllers public async Task UpdateTimeZoneAsync(string uid, TelemetryTimeZoneDto timeZoneInfo, CancellationToken token = default) { - await telemetryService.UpdateTimeZoneAsync(uid, timeZoneInfo, token); + await telemetryService.UpdateTimeZoneAsync(uid, timeZoneInfo, token) + .ConfigureAwait(false); return Ok(); } @@ -122,33 +123,5 @@ namespace AsbCloudWebApi.Controllers telemetryUserService.Upsert(uid, users); return Ok(); } - - ///// - ///// Загрузка архива (sqlite3). - ///// - ///// var fileName = @"C:\temp\default.sqlite3"; - ///// var fileStream = System.IO.File.OpenRead(fileName); - ///// var file = new FileParameter(fileStream, System.IO.Path.GetFileName(fileName)); - ///// cli.ApiTelemetryDbAsync("1", new List<FileParameter> { file }).Wait(); - ///// - ///// - ///// - ///// - ///// - //[HttpPost] - //[Route("{uid}/db")] - //public IActionResult PostDb(string uid, IFormFileCollection files) - //{ - // foreach (var file in files) - // { - // var fileName = string.IsNullOrEmpty(file.FileName) - // ? System.IO.Path.GetTempFileName() - // : file.FileName; - // using (var stream = System.IO.File.Create(fileName)) - // file.CopyTo(stream); - // } - // return Ok(); - //} - } } diff --git a/AsbCloudWebApi/Controllers/TelemetryDataBaseController.cs b/AsbCloudWebApi/Controllers/TelemetryDataBaseController.cs index 0a1d46f2..1e5bd396 100644 --- a/AsbCloudWebApi/Controllers/TelemetryDataBaseController.cs +++ b/AsbCloudWebApi/Controllers/TelemetryDataBaseController.cs @@ -73,7 +73,7 @@ namespace AsbCloudWebApi.Controllers /// [HttpGet("{idWell}")] public virtual async Task> GetDataAsync(int idWell, DateTime begin = default, - int intervalSec = 600, int approxPointsCount = 1024, bool isUtc = true, CancellationToken token = default) + int intervalSec = 600, int approxPointsCount = 1024, bool isUtc = false, CancellationToken token = default) { int? idCompany = User.GetCompanyId(); @@ -102,7 +102,7 @@ namespace AsbCloudWebApi.Controllers [HttpGet] [Route("{idWell}/datesRange")] [ProducesResponseType(typeof(DatesRangeDto), (int)System.Net.HttpStatusCode.OK)] - public virtual async Task GetDataDatesRangeAsync(int idWell, bool isUtc = true, + public virtual async Task GetDataDatesRangeAsync(int idWell, bool isUtc = false, CancellationToken token = default) { int? idCompany = User.GetCompanyId();