diff --git a/AsbCloudApp/Data/DetectedOperation/DetectedOperationDto.cs b/AsbCloudApp/Data/DetectedOperation/DetectedOperationDto.cs
index 2b0fc768..1d6f3421 100644
--- a/AsbCloudApp/Data/DetectedOperation/DetectedOperationDto.cs
+++ b/AsbCloudApp/Data/DetectedOperation/DetectedOperationDto.cs
@@ -1,4 +1,5 @@
using System;
+using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace AsbCloudApp.Data.DetectedOperation;
@@ -72,14 +73,14 @@ public class DetectedOperationDto: IId
[Required]
public WellOperationCategoryDto OperationCategory { get; set; } = null!;
- ///
- /// Пользователь панели оператора
- ///
- public string? TelemetryUserName { get; set; }
-
///
/// Ключевой параметр операции
///
[Required]
public double Value { get; set; }
+
+ ///
+ /// Доп. инфо по операции
+ ///
+ public IDictionary ExtraData { get; set; } = new Dictionary();
}
\ No newline at end of file
diff --git a/AsbCloudInfrastructure/Services/DetectOperations/DetectableTelemetry.cs b/AsbCloudInfrastructure/Services/DetectOperations/DetectableTelemetry.cs
index 55a605f2..0e42bb1f 100644
--- a/AsbCloudInfrastructure/Services/DetectOperations/DetectableTelemetry.cs
+++ b/AsbCloudInfrastructure/Services/DetectOperations/DetectableTelemetry.cs
@@ -5,7 +5,6 @@ namespace AsbCloudInfrastructure.Services.DetectOperations;
public class DetectableTelemetry
{
public DateTimeOffset DateTime { get; set; }
- public int? IdUser { get; set; }
public int Mode { get; set; }
public float WellDepth { get; set; }
public float Pressure { get; set; }
diff --git a/AsbCloudInfrastructure/Services/DetectOperations/Detectors/OperationDetectorResult.cs b/AsbCloudInfrastructure/Services/DetectOperations/Detectors/OperationDetectorResult.cs
index fcab00bd..8325d86c 100644
--- a/AsbCloudInfrastructure/Services/DetectOperations/Detectors/OperationDetectorResult.cs
+++ b/AsbCloudInfrastructure/Services/DetectOperations/Detectors/OperationDetectorResult.cs
@@ -1,4 +1,4 @@
-using AsbCloudDb.Model;
+using AsbCloudApp.Data.DetectedOperation;
namespace AsbCloudInfrastructure.Services.DetectOperations.Detectors
{
@@ -7,6 +7,6 @@ namespace AsbCloudInfrastructure.Services.DetectOperations.Detectors
{
public int TelemetryBegin { get; set; }
public int TelemetryEnd { get; set; }
- public DetectedOperation Operation { get; set; } = null!;
+ public DetectedOperationDto Operation { get; set; } = null!;
}
}