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

Правка метода FromDate в TelemetryDataCache

Browse Source
This commit is contained in:
Оля Бизюкова 2025-01-30 17:09:34 +05:00
parent 04b3e64e6d
commit 6bdb4e77a8
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
AsbCloudDb/Migrations/20250121080706_AddNewPropsToTelemetryDataWellWorkover.cs
View File

@ -10,9 +10,9 @@ namespace AsbCloudDb.Migrations
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterDatabase(
oldCollation: "Russian_Russia.1251")
.OldAnnotation("Npgsql:PostgresExtension:adminpack", ",,");
//migrationBuilder.AlterDatabase(
// oldCollation: "Russian_Russia.1251")
// .OldAnnotation("Npgsql:PostgresExtension:adminpack", ",,");
migrationBuilder.AddColumn<short>(
name: "state",
@ -54,9 +54,9 @@ namespace AsbCloudDb.Migrations
name: "well_depth",
table: "t_telemetry_data_well_workover");
migrationBuilder.AlterDatabase(
collation: "Russian_Russia.1251")
.Annotation("Npgsql:PostgresExtension:adminpack", ",,");
//migrationBuilder.AlterDatabase(
// collation: "Russian_Russia.1251")
// .Annotation("Npgsql:PostgresExtension:adminpack", ",,");
}
}
}

10
AsbCloudInfrastructure/Services/SAUB/TelemetryDataCache.cs
View File

@ -358,8 +358,12 @@ public class TelemetryDataCache<TDto> : ITelemetryDataCache<TDto> where TDto : A
private static DateTimeOffset FromDate(DateTime dateTime, TimeSpan timezoneOffset)
{
var dateTimeNoKind = DateTime.SpecifyKind(dateTime, DateTimeKind.Unspecified);
var dateTimeOffset = new DateTimeOffset(dateTimeNoKind, timezoneOffset);
return dateTimeOffset;
if (dateTime == default)
{
return default;
}
var dateTimeNoKind = DateTime.SpecifyKind(dateTime, DateTimeKind.Unspecified);
return new DateTimeOffset(dateTimeNoKind, timezoneOffset);
}
}

1
AsbCloudInfrastructure/Startup.cs
View File

@ -27,6 +27,7 @@ public class Startup
// TODO: Сделать инициализацию кеша телеметрии более явной.
_ = provider.GetRequiredService<ITelemetryDataCache<TelemetryDataSaubDto>>();
_ = provider.GetRequiredService<ITelemetryDataCache<TelemetryDataSpinDto>>();
_ = provider.GetRequiredService<ITelemetryDataCache<TelemetryDataWellWorkoverDto>>();
var backgroundWorker = provider.GetRequiredService<PeriodicBackgroundWorker>();
backgroundWorker.Add<WorkToDeleteOldReports>(TimeSpan.FromDays(1));