Ottimizzazioni selezione casi distinct

MP.SPEC/Components/DossiersFilter.razor.cs

@@ -43,14 +43,14 @@ namespace MP.SPEC.Components
         {
             get
             {
-                return SelFilterDossier.DtRef;
+                return SelFilterDossier.DtEnd;
             }
 
             set
             {
-                if (!SelFilterDossier.DtRef.Equals(value))
+                if (!SelFilterDossier.DtEnd.Equals(value))
                 {
-                    SelFilterDossier.DtRef = value;
+                    SelFilterDossier.DtEnd = value;
                     reportChange();
                 }
             }
@@ -101,7 +101,7 @@ namespace MP.SPEC.Components
         protected override async Task OnInitializedAsync()
         {
             SelFilterDossier = new SelectDossierParams();
-            ListMacchine = await MDService.MacchineWithFlux();
+            ListMacchine = await MDService.MacchineWithFlux(SelFilterDossier.DtStart, SelFilterDossier.DtEnd);
             ListArticoli = await MDService.ArticleWithDossier();
             await FilterChanged.InvokeAsync(SelFilterDossier);
         }

MP.SPEC/Components/ListDossiers.razor.cs

@@ -187,7 +187,7 @@ namespace MP.SPEC.Components
 
         private DateTime SelDtRef
         {
-            get => SelFilter.DtRef;
+            get => SelFilter.DtEnd;
         }
 
         private string SelMacchina

MP.SPEC/Components/ParamsFilter.razor.cs

@@ -168,7 +168,10 @@ namespace MP.SPEC.Components
         protected override async Task OnInitializedAsync()
         {
             SelFilter = new SelectFluxParams();
-            ListMacchine = await MDService.MacchineWithFlux();
+            setDtMax();
+            DateTime dtStart = SelFilter.dtMin != null ? (DateTime)SelFilter.dtMin : DateTime.Now.AddDays(-7);
+            DateTime dtEnd = SelFilter.dtMax != null ? (DateTime)SelFilter.dtMax : DateTime.Now;
+            ListMacchine = await MDService.MacchineWithFlux(dtStart, dtEnd);
             ListFlux = await MDService.ParametriGetFilt(selMacchina);
 
             var configData = await MDService.ConfigGetAll();

MP.SPEC/Data/MpDataService.cs

@@ -468,13 +468,33 @@ namespace MP.SPEC.Data
         /// <returns></returns>
         public async Task<List<FluxLog>> FluxLogGetLastFilt(DateTime DtMax, string IdxMacchina, string CodFlux, int MaxRec)
         {
+            List<FluxLog>? result = new List<FluxLog>();
             Stopwatch stopWatch = new Stopwatch();
             stopWatch.Start();
-            var results = await Task.FromResult(dbController.FluxLogGetLastFilt(DtMax, IdxMacchina, CodFlux, MaxRec));
+            string readType = "DB";
+            string currKey = $"{redisFluxLogFilt}:{IdxMacchina}:{CodFlux}:{MaxRec}:{DtMax:yyyyMMdd}:{DtMax:HHmm}";
+            // cerco in redis dato valore sel macchina...
+            RedisValue rawData = redisDb.StringGet(currKey);
+            if (rawData.HasValue)
+            {
+                result = JsonConvert.DeserializeObject<List<FluxLog>>($"{rawData}");
+                readType = "REDIS";
+            }
+            else
+            {
+                result = await Task.FromResult(dbController.FluxLogGetLastFilt(DtMax, IdxMacchina, CodFlux, MaxRec));
+                // serializzo e salvo...
+                rawData = JsonConvert.SerializeObject(result);
+                redisDb.StringSet(currKey, rawData, TimeSpan.FromSeconds(10));
+            }
+            if (result == null)
+            {
+                result = new List<FluxLog>();
+            }
             stopWatch.Stop();
             TimeSpan ts = stopWatch.Elapsed;
-            Log.Debug($"FluxLogGetLastFilt | Read from DB: {ts.TotalMilliseconds}ms");
-            return results;
+            Log.Debug($"FluxLogGetLastFilt | Read from {readType}: {ts.TotalMilliseconds}ms");
+            return result;
         }
 
         /// <summary>
@@ -613,16 +633,18 @@ namespace MP.SPEC.Data
         }
 
         /// <summary>
-        /// Elenco ID macchine con dati FluxLog gestite
+        /// Elenco id Macchine che abbiano dati FLuxLog, nel periodo indicato
         /// </summary>
+        /// <param name="dtStart"></param>
+        /// <param name="dtEnd"></param>
         /// <returns></returns>
-        public async Task<List<string>> MacchineWithFlux()
+        public async Task<List<string>> MacchineWithFlux(DateTime dtStart, DateTime dtEnd)
         {
             List<string>? result = new List<string>();
             Stopwatch stopWatch = new Stopwatch();
             stopWatch.Start();
             string readType = "DB";
-            string currKey = redisMacByFlux;
+            string currKey = $"{redisMacByFlux}:{dtStart:yyyyMMddHHmm}:{dtEnd:yyyyMMddHHmm}";
             // cerco in redis dato valore sel macchina...
             RedisValue rawData = redisDb.StringGet(currKey);
             if (rawData.HasValue)
@@ -632,7 +654,7 @@ namespace MP.SPEC.Data
             }
             else
             {
-                result = await dbController.MacchineWithFlux();
+                result = await dbController.MacchineWithFlux(dtStart, dtEnd);
                 // serializzo e salvo...
                 rawData = JsonConvert.SerializeObject(result);
                 redisDb.StringSet(currKey, rawData, getRandTOut(redisLongTimeCache));
@@ -902,6 +924,7 @@ namespace MP.SPEC.Data
         private const string redisMacByFlux = redisBaseAddr + "SPEC:Cache:MacByFlux";
         private const string redisMacList = redisBaseAddr + "SPEC:Cache:MacList";
         private const string redisPOdlList = redisBaseAddr + "SPEC:Cache:POdlList";
+        private const string redisFluxLogFilt = redisBaseAddr + "SPEC:Cache:FluxLogFilt";
 
         private const string redisStatoCom = redisBaseAddr + "SPEC:Cache:StatoCom";
 

MP.SPEC/Data/SelectDossierParams.cs

@@ -13,7 +13,9 @@
 
         public int CurrPage { get; set; } = 1;
 
-        public DateTime DtRef { get; set; } = InitDatetime(5);
+        public DateTime DtEnd { get; set; } = InitDatetime(5);
+
+        public DateTime DtStart { get; set; } = InitDatetime(5).AddDays(-7);
 
         public string IdxMacchina { get; set; } = "*";
 
@@ -52,7 +54,7 @@
             if (MaxRecord != item.MaxRecord)
                 return false;
 
-            if (DtRef != item.DtRef)
+            if (DtEnd != item.DtEnd)
                 return false;
 
             if (CurrPage != item.CurrPage)

MP.SPEC/MP.SPEC.csproj

@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP.SPEC</RootNamespace>
-    <Version>6.16.2210.1818</Version>
+    <Version>6.16.2210.1819</Version>
   </PropertyGroup>
 
   <ItemGroup>

MP.SPEC/Pages/ODL.razor.cs

@@ -85,7 +85,7 @@ namespace MP.SPEC.Pages
         protected override async Task OnInitializedAsync()
         {
             ListStati = await MDService.AnagStatiComm();
-            ListMacchine = await MDService.MacchineWithFlux();
+            ListMacchine = await MDService.MacchineWithFlux(currFilter.DtStart, currFilter.DtEnd);
         }
 
         protected async Task pgResetReq(bool doReset)

MP.SPEC/Resources/ChangeLog.html

@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2210.1818</h4>
+    <h4>Versione: 6.16.2210.1819</h4>
     <br /> Note di rilascio:
     <ul>
         <li>

MP.SPEC/Resources/VersNum.txt

@@ -1 +1 @@
-6.16.2210.1818
+6.16.2210.1819

MP.SPEC/Resources/manifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2210.1818</version>
+  <version>6.16.2210.1819</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/MP.SPEC.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>