@item.Title
diff --git a/MP.MONO.UI/Components/AlarmsOverview.razor.cs b/MP.MONO.UI/Components/AlarmsOverview.razor.cs
index 9624d7f..dda25c5 100644
--- a/MP.MONO.UI/Components/AlarmsOverview.razor.cs
+++ b/MP.MONO.UI/Components/AlarmsOverview.razor.cs
@@ -1,6 +1,7 @@
using Microsoft.AspNetCore.Components;
using MP.MONO.Core.DTO;
using MP.MONO.Data;
+using MP.MONO.UI.Data;
using Newtonsoft.Json;
namespace MP.MONO.UI.Components
@@ -49,6 +50,20 @@ namespace MP.MONO.UI.Components
private List
? ListRecords { get; set; } = new List();
+ private selectGlobalToggle currFilter { get; set; } = new selectGlobalToggle();
+
+ private int numAlarm
+ {
+ get => currFilter.numAlarms;
+ set
+ {
+ if (ListRecords != null)
+ {
+ currFilter.numAlarms = value;
+ }
+ }
+ }
+
#endregion Private Properties
#region Private Methods
@@ -81,6 +96,7 @@ namespace MP.MONO.UI.Components
{
StateHasChanged();
});
+ numAlarm = ListRecords.Count;
}
#endregion Private Methods
diff --git a/MP.MONO.UI/Data/CurrentDataService.cs b/MP.MONO.UI/Data/CurrentDataService.cs
index aa929a2..fdb7481 100644
--- a/MP.MONO.UI/Data/CurrentDataService.cs
+++ b/MP.MONO.UI/Data/CurrentDataService.cs
@@ -7,9 +7,11 @@ using MP.MONO.Data.DbModels;
using MP.MONO.Data.DTO;
using Newtonsoft.Json;
using NLog;
+using Org.BouncyCastle.Bcpg.OpenPgp;
using StackExchange.Redis;
using System.ComponentModel.DataAnnotations;
using System.Diagnostics;
+using System.Diagnostics.Eventing.Reader;
using System.Reflection.PortableExecutable;
using static MP.MONO.Core.Enums;
@@ -117,12 +119,34 @@ namespace MP.MONO.UI.Data
///
public async Task> AlarmLogGetFilt(int machineId, int skipRec, int numRec)
{
+ string source = "DB";
+ List dbResult = new List();
Stopwatch stopWatch = new Stopwatch();
+ string currKey = $"{Constants.ALARM_LOG}:{machineId}:{skipRec}:{numRec}";
stopWatch.Start();
- var dbResult = dbController.AlarmLogGetFilt(machineId, skipRec, numRec);
+ string rawData = await redisDb.StringGetAsync(currKey);
+ if (!string.IsNullOrEmpty(rawData))
+ {
+ source = "REDIS";
+ var tempResult = JsonConvert.DeserializeObject>(rawData);
+ if (tempResult == null)
+ {
+ dbResult = new List();
+ }
+ else
+ {
+ dbResult = tempResult;
+ }
+ }
+ else
+ {
+ dbResult = await dbController.AlarmLogGetFilt(machineId, skipRec, numRec);
+ rawData = JsonConvert.SerializeObject(dbResult);
+ await redisDb.StringSetAsync(currKey, rawData, TimeSpan.FromMilliseconds(1000));
+ }
stopWatch.Stop();
TimeSpan ts = stopWatch.Elapsed;
- Log.Trace($"Effettuata lettura da DB AlarmLogGetFilt: {ts.TotalMilliseconds} ms");
+ Log.Debug($"AlarmLogGetFilt | {source} in : {ts.TotalMilliseconds} ms");
return await Task.FromResult(dbResult);
}
///
@@ -190,9 +214,9 @@ namespace MP.MONO.UI.Data
}
else
{
- dbResult = dbController.AlarmRecGetFilt(MachineId, skipRec, numRec);
+ dbResult = await dbController.AlarmRecGetFilt(MachineId, skipRec, numRec);
rawData = JsonConvert.SerializeObject(dbResult);
- await redisDb.StringSetAsync(currKey, rawData, TimeSpan.FromMilliseconds(500));
+ await redisDb.StringSetAsync(currKey, rawData, TimeSpan.FromMilliseconds(1000));
}
stopWatch.Stop();
TimeSpan ts = stopWatch.Elapsed;
diff --git a/MP.MONO.UI/Data/selectChartParams.cs b/MP.MONO.UI/Data/selectChartParams.cs
index 4161520..b6c6173 100644
--- a/MP.MONO.UI/Data/selectChartParams.cs
+++ b/MP.MONO.UI/Data/selectChartParams.cs
@@ -35,6 +35,7 @@
/// Bool: indica se sia richeista analisi per frequenza (vs durata)
///
public bool setFreqDur { get; set; } = true;
+
#endregion Public Properties
@@ -60,6 +61,7 @@
if (dtMin != item.dtMin)
return false;
+
return true;
}
diff --git a/MP.MONO.UI/Data/selectGlobalToggle.cs b/MP.MONO.UI/Data/selectGlobalToggle.cs
index bddb734..ef96670 100644
--- a/MP.MONO.UI/Data/selectGlobalToggle.cs
+++ b/MP.MONO.UI/Data/selectGlobalToggle.cs
@@ -39,6 +39,11 @@ namespace MP.MONO.UI.Data
public string rightStringCSS { get; set; } = "";
+ ///
+ /// numero allarmi
+ ///
+ public int numAlarms { get; set; } = 0;
+
#endregion Public Properties
#region Public Methods
@@ -63,6 +68,9 @@ namespace MP.MONO.UI.Data
if (rightStringCSS != item.rightStringCSS)
return false;
+ if (numAlarms != item.numAlarms)
+ return false;
+
return true;
}
diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj
index 2fe9583..2ed84aa 100644
--- a/MP.MONO.UI/MP.MONO.UI.csproj
+++ b/MP.MONO.UI/MP.MONO.UI.csproj
@@ -5,7 +5,7 @@
enable
enable
AnyCPU;x86;x64
- 1.2.2210.2415
+ 1.2.2210.2418
diff --git a/MP.MONO.UI/NLog.config b/MP.MONO.UI/NLog.config
index a9d9392..cab77b4 100644
--- a/MP.MONO.UI/NLog.config
+++ b/MP.MONO.UI/NLog.config
@@ -52,7 +52,7 @@
-->
-
+
\ No newline at end of file
diff --git a/MP.MONO.UI/Pages/Alarms.razor b/MP.MONO.UI/Pages/Alarms.razor
index 1b9a821..c722509 100644
--- a/MP.MONO.UI/Pages/Alarms.razor
+++ b/MP.MONO.UI/Pages/Alarms.razor
@@ -10,38 +10,71 @@