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

Переименован флаг подсистемы в DetectedOperation

Browse Source
This commit is contained in:
Степанов Дмитрий 2023-12-16 13:13:18 +05:00
parent 72ec8c69d3
commit f300974b1d
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AsbCloudDb/Model/DetectedOperation.cs
View File

@ -95,7 +95,7 @@ namespace AsbCloudDb.Model
/// <summary> /// <summary>
/// Спин-мастер /// Спин-мастер
/// </summary> /// </summary>
AutoSpin = 1 << 7, AutoSpinMaster = 1 << 7,
} }
/// <summary> /// <summary>

2
AsbCloudInfrastructure/Services/DetectOperations/DetectedOperationExportService.cs
View File

@ -152,7 +152,7 @@ public class DetectedOperationExportService
{ {
var idCategory = current.IdCategory; var idCategory = current.IdCategory;
if (idCategory == WellOperationCategory.IdSlide if (idCategory == WellOperationCategory.IdSlide
&& current.HasSubsystemFlag(DetectedOperation.EnabledSubsystemsFlags.AutoSpin)) && current.HasSubsystemFlag(DetectedOperation.EnabledSubsystemsFlags.AutoSpinMaster))
return "Бурение в слайде с осцилляцией"; return "Бурение в слайде с осцилляцией";
var category = wellOperationCategories.FirstOrDefault(o => o.Id == current.IdCategory); var category = wellOperationCategories.FirstOrDefault(o => o.Id == current.IdCategory);

2
AsbCloudInfrastructure/Services/DetectOperations/Detectors/DetectorAbstract.cs
View File

@ -163,7 +163,7 @@ namespace AsbCloudInfrastructure.Services.DetectOperations.Detectors
if(extraData.TryGetValue(DetectorDrilling.ExtraDataKeyHasOscillation, out var hasOscillation) if(extraData.TryGetValue(DetectorDrilling.ExtraDataKeyHasOscillation, out var hasOscillation)
&& hasOscillation is true) && hasOscillation is true)
{ {
enabledSubsystems |= (int)DetectedOperation.EnabledSubsystemsFlags.AutoSpin; enabledSubsystems |= (int)DetectedOperation.EnabledSubsystemsFlags.AutoSpinMaster;
return enabledSubsystems; return enabledSubsystems;
} }