From 2586bacaf6814ca1c998f7ba01adad23e8c3f7f9 Mon Sep 17 00:00:00 2001
From: KharchenkoVV <vv.harchenko@autodrilling.ru>
Date: Tue, 20 Jul 2021 13:42:07 +0500
Subject: [PATCH] =?UTF-8?q?CS2-31:=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82?=
 =?UTF-8?q?=D1=80=D1=8B=20id=5Ffeed=5Fregulator=20=D0=B8=20MSE=20=D0=B2=20?=
 =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=B0=D1=87=D1=83=20=D0=B8=20?=
 =?UTF-8?q?=D1=81=D0=BE=D1=85=D1=80=D0=B0=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=20?=
 =?UTF-8?q?=D0=B2=20=D0=91=D0=94=20(=D0=B2=20DataSaubBase)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AsbCloudApp/Data/DataSaubBaseDto.cs            | 10 ++++++++++
 AsbCloudDb/Model/DataSaubBase.cs               |  4 ++++
 AsbCloudInfrastructure/Services/DataService.cs |  2 --
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/AsbCloudApp/Data/DataSaubBaseDto.cs b/AsbCloudApp/Data/DataSaubBaseDto.cs
index 148699cb..36f61f39 100644
--- a/AsbCloudApp/Data/DataSaubBaseDto.cs
+++ b/AsbCloudApp/Data/DataSaubBaseDto.cs
@@ -127,5 +127,15 @@ namespace AsbCloudApp.Data
         public double? FlowIdle { get; set; }
 
         public double? FlowDeltaLimitMax { get; set; }
+
+        /// <summary>
+        /// id текущего критерия бурения
+        /// </summary>
+        public int? IdFeedRegulator { get; set; }
+
+        /// <summary>
+        /// Текущее состояние работы MSE
+        /// </summary>
+        public int? MseState { get; set; }
     }
 }
\ No newline at end of file
diff --git a/AsbCloudDb/Model/DataSaubBase.cs b/AsbCloudDb/Model/DataSaubBase.cs
index f1cf4573..4cc21111 100644
--- a/AsbCloudDb/Model/DataSaubBase.cs
+++ b/AsbCloudDb/Model/DataSaubBase.cs
@@ -106,6 +106,10 @@ namespace AsbCloudDb.Model
         public double? FlowIdle { get; set; }
         [Column("flow_delta_limit_max"), Comment("Расход. Аварийный макс.")]
         public double? FlowDeltaLimitMax { get; set; }
+        [Column("id_feed_regulator"), Comment("Текущий критерий бурения")]
+        public double? IdFeedRegulator { get; set; }
+        [Column("mse_state"), Comment("Текущее состояние работы MSE")]
+        public double? MseState { get; set; }
 
         [JsonIgnore]
         [ForeignKey(nameof(IdTelemetry))]
diff --git a/AsbCloudInfrastructure/Services/DataService.cs b/AsbCloudInfrastructure/Services/DataService.cs
index 03b432e7..bcbc98a8 100644
--- a/AsbCloudInfrastructure/Services/DataService.cs
+++ b/AsbCloudInfrastructure/Services/DataService.cs
@@ -14,7 +14,6 @@ namespace AsbCloudInfrastructure.Services
         private readonly IAsbCloudDbContext db;
         private readonly ITelemetryService telemetryService;
         private readonly IAnalyticsService analyticsService;
-        private readonly ISaubDataCache saubDataCache;
         private readonly IMapper mapper;
         private readonly CacheTable<Telemetry> cacheTelemetry;
         private readonly CacheTable<Well> cacheWells;
@@ -26,7 +25,6 @@ namespace AsbCloudInfrastructure.Services
             this.db = db;
             this.telemetryService = telemetryService;
             this.analyticsService = analyticsService;
-            this.saubDataCache = saubDataCache;
             mapper = mapperConfiguration.CreateMapper();
             cacheTelemetry = cacheDb.GetCachedTable<Telemetry>((AsbCloudDbContext)db);
             cacheWells = cacheDb.GetCachedTable<Well>((AsbCloudDbContext)db);