on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity

Renamed plural table names to singular

Browse Source
This commit is contained in:
KharchenkoVV 2021-08-16 10:38:48 +05:00
parent e668b8c2ff
commit 1db3a81d56
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AsbCloudDb/Model/AsbCloudDbContext.cs
View File

@ -20,7 +20,7 @@ namespace AsbCloudDb.Model
public virtual DbSet<User> Users { get; set; } public virtual DbSet<User> Users { get; set; }
public virtual DbSet<UserRole> UserRoles { get; set; } public virtual DbSet<UserRole> UserRoles { get; set; }
public virtual DbSet<Well> Wells { get; set; } public virtual DbSet<Well> Wells { get; set; }
public virtual DbSet<ReportProperties> ReportProperties { get; set; } public virtual DbSet<ReportProperty> ReportProperties { get; set; }
public virtual DbSet<FileInfo> Files { get; set; } public virtual DbSet<FileInfo> Files { get; set; }
public virtual DbSet<FileCategory> FileCategories { get; set; } public virtual DbSet<FileCategory> FileCategories { get; set; }
public virtual DbSet<Telemetry> Telemetries { get; set; } public virtual DbSet<Telemetry> Telemetries { get; set; }

2
AsbCloudDb/Model/FileCategory.cs
View File

@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations.Schema;
namespace AsbCloudDb.Model namespace AsbCloudDb.Model
{ {
[Table("t_file_categories"), Comment("Категории файлов")] [Table("t_file_category"), Comment("Категории файлов")]
public class FileCategory : IId public class FileCategory : IId
{ {
[Key] [Key]

2
AsbCloudDb/Model/IAsbCloudDbContext.cs
View File

@ -17,7 +17,7 @@ namespace AsbCloudDb.Model
DbSet<TelemetryMessage> TelemetryMessages { get; set; } DbSet<TelemetryMessage> TelemetryMessages { get; set; }
DbSet<User> Users { get; set; } DbSet<User> Users { get; set; }
DbSet<UserRole> UserRoles { get; set; } DbSet<UserRole> UserRoles { get; set; }
DbSet<ReportProperties> ReportProperties { get; set; } DbSet<ReportProperty> ReportProperties { get; set; }
DbSet<FileInfo> Files { get; set; } DbSet<FileInfo> Files { get; set; }
DbSet<FileCategory> FileCategories { get; set; } DbSet<FileCategory> FileCategories { get; set; }
DbSet<Telemetry> Telemetries { get; set; } DbSet<Telemetry> Telemetries { get; set; }

2
AsbCloudDb/Model/OperationCategory.cs
View File

@ -5,7 +5,7 @@ using System.ComponentModel.DataAnnotations.Schema;
namespace AsbCloudDb.Model namespace AsbCloudDb.Model
{ {
[Table("t_operations"), Comment("Справочник операций на скважине")] [Table("t_operation"), Comment("Справочник операций на скважине")]
public class OperationCategory public class OperationCategory
{ {
[Key] [Key]

4
AsbCloudDb/Model/ReportProperties.cs → AsbCloudDb/Model/ReportProperty.cs
View File

@ -5,8 +5,8 @@ using System.ComponentModel.DataAnnotations.Schema;
namespace AsbCloudDb.Model namespace AsbCloudDb.Model
{ {
[Table("t_report_properties"), Comment("Отчеты с данными по буровым")] [Table("t_report_property"), Comment("Отчеты с данными по буровым")]
public class ReportProperties: IId, IIdWell public class ReportProperty: IId, IIdWell
{ {
[Key] [Key]
[Column("id")] [Column("id")]

2
AsbCloudDb/Model/WellOperation.cs
View File

@ -6,7 +6,7 @@ using System.Text.Json.Serialization;
namespace AsbCloudDb.Model namespace AsbCloudDb.Model
{ {
[Table("t_well_operations"), Comment("Данные по операциям на скважине")] [Table("t_well_operation"), Comment("Данные по операциям на скважине")]
public class WellOperation public class WellOperation
{ {
[Key] [Key]

4
AsbCloudInfrastructure/Services/ReportService.cs
View File

@ -68,7 +68,7 @@ namespace AsbCloudInfrastructure.Services
context.Files.Add(newReportFile); context.Files.Add(newReportFile);
context.SaveChanges(); context.SaveChanges();
var newReportProperties = new ReportProperties var newReportProperties = new ReportProperty
{ {
IdWell = idWell, IdWell = idWell,
IdFile = newReportFile.Id, IdFile = newReportFile.Id,
@ -145,7 +145,7 @@ namespace AsbCloudInfrastructure.Services
}; };
} }
private async Task<IEnumerable<ReportProperties>> GetSuitableReportsFromDbAsync(int idWell, private async Task<IEnumerable<ReportProperty>> GetSuitableReportsFromDbAsync(int idWell,
DateTime begin, DateTime end, int stepSeconds, int format, DateTime begin, DateTime end, int stepSeconds, int format,
CancellationToken token = default) CancellationToken token = default)
{ {