diff --git a/MP.Data/Controllers/MpSpecController.cs b/MP.Data/Controllers/MpSpecController.cs
index 0d2a1351..652a1412 100644
--- a/MP.Data/Controllers/MpSpecController.cs
+++ b/MP.Data/Controllers/MpSpecController.cs
@@ -1096,21 +1096,17 @@ namespace MP.Data.Controllers
/// Elenco Gruppi
///
///
- public List FluxLogPareto(string idxMacchina, DateTime dtFrom, DateTime dtTo)
+ public async Task> FluxLogParetoAsync(string idxMacchina, DateTime dtFrom, DateTime dtTo)
{
- List dbResult = new List();
- using (var dbCtx = new MoonPro_FluxContext(_configuration))
- {
- dbResult = dbCtx
- .DbSetFluxLog
- .Where(x => (string.IsNullOrEmpty(idxMacchina) || x.IdxMacchina == idxMacchina) && (dtFrom <= x.dtEvento && x.dtEvento <= dtTo))
- .AsNoTracking()
- .GroupBy(x => x.CodFlux)
- .Select(g => new ParetoFluxLogDTO() { IdxMacchina = idxMacchina, CodFlux = g.Key, Qty = g.Count() })
- .OrderByDescending(x => x.Qty)
- .ToList();
- }
- return dbResult;
+ using var dbCtx = new MoonPro_FluxContext(_configuration);
+ return await dbCtx
+ .DbSetFluxLog
+ .Where(x => (string.IsNullOrEmpty(idxMacchina) || x.IdxMacchina == idxMacchina) && (dtFrom <= x.dtEvento && x.dtEvento <= dtTo))
+ .AsNoTracking()
+ .GroupBy(x => x.CodFlux)
+ .Select(g => new ParetoFluxLogDTO() { IdxMacchina = idxMacchina, CodFlux = g.Key, Qty = g.Count() })
+ .OrderByDescending(x => x.Qty)
+ .ToListAsync() ?? new();
}
///
@@ -1803,20 +1799,17 @@ namespace MP.Data.Controllers
///
///
///
- public async Task> MacchineWithFlux(DateTime dtStart, DateTime dtEnd)
+ public async Task> MacchineWithFluxAsync(DateTime dtStart, DateTime dtEnd)
{
- List dbResult = new List();
- using (var dbCtx = new MoonPro_FluxContext(_configuration))
- {
- dbResult = await dbCtx
- .DbSetFluxLog
- .AsNoTracking()
- .Where(x => x.dtEvento >= dtStart && x.dtEvento <= dtEnd)
- .Select(i => i.IdxMacchina)
- .Distinct()
- .ToListAsync();
- }
- return dbResult;
+ using var dbCtx = new MoonPro_FluxContext(_configuration);
+ return await dbCtx
+ .DbSetFluxLog
+ .AsNoTracking()
+ .Where(x => x.dtEvento >= dtStart && x.dtEvento <= dtEnd)
+ .Select(i => i.IdxMacchina)
+ .Distinct()
+ .ToListAsync() ?? new();
+
}
///
diff --git a/MP.SPEC/Components/DossiersFilter.razor.cs b/MP.SPEC/Components/DossiersFilter.razor.cs
index 723965e0..3f4f0d11 100644
--- a/MP.SPEC/Components/DossiersFilter.razor.cs
+++ b/MP.SPEC/Components/DossiersFilter.razor.cs
@@ -132,7 +132,7 @@ namespace MP.SPEC.Components
SelFilterDossier.MaxRecord = 1000;
DateTime dtEnd = SelFilterDossier.DtEnd;
DateTime dtStart = dtEnd.Subtract(SelFilterDossier.DtStart).TotalDays < 15 ? SelFilterDossier.DtStart : dtEnd.AddDays(-14);
- ListMacchine = await MDService.MacchineWithFlux(dtStart, dtEnd);
+ ListMacchine = await MDService.MacchineWithFluxAsync(dtStart, dtEnd);
ListArticoli = await MDService.ArticleWithDossierAsync();
await FilterChanged.InvokeAsync(SelFilterDossier);
}
diff --git a/MP.SPEC/Components/FLStatusList.razor.cs b/MP.SPEC/Components/FLStatusList.razor.cs
index c1493d3e..7f453aef 100644
--- a/MP.SPEC/Components/FLStatusList.razor.cs
+++ b/MP.SPEC/Components/FLStatusList.razor.cs
@@ -116,7 +116,7 @@ namespace MP.SPEC.Components
{
idxMaccLast = IdxMaccSel;
lastPeriodo = CurrPeriodo;
- ListComplete = await MDataServ.FluxLogPareto(IdxMaccSel, CurrPeriodo.Inizio, CurrPeriodo.Fine);
+ ListComplete = await MDataServ.FluxLogParetoAsync(IdxMaccSel, CurrPeriodo.Inizio, CurrPeriodo.Fine);
TotalCount = ListComplete.Count;
TotalRecords = ListComplete.Sum(x => x.Qty);
FluxList = ListComplete.Select(x => x.CodFlux).ToList();
diff --git a/MP.SPEC/Components/ParamsFilter.razor.cs b/MP.SPEC/Components/ParamsFilter.razor.cs
index 6bb8c6e4..f2507145 100644
--- a/MP.SPEC/Components/ParamsFilter.razor.cs
+++ b/MP.SPEC/Components/ParamsFilter.razor.cs
@@ -181,7 +181,7 @@ namespace MP.SPEC.Components
setDtSnap();
DateTime dtStart = SelFilter.dtMin != null ? (DateTime)SelFilter.dtMin : DateTime.Now.AddMonths(-1);
DateTime dtEnd = SelFilter.dtMax != null ? (DateTime)SelFilter.dtMax : DateTime.Today.AddDays(1);
- ListMacchine = await MDService.MacchineWithFlux(dtStart, dtEnd);
+ ListMacchine = await MDService.MacchineWithFluxAsync(dtStart, dtEnd);
ListFlux = await MDService.ParametriGetFilt(selMacchina);
var configData = await MDService.ConfigGetAllAsync();
diff --git a/MP.SPEC/Data/MpDataService.cs b/MP.SPEC/Data/MpDataService.cs
index 9fb69510..1ebed9ac 100644
--- a/MP.SPEC/Data/MpDataService.cs
+++ b/MP.SPEC/Data/MpDataService.cs
@@ -1105,9 +1105,9 @@ namespace MP.SPEC.Data
/// Elenco Gruppi
///
///
- public async Task> FluxLogPareto(string idxMacchina, DateTime dtFrom, DateTime dtTo)
+ public async Task> FluxLogParetoAsync(string idxMacchina, DateTime dtFrom, DateTime dtTo)
{
- using var activity = ActivitySource.StartActivity("FluxLogPareto");
+ using var activity = ActivitySource.StartActivity("FluxLogParetoAsync");
string source = "DB";
List? result = new List();
// cerco in redis...
@@ -1120,7 +1120,7 @@ namespace MP.SPEC.Data
}
else
{
- result = await Task.FromResult(dbController.FluxLogPareto(idxMacchina, dtFrom, dtTo));
+ result = await dbController.FluxLogParetoAsync(idxMacchina, dtFrom, dtTo);
// serializzo e salvo...
rawData = JsonConvert.SerializeObject(result);
await redisDb.StringSetAsync(redKey, rawData, getRandTOut(redisLongTimeCache));
@@ -1132,7 +1132,7 @@ namespace MP.SPEC.Data
activity?.SetTag("data.source", source);
activity?.SetTag("result.count", result.Count);
activity?.Stop();
- LogTrace($"FluxLogPareto | Read from {source}: {activity?.Duration.TotalMilliseconds}ms");
+ LogTrace($"FluxLogParetoAsync | Read from {source}: {activity?.Duration.TotalMilliseconds}ms");
return result;
}
@@ -1545,9 +1545,9 @@ namespace MP.SPEC.Data
///
///
///
- public async Task> MacchineWithFlux(DateTime dtStart, DateTime dtEnd)
+ public async Task> MacchineWithFluxAsync(DateTime dtStart, DateTime dtEnd)
{
- using var activity = ActivitySource.StartActivity("MacchineWithFlux");
+ using var activity = ActivitySource.StartActivity("MacchineWithFluxAsync");
List? result = new List();
string source = "DB";
string currKey = $"{Utils.redisMacByFlux}:{dtStart:yyyyMMddHHmm}:{dtEnd:yyyyMMddHHmm}";
@@ -1560,7 +1560,7 @@ namespace MP.SPEC.Data
}
else
{
- result = await dbController.MacchineWithFlux(dtStart, dtEnd);
+ result = await dbController.MacchineWithFluxAsync(dtStart, dtEnd);
// serializzo e salvo...
rawData = JsonConvert.SerializeObject(result);
redisDb.StringSet(currKey, rawData, getRandTOut(redisLongTimeCache));
@@ -1572,7 +1572,7 @@ namespace MP.SPEC.Data
activity?.SetTag("data.source", source);
activity?.SetTag("result.count", result.Count);
activity?.Stop();
- LogTrace($"MacchineWithFlux | Read from {source}: {activity?.Duration.TotalMilliseconds}ms");
+ LogTrace($"MacchineWithFluxAsync | Read from {source}: {activity?.Duration.TotalMilliseconds}ms");
return result;
}