diff --git a/AsbCloudApp/Data/ClusterDto.cs b/AsbCloudApp/Data/ClusterDto.cs
index 2f5c0ee9..9c1accd8 100644
--- a/AsbCloudApp/Data/ClusterDto.cs
+++ b/AsbCloudApp/Data/ClusterDto.cs
@@ -2,7 +2,7 @@
namespace AsbCloudApp.Data
{
- public class ClusterDto : IMapPoint
+ public class ClusterDto : IMapPoint, IId
{
public int Id { get; set; }
public string Caption { get; set; }
diff --git a/AsbCloudApp/Data/CompanyDto.cs b/AsbCloudApp/Data/CompanyDto.cs
index f53d6483..fd9ef0a8 100644
--- a/AsbCloudApp/Data/CompanyDto.cs
+++ b/AsbCloudApp/Data/CompanyDto.cs
@@ -1,6 +1,6 @@
namespace AsbCloudApp.Data
{
- public class CompanyDto
+ public class CompanyDto: IId
{
public int Id { get; set; }
public string Caption { get; set; }
diff --git a/AsbCloudApp/Data/DepositDto.cs b/AsbCloudApp/Data/DepositDto.cs
index 108160e5..a26cf6c1 100644
--- a/AsbCloudApp/Data/DepositDto.cs
+++ b/AsbCloudApp/Data/DepositDto.cs
@@ -2,7 +2,7 @@
namespace AsbCloudApp.Data
{
- public class DepositDto : IMapPoint
+ public class DepositDto : IMapPoint, IId
{
public int Id { get; set; }
public string Caption { get; set; }
diff --git a/AsbCloudApp/Data/EventDto.cs b/AsbCloudApp/Data/EventDto.cs
index db912ebb..e111a923 100644
--- a/AsbCloudApp/Data/EventDto.cs
+++ b/AsbCloudApp/Data/EventDto.cs
@@ -1,6 +1,6 @@
namespace AsbCloudApp.Data
{
- public class EventDto
+ public class EventDto: IId
{
public int Id { get; set; }
public string Message { get; set; }
diff --git a/AsbCloudApp/Data/FileInfoDto.cs b/AsbCloudApp/Data/FileInfoDto.cs
index 46c29e98..475b4079 100644
--- a/AsbCloudApp/Data/FileInfoDto.cs
+++ b/AsbCloudApp/Data/FileInfoDto.cs
@@ -2,7 +2,7 @@
namespace AsbCloudApp.Data
{
- public class FileInfoDto
+ public class FileInfoDto : IId
{
public int Id { get; set; }
public int IdWell { get; set; }
diff --git a/AsbCloudApp/Data/MeasureDto.cs b/AsbCloudApp/Data/MeasureDto.cs
index adc1c93c..a8acb428 100644
--- a/AsbCloudApp/Data/MeasureDto.cs
+++ b/AsbCloudApp/Data/MeasureDto.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
namespace AsbCloudApp.Data
{
- public class MeasureDto
+ public class MeasureDto : IId
{
public int Id { get; set; }
diff --git a/AsbCloudApp/Data/MessageDto.cs b/AsbCloudApp/Data/MessageDto.cs
index bbb4256d..19904e6b 100644
--- a/AsbCloudApp/Data/MessageDto.cs
+++ b/AsbCloudApp/Data/MessageDto.cs
@@ -5,7 +5,7 @@ namespace AsbCloudApp.Data
///
/// Сообщение для frontend
///
- public class MessageDto
+ public class MessageDto : IId
{
public int Id { get; set; }
diff --git a/AsbCloudApp/Data/ReportPropertiesDto.cs b/AsbCloudApp/Data/ReportPropertiesDto.cs
index 753df56e..09674a62 100644
--- a/AsbCloudApp/Data/ReportPropertiesDto.cs
+++ b/AsbCloudApp/Data/ReportPropertiesDto.cs
@@ -2,7 +2,7 @@
namespace AsbCloudApp.Data
{
- public class ReportPropertiesDto
+ public class ReportPropertiesDto : IId
{
public int Id { get; set; }
public string Name { get; set; }
diff --git a/AsbCloudApp/Data/StatClusterDto.cs b/AsbCloudApp/Data/StatClusterDto.cs
index df16d746..26daee7c 100644
--- a/AsbCloudApp/Data/StatClusterDto.cs
+++ b/AsbCloudApp/Data/StatClusterDto.cs
@@ -2,7 +2,7 @@
namespace AsbCloudApp.Data
{
- public class StatClusterDto //: ClusterDto
+ public class StatClusterDto : IId
{
public int Id { get; set; }
public string Caption { get; set; }
diff --git a/AsbCloudApp/Data/StatSectionDto.cs b/AsbCloudApp/Data/StatSectionDto.cs
index eeda800d..7e20b594 100644
--- a/AsbCloudApp/Data/StatSectionDto.cs
+++ b/AsbCloudApp/Data/StatSectionDto.cs
@@ -1,6 +1,6 @@
namespace AsbCloudApp.Data
{
- public class StatSectionDto : PlanFactBase
+ public class StatSectionDto : PlanFactBase, IId
{
public int Id { get; set; }
public string Caption { get; set; }
diff --git a/AsbCloudApp/Data/StatWellDto.cs b/AsbCloudApp/Data/StatWellDto.cs
index 24372edc..6fba2c4a 100644
--- a/AsbCloudApp/Data/StatWellDto.cs
+++ b/AsbCloudApp/Data/StatWellDto.cs
@@ -2,7 +2,7 @@
namespace AsbCloudApp.Data
{
- public class StatWellDto //: WellDto
+ public class StatWellDto : IId
{
public int Id { get; set; }
public string Caption { get; set; }
diff --git a/AsbCloudApp/Data/TelemetryAnalysisDto.cs b/AsbCloudApp/Data/TelemetryAnalysisDto.cs
index ed48f2bc..bb31ca87 100644
--- a/AsbCloudApp/Data/TelemetryAnalysisDto.cs
+++ b/AsbCloudApp/Data/TelemetryAnalysisDto.cs
@@ -1,6 +1,6 @@
namespace AsbCloudApp.Data
{
- public class TelemetryAnalysisDto
+ public class TelemetryAnalysisDto: IId
{
public int Id { get; set; }
public int IdTelemetry { get; set; }
diff --git a/AsbCloudApp/Data/TelemetryMessageDto.cs b/AsbCloudApp/Data/TelemetryMessageDto.cs
index 40a289e8..177e5867 100644
--- a/AsbCloudApp/Data/TelemetryMessageDto.cs
+++ b/AsbCloudApp/Data/TelemetryMessageDto.cs
@@ -5,7 +5,7 @@ namespace AsbCloudApp.Data
///
/// Сообщение получаемое от телеметрии
///
- public class TelemetryMessageDto
+ public class TelemetryMessageDto: IId
{
public int Id { get; set; }
public DateTime Date { get; set; }
diff --git a/AsbCloudApp/Data/TelemetryOperationDto.cs b/AsbCloudApp/Data/TelemetryOperationDto.cs
index 9ee6e06f..2597d66a 100644
--- a/AsbCloudApp/Data/TelemetryOperationDto.cs
+++ b/AsbCloudApp/Data/TelemetryOperationDto.cs
@@ -2,7 +2,7 @@
namespace AsbCloudApp.Data
{
- public class TelemetryOperationDto
+ public class TelemetryOperationDto : IId
{
public int Id { get; set; }
public string Name { get; set; }
diff --git a/AsbCloudApp/Data/TelemetryUserDto.cs b/AsbCloudApp/Data/TelemetryUserDto.cs
index e4d47444..dd58e848 100644
--- a/AsbCloudApp/Data/TelemetryUserDto.cs
+++ b/AsbCloudApp/Data/TelemetryUserDto.cs
@@ -1,6 +1,6 @@
namespace AsbCloudApp.Data
{
- public class TelemetryUserDto
+ public class TelemetryUserDto : IId
{
public int Id { get; set; }
diff --git a/AsbCloudApp/Data/UserDto.cs b/AsbCloudApp/Data/UserDto.cs
index 98abcbb9..00d5fd55 100644
--- a/AsbCloudApp/Data/UserDto.cs
+++ b/AsbCloudApp/Data/UserDto.cs
@@ -1,6 +1,6 @@
namespace AsbCloudApp.Data
{
- public class UserDto : UserBaseDto
+ public class UserDto : UserBaseDto, IId
{
public int Id { get; set; }
diff --git a/AsbCloudDb/Model/CompanyType.cs b/AsbCloudDb/Model/CompanyType.cs
index 0a30805b..5c1529d5 100644
--- a/AsbCloudDb/Model/CompanyType.cs
+++ b/AsbCloudDb/Model/CompanyType.cs
@@ -7,7 +7,7 @@ using System.ComponentModel.DataAnnotations.Schema;
namespace AsbCloudDb.Model
{
[Table("t_company_type")]
- public partial class CompanyType
+ public partial class CompanyType : IId
{
[Key]
[Column("id")]
diff --git a/AsbCloudDb/Model/TelemetryAnalysis.cs b/AsbCloudDb/Model/TelemetryAnalysis.cs
index d4c509ba..a9a82dbe 100644
--- a/AsbCloudDb/Model/TelemetryAnalysis.cs
+++ b/AsbCloudDb/Model/TelemetryAnalysis.cs
@@ -7,7 +7,7 @@ namespace AsbCloudDb.Model
{
[Table("t_telemetry_analysis"), Comment("События на скважине")]
- public class TelemetryAnalysis
+ public class TelemetryAnalysis : IId
{
[Key]
[Column("id")]
diff --git a/AsbCloudDb/Model/WellOperation.cs b/AsbCloudDb/Model/WellOperation.cs
index 9a513a54..1856c638 100644
--- a/AsbCloudDb/Model/WellOperation.cs
+++ b/AsbCloudDb/Model/WellOperation.cs
@@ -7,11 +7,8 @@ using System.Text.Json.Serialization;
namespace AsbCloudDb.Model
{
[Table("t_well_operation"), Comment("Данные по операциям на скважине")]
- public class WellOperation
+ public class WellOperation : IId
{
- public WellOperation ShallowCopy() =>
- (WellOperation) MemberwiseClone();
-
[Key]
[Column("id")]
public int Id { get; set; }
diff --git a/AsbCloudDb/Model/WellOperationCategory.cs b/AsbCloudDb/Model/WellOperationCategory.cs
index 28294f59..d7494383 100644
--- a/AsbCloudDb/Model/WellOperationCategory.cs
+++ b/AsbCloudDb/Model/WellOperationCategory.cs
@@ -6,7 +6,7 @@ using System.ComponentModel.DataAnnotations.Schema;
namespace AsbCloudDb.Model
{
[Table("t_well_operation_category"), Comment("Справочник операций на скважине")]
- public class WellOperationCategory
+ public class WellOperationCategory : IId
{
[Key]
[Column("id")]
diff --git a/AsbCloudDb/Model/WellSectionType.cs b/AsbCloudDb/Model/WellSectionType.cs
index 708994db..5570f138 100644
--- a/AsbCloudDb/Model/WellSectionType.cs
+++ b/AsbCloudDb/Model/WellSectionType.cs
@@ -8,7 +8,7 @@ using System.Text.Json.Serialization;
namespace AsbCloudDb.Model
{
[Table("t_well_section_type"), Comment("конструкция секции скважины")]
- public class WellSectionType
+ public class WellSectionType : IId
{
[Key]
[Column("id")]
diff --git a/AsbCloudDb/Model/WellType.cs b/AsbCloudDb/Model/WellType.cs
index ee5e6ffc..7bb560be 100644
--- a/AsbCloudDb/Model/WellType.cs
+++ b/AsbCloudDb/Model/WellType.cs
@@ -8,7 +8,7 @@ using System.Text.Json.Serialization;
namespace AsbCloudDb.Model
{
[Table("t_well_type"), Comment("конструкция скважины")]
- public class WellType
+ public class WellType : IId
{
[Key]
[Column("id")]