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

CS2-31: Добавлены параметры id_feed_regulator и MSE в передачу и сохранение в БД (в DataSaubBase)

Browse Source
This commit is contained in:
KharchenkoVV 2021-07-20 13:42:07 +05:00
parent f7ed377572
commit 2586bacaf6
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
AsbCloudApp/Data/DataSaubBaseDto.cs
View File

@ -127,5 +127,15 @@ namespace AsbCloudApp.Data
public double? FlowIdle { get; set; } public double? FlowIdle { get; set; }
public double? FlowDeltaLimitMax { get; set; } public double? FlowDeltaLimitMax { get; set; }
/// <summary>
/// id текущего критерия бурения
/// </summary>
public int? IdFeedRegulator { get; set; }
/// <summary>
/// Текущее состояние работы MSE
/// </summary>
public int? MseState { get; set; }
} }
} }

4
AsbCloudDb/Model/DataSaubBase.cs
View File

@ -106,6 +106,10 @@ namespace AsbCloudDb.Model
public double? FlowIdle { get; set; } public double? FlowIdle { get; set; }
[Column("flow_delta_limit_max"), Comment("Расход. Аварийный макс.")] [Column("flow_delta_limit_max"), Comment("Расход. Аварийный макс.")]
public double? FlowDeltaLimitMax { get; set; } 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] [JsonIgnore]
[ForeignKey(nameof(IdTelemetry))] [ForeignKey(nameof(IdTelemetry))]

2
AsbCloudInfrastructure/Services/DataService.cs
View File

@ -14,7 +14,6 @@ namespace AsbCloudInfrastructure.Services
private readonly IAsbCloudDbContext db; private readonly IAsbCloudDbContext db;
private readonly ITelemetryService telemetryService; private readonly ITelemetryService telemetryService;
private readonly IAnalyticsService analyticsService; private readonly IAnalyticsService analyticsService;
private readonly ISaubDataCache saubDataCache;
private readonly IMapper mapper; private readonly IMapper mapper;
private readonly CacheTable<Telemetry> cacheTelemetry; private readonly CacheTable<Telemetry> cacheTelemetry;
private readonly CacheTable<Well> cacheWells; private readonly CacheTable<Well> cacheWells;
@ -26,7 +25,6 @@ namespace AsbCloudInfrastructure.Services
this.db = db; this.db = db;
this.telemetryService = telemetryService; this.telemetryService = telemetryService;
this.analyticsService = analyticsService; this.analyticsService = analyticsService;
this.saubDataCache = saubDataCache;
mapper = mapperConfiguration.CreateMapper(); mapper = mapperConfiguration.CreateMapper();
cacheTelemetry = cacheDb.GetCachedTable<Telemetry>((AsbCloudDbContext)db); cacheTelemetry = cacheDb.GetCachedTable<Telemetry>((AsbCloudDbContext)db);
cacheWells = cacheDb.GetCachedTable<Well>((AsbCloudDbContext)db); cacheWells = cacheDb.GetCachedTable<Well>((AsbCloudDbContext)db);