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

fix TelemetryService. wrong cacheType.

Browse Source 
update webclient
This commit is contained in:
ngfrolov 2022-11-16 12:49:11 +05:00
parent eed8c3eeaa
commit 7cfd60844e
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
AsbCloudInfrastructure/Services/SAUB/TelemetryService.cs
View File

@ -37,11 +37,11 @@ namespace AsbCloudInfrastructure.Services.SAUB
this.timezoneService = timezoneService; this.timezoneService = timezoneService;
} }
private Dictionary<int, Telemetry> GetTelemetryCache() private IEnumerable<Telemetry> GetTelemetryCache()
{ {
var cache = db.Telemetries var cache = db.Telemetries
.Include(t => t.Well) .Include(t => t.Well)
.FromCacheDictionary(telemetryCacheTag, telemetryCacheObsolescence, t => t.Id); .FromCache(telemetryCacheTag, telemetryCacheObsolescence);
return cache; return cache;
} }
@ -52,7 +52,7 @@ namespace AsbCloudInfrastructure.Services.SAUB
public DateTime GetLastTelemetryDate(int idTelemetry) public DateTime GetLastTelemetryDate(int idTelemetry)
{ {
var telemetry = GetTelemetryCache().GetValueOrDefault(idTelemetry); var telemetry = GetTelemetryCache().FirstOrDefault(t => t.Id == idTelemetry);
if (telemetry is null) if (telemetry is null)
throw new Exception($"Telemetry id:{idTelemetry} does not exist"); throw new Exception($"Telemetry id:{idTelemetry} does not exist");
@ -65,7 +65,7 @@ namespace AsbCloudInfrastructure.Services.SAUB
public DatesRangeDto GetDatesRange(int idTelemetry) public DatesRangeDto GetDatesRange(int idTelemetry)
{ {
var telemetry = GetTelemetryCache().GetValueOrDefault(idTelemetry); var telemetry = GetTelemetryCache().FirstOrDefault(t => t.Id == idTelemetry);
if (telemetry is null) if (telemetry is null)
throw new Exception($"Telemetry id:{idTelemetry} does not exist"); throw new Exception($"Telemetry id:{idTelemetry} does not exist");
@ -107,7 +107,7 @@ namespace AsbCloudInfrastructure.Services.SAUB
public SimpleTimezoneDto GetTimezone(int idTelemetry) public SimpleTimezoneDto GetTimezone(int idTelemetry)
{ {
var telemetry = GetTelemetryCache().GetValueOrDefault(idTelemetry); var telemetry = GetTelemetryCache().FirstOrDefault(t => t.Id == idTelemetry);
if (telemetry is null) if (telemetry is null)
throw new Exception($"Telemetry id: {idTelemetry} does not exist."); throw new Exception($"Telemetry id: {idTelemetry} does not exist.");
@ -144,7 +144,7 @@ namespace AsbCloudInfrastructure.Services.SAUB
public int? GetOrDefaultIdTelemetryByIdWell(int idWell) public int? GetOrDefaultIdTelemetryByIdWell(int idWell)
{ {
var telemetry = GetTelemetryCache() var telemetry = GetTelemetryCache()
.FirstOrDefault(t => t.Value.Well?.Id == idWell).Value; .FirstOrDefault(t => t.Well?.Id == idWell);
return telemetry?.Id; return telemetry?.Id;
} }
@ -156,7 +156,7 @@ namespace AsbCloudInfrastructure.Services.SAUB
private Telemetry? GetOrDefaultTelemetryByUid(string uid) 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; return telemetry;
} }

18
AsbCloudWebApi/wwwroot/index.html
View File

@ -1 +1,17 @@
<!doctype html><html lang="ru"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="white"/><meta name="theme-color" media="(prefers-color-scheme: light)" content="white"/><meta name="theme-color" media="(prefers-color-scheme: dark)" content="black"/><meta name="description" content="Онлайн мониторинг процесса бурения в реальном времени в офисе заказчика"/><title>DDrilling</title><script defer="defer" src="/vendors.1920da1d.js"></script><script defer="defer" src="/main.25114aff.js"></script></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html> <!DOCTYPE html>
<html lang="ru">
<head>
<meta charset="utf-8" />
<link rel="icon" href="/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="white" />
<meta name="theme-color" media="(prefers-color-scheme: light)" content="white" />
<meta name="theme-color" media="(prefers-color-scheme: dark)" content="black" />
<meta name="description" content="Онлайн мониторинг процесса бурения в реальном времени в офисе заказчика" />
<title>DDrilling</title>
<script defer src="/runtime~main.5cad8e9a.js"></script><script defer src="/vendors.0c60e3f8.js"></script><script defer src="/main.3e1e062c.js"></script><link href="/main.e200693d.css" rel="stylesheet"></head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
</body>
</html>