From a3938a2dff21d92f67557536a3abdf4ad72544f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D1=82=D0=B5=D0=BF=D0=B0=D0=BD=D0=BE=D0=B2=20=D0=94?=
 =?UTF-8?q?=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9?= <falldimka007@gmail.com>
Date: Tue, 20 Feb 2024 11:15:05 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3=20DTO?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Data/DetectedOperation/DetectedOperationDto.cs    | 11 ++++++-----
 .../Services/DetectOperations/DetectableTelemetry.cs  |  1 -
 .../Detectors/OperationDetectorResult.cs              |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

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!;
 
-    /// <summary>
-    /// Пользователь панели оператора
-    /// </summary>
-    public string? TelemetryUserName { get; set; }
-
     /// <summary>
     /// Ключевой параметр операции
     /// </summary>
     [Required]
     public double Value { get; set; }
+
+    /// <summary>
+    /// Доп. инфо по операции
+    /// </summary>
+    public IDictionary<string, object> ExtraData { get; set; } = new Dictionary<string, object>();
 }
\ 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!;
 	}
 }