diff --git a/AsbCloudDb/Model/AsbCloudDbContext.cs b/AsbCloudDb/Model/AsbCloudDbContext.cs index 041b2560..412ac241 100644 --- a/AsbCloudDb/Model/AsbCloudDbContext.cs +++ b/AsbCloudDb/Model/AsbCloudDbContext.cs @@ -20,7 +20,7 @@ namespace AsbCloudDb.Model public virtual DbSet Users { get; set; } public virtual DbSet UserRoles { get; set; } public virtual DbSet Wells { get; set; } - public virtual DbSet ReportProperties { get; set; } + public virtual DbSet ReportProperties { get; set; } public virtual DbSet Files { get; set; } public virtual DbSet FileCategories { get; set; } public virtual DbSet Telemetries { get; set; } diff --git a/AsbCloudDb/Model/FileCategory.cs b/AsbCloudDb/Model/FileCategory.cs index 1f38806e..2bbd27ac 100644 --- a/AsbCloudDb/Model/FileCategory.cs +++ b/AsbCloudDb/Model/FileCategory.cs @@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations.Schema; namespace AsbCloudDb.Model { - [Table("t_file_categories"), Comment("Категории файлов")] + [Table("t_file_category"), Comment("Категории файлов")] public class FileCategory : IId { [Key] diff --git a/AsbCloudDb/Model/IAsbCloudDbContext.cs b/AsbCloudDb/Model/IAsbCloudDbContext.cs index 512df775..d906e035 100644 --- a/AsbCloudDb/Model/IAsbCloudDbContext.cs +++ b/AsbCloudDb/Model/IAsbCloudDbContext.cs @@ -17,7 +17,7 @@ namespace AsbCloudDb.Model DbSet TelemetryMessages { get; set; } DbSet Users { get; set; } DbSet UserRoles { get; set; } - DbSet ReportProperties { get; set; } + DbSet ReportProperties { get; set; } DbSet Files { get; set; } DbSet FileCategories { get; set; } DbSet Telemetries { get; set; } diff --git a/AsbCloudDb/Model/OperationCategory.cs b/AsbCloudDb/Model/OperationCategory.cs index c900aef3..38516bbe 100644 --- a/AsbCloudDb/Model/OperationCategory.cs +++ b/AsbCloudDb/Model/OperationCategory.cs @@ -5,7 +5,7 @@ using System.ComponentModel.DataAnnotations.Schema; namespace AsbCloudDb.Model { - [Table("t_operations"), Comment("Справочник операций на скважине")] + [Table("t_operation"), Comment("Справочник операций на скважине")] public class OperationCategory { [Key] diff --git a/AsbCloudDb/Model/ReportProperties.cs b/AsbCloudDb/Model/ReportProperty.cs similarity index 88% rename from AsbCloudDb/Model/ReportProperties.cs rename to AsbCloudDb/Model/ReportProperty.cs index 39a05019..d6c5c354 100644 --- a/AsbCloudDb/Model/ReportProperties.cs +++ b/AsbCloudDb/Model/ReportProperty.cs @@ -5,8 +5,8 @@ using System.ComponentModel.DataAnnotations.Schema; namespace AsbCloudDb.Model { - [Table("t_report_properties"), Comment("Отчеты с данными по буровым")] - public class ReportProperties: IId, IIdWell + [Table("t_report_property"), Comment("Отчеты с данными по буровым")] + public class ReportProperty: IId, IIdWell { [Key] [Column("id")] diff --git a/AsbCloudDb/Model/WellOperation.cs b/AsbCloudDb/Model/WellOperation.cs index 024ce579..d2ca33ac 100644 --- a/AsbCloudDb/Model/WellOperation.cs +++ b/AsbCloudDb/Model/WellOperation.cs @@ -6,7 +6,7 @@ using System.Text.Json.Serialization; namespace AsbCloudDb.Model { - [Table("t_well_operations"), Comment("Данные по операциям на скважине")] + [Table("t_well_operation"), Comment("Данные по операциям на скважине")] public class WellOperation { [Key] diff --git a/AsbCloudInfrastructure/Services/ReportService.cs b/AsbCloudInfrastructure/Services/ReportService.cs index 7747629e..4ec86b0d 100644 --- a/AsbCloudInfrastructure/Services/ReportService.cs +++ b/AsbCloudInfrastructure/Services/ReportService.cs @@ -68,7 +68,7 @@ namespace AsbCloudInfrastructure.Services context.Files.Add(newReportFile); context.SaveChanges(); - var newReportProperties = new ReportProperties + var newReportProperties = new ReportProperty { IdWell = idWell, IdFile = newReportFile.Id, @@ -145,7 +145,7 @@ namespace AsbCloudInfrastructure.Services }; } - private async Task> GetSuitableReportsFromDbAsync(int idWell, + private async Task> GetSuitableReportsFromDbAsync(int idWell, DateTime begin, DateTime end, int stepSeconds, int format, CancellationToken token = default) {