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; } + + /// + /// id текущего критерия бурения + /// + public int? IdFeedRegulator { get; set; } + + /// + /// Текущее состояние работы MSE + /// + 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 cacheTelemetry; private readonly CacheTable 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((AsbCloudDbContext)db); cacheWells = cacheDb.GetCachedTable((AsbCloudDbContext)db);