From 7cfd60844e16bab8923ae3afe16d508c2478fe83 Mon Sep 17 00:00:00 2001 From: ngfrolov Date: Wed, 16 Nov 2022 12:49:11 +0500 Subject: [PATCH] fix TelemetryService. wrong cacheType. update webclient --- .../Services/SAUB/TelemetryService.cs | 14 +++++++------- AsbCloudWebApi/wwwroot/index.html | 18 +++++++++++++++++- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/AsbCloudInfrastructure/Services/SAUB/TelemetryService.cs b/AsbCloudInfrastructure/Services/SAUB/TelemetryService.cs index c1b35fdb..293df995 100644 --- a/AsbCloudInfrastructure/Services/SAUB/TelemetryService.cs +++ b/AsbCloudInfrastructure/Services/SAUB/TelemetryService.cs @@ -37,11 +37,11 @@ namespace AsbCloudInfrastructure.Services.SAUB this.timezoneService = timezoneService; } - private Dictionary GetTelemetryCache() + private IEnumerable GetTelemetryCache() { var cache = db.Telemetries .Include(t => t.Well) - .FromCacheDictionary(telemetryCacheTag, telemetryCacheObsolescence, t => t.Id); + .FromCache(telemetryCacheTag, telemetryCacheObsolescence); return cache; } @@ -52,7 +52,7 @@ namespace AsbCloudInfrastructure.Services.SAUB public DateTime GetLastTelemetryDate(int idTelemetry) { - var telemetry = GetTelemetryCache().GetValueOrDefault(idTelemetry); + var telemetry = GetTelemetryCache().FirstOrDefault(t => t.Id == idTelemetry); if (telemetry is null) throw new Exception($"Telemetry id:{idTelemetry} does not exist"); @@ -65,7 +65,7 @@ namespace AsbCloudInfrastructure.Services.SAUB public DatesRangeDto GetDatesRange(int idTelemetry) { - var telemetry = GetTelemetryCache().GetValueOrDefault(idTelemetry); + var telemetry = GetTelemetryCache().FirstOrDefault(t => t.Id == idTelemetry); if (telemetry is null) throw new Exception($"Telemetry id:{idTelemetry} does not exist"); @@ -107,7 +107,7 @@ namespace AsbCloudInfrastructure.Services.SAUB public SimpleTimezoneDto GetTimezone(int idTelemetry) { - var telemetry = GetTelemetryCache().GetValueOrDefault(idTelemetry); + var telemetry = GetTelemetryCache().FirstOrDefault(t => t.Id == idTelemetry); if (telemetry is null) throw new Exception($"Telemetry id: {idTelemetry} does not exist."); @@ -144,7 +144,7 @@ namespace AsbCloudInfrastructure.Services.SAUB public int? GetOrDefaultIdTelemetryByIdWell(int idWell) { var telemetry = GetTelemetryCache() - .FirstOrDefault(t => t.Value.Well?.Id == idWell).Value; + .FirstOrDefault(t => t.Well?.Id == idWell); return telemetry?.Id; } @@ -156,7 +156,7 @@ namespace AsbCloudInfrastructure.Services.SAUB private Telemetry? GetOrDefaultTelemetryByUid(string uid) { - var telemetry = GetTelemetryCache().FirstOrDefault(kv => kv.Value.RemoteUid == uid).Value; + var telemetry = GetTelemetryCache().FirstOrDefault(t => t.RemoteUid == uid); return telemetry; } diff --git a/AsbCloudWebApi/wwwroot/index.html b/AsbCloudWebApi/wwwroot/index.html index 2b213ff2..74bafd67 100644 --- a/AsbCloudWebApi/wwwroot/index.html +++ b/AsbCloudWebApi/wwwroot/index.html @@ -1 +1,17 @@ -DDrilling
\ No newline at end of file + + + + + + + + + + + DDrilling + + + +
+ +