From 3def1ad101ac06bd7073a61b4cb0e0bcefa9d291 Mon Sep 17 00:00:00 2001
From: Olga Nemt <on.nemtina@digitaldrilling.ru>
Date: Mon, 25 Mar 2024 09:52:34 +0500
Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=BC=D0=B5=D0=BD=D0=B0=20=D1=82=D0=B8?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=B2=20=D0=B4=D0=B0=D1=82=20=D0=B4=D0=BB=D1=8F=20?=
 =?UTF-8?q?TelemetryMessageDto=20=D0=B8=20TelemetryWirelineRunOutBaseDto?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AsbCloudApp/Data/SAUB/TelemetryMessageDto.cs                 | 2 +-
 AsbCloudApp/Data/SAUB/TelemetryWirelineRunOutDto.cs          | 2 +-
 .../Repository/TelemetryWirelineRunOutRepository.cs          | 5 +++--
 AsbCloudInfrastructure/Services/SAUB/MessageService.cs       | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/AsbCloudApp/Data/SAUB/TelemetryMessageDto.cs b/AsbCloudApp/Data/SAUB/TelemetryMessageDto.cs
index 6c246f16..ee86fc46 100644
--- a/AsbCloudApp/Data/SAUB/TelemetryMessageDto.cs
+++ b/AsbCloudApp/Data/SAUB/TelemetryMessageDto.cs
@@ -15,7 +15,7 @@ namespace AsbCloudApp.Data.SAUB
         /// <summary>
         /// отметка времени
         /// </summary>
-        public DateTime Date { get; set; }
+        public DateTimeOffset Date { get; set; }
 
         /// <summary>
         /// глубина забоя
diff --git a/AsbCloudApp/Data/SAUB/TelemetryWirelineRunOutDto.cs b/AsbCloudApp/Data/SAUB/TelemetryWirelineRunOutDto.cs
index 69ac6929..213b67ec 100644
--- a/AsbCloudApp/Data/SAUB/TelemetryWirelineRunOutDto.cs
+++ b/AsbCloudApp/Data/SAUB/TelemetryWirelineRunOutDto.cs
@@ -10,7 +10,7 @@ namespace AsbCloudApp.Data.SAUB
         /// <summary>
         /// отметка времени
         /// </summary>
-        public DateTime DateTime { get; set; }
+        public DateTimeOffset DateTime { get; set; }
 
         /// <summary>
         /// Наработка талевого каната с момента перетяжки каната, т*км
diff --git a/AsbCloudInfrastructure/Repository/TelemetryWirelineRunOutRepository.cs b/AsbCloudInfrastructure/Repository/TelemetryWirelineRunOutRepository.cs
index 81427cf6..ed1f02cf 100644
--- a/AsbCloudInfrastructure/Repository/TelemetryWirelineRunOutRepository.cs
+++ b/AsbCloudInfrastructure/Repository/TelemetryWirelineRunOutRepository.cs
@@ -5,6 +5,7 @@ using AsbCloudApp.Services;
 using AsbCloudDb.Model;
 using Mapster;
 using Microsoft.EntityFrameworkCore;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
@@ -93,14 +94,14 @@ namespace AsbCloudInfrastructure.Repository
         {
             var entity = dto.Adapt<TelemetryWirelineRunOut>();
             entity.IdTelemetry = idTelemetry;
-            entity.DateTime = dto.DateTime.ToUtcDateTimeOffset(timezoneOffset);
+            entity.DateTime = dto.DateTime.ToOffset(TimeSpan.FromHours(timezoneOffset));
             return entity;
         }
 
         private static TelemetryWirelineRunOutDto Convert(TelemetryWirelineRunOut entity, WellDto well, double timezoneOffset)
         {
             var dto = entity.Adapt<TelemetryWirelineRunOutDto>();
-            dto.DateTime = entity.DateTime.ToRemoteDateTime(timezoneOffset);
+            dto.DateTime = entity.DateTime.ToOffset(TimeSpan.FromHours(timezoneOffset));
             dto.WellInfo = well;
             return dto;
         }
diff --git a/AsbCloudInfrastructure/Services/SAUB/MessageService.cs b/AsbCloudInfrastructure/Services/SAUB/MessageService.cs
index 10b71093..d728536a 100644
--- a/AsbCloudInfrastructure/Services/SAUB/MessageService.cs
+++ b/AsbCloudInfrastructure/Services/SAUB/MessageService.cs
@@ -150,7 +150,7 @@ namespace AsbCloudInfrastructure.Services.SAUB
                 var entity = dto.Adapt<TelemetryMessage>();
                 entity.Id = 0;
                 entity.IdTelemetry = telemetry.Id;
-                entity.DateTime = dto.Date.ToUtcDateTimeOffset(timezone.Hours);
+                entity.DateTime = dto.Date.ToOffset(TimeSpan.FromHours(timezone.Hours));
                 db.TelemetryMessages.Add(entity);
             }