From 74083fac93aedc289cd67bdf1e7e5ae954dba506 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 28 May 2026 08:46:45 +0200 Subject: [PATCH] Fix naming + pulizia metodi nonn usati --- MP.SPEC/Components/ListDossiers.razor.cs | 4 +- MP.SPEC/Components/ListODL.razor.cs | 2 +- MP.SPEC/Components/ListPODL.razor.cs | 2 +- MP.SPEC/Data/MpDataService.cs | 89 ++++-------------------- MP.SPEC/Pages/ODL.razor.cs | 2 +- MP.SPEC/Pages/PODL.razor.cs | 2 +- 6 files changed, 20 insertions(+), 81 deletions(-) diff --git a/MP.SPEC/Components/ListDossiers.razor.cs b/MP.SPEC/Components/ListDossiers.razor.cs index 2947870b..037de309 100644 --- a/MP.SPEC/Components/ListDossiers.razor.cs +++ b/MP.SPEC/Components/ListDossiers.razor.cs @@ -231,7 +231,7 @@ namespace MP.SPEC.Components { await MDService.ConfigResetCache(); ListGruppiFase = MDService.ElencoGruppiFase(); - ListStati = await MDService.AnagStatiComm(); + ListStati = await MDService.AnagStatiCommAsync(); selAzienda = await MDService.ConfigTryGetAsync("AZIENDA"); giacenzeConf = await MDService.ConfigTryGetAsync("SPEC_ShowGiacenze"); ListArticoli = await MDService.ArticoliGetSearchAsync(100000, "*", selAzienda, ""); @@ -436,7 +436,7 @@ namespace MP.SPEC.Components private async Task ReloadData(bool setChanged) { isLoading = true; - SearchRecords = await MDService.DossiersGetLastFilt(SelMacchina, SelArticolo, SelDtStart, SelDtEnd, MaxRec); + SearchRecords = await MDService.DossiersGetLastFiltAsync(SelMacchina, SelArticolo, SelDtStart, SelDtEnd, MaxRec); totalCount = SearchRecords.Count; ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList(); await Task.Delay(1); diff --git a/MP.SPEC/Components/ListODL.razor.cs b/MP.SPEC/Components/ListODL.razor.cs index c5791926..47129602 100644 --- a/MP.SPEC/Components/ListODL.razor.cs +++ b/MP.SPEC/Components/ListODL.razor.cs @@ -206,7 +206,7 @@ namespace MP.SPEC.Components protected override async Task OnInitializedAsync() { - ListStati = await MDService.AnagStatiComm(); + ListStati = await MDService.AnagStatiCommAsync(); ListArtKit = await MDService.ArticoliGetByTipoAsync("KIT", "*"); string SPEC_PODL_gest = await MDService.ConfigTryGetAsync("SPEC_PODL_gest"); if (!string.IsNullOrEmpty(SPEC_PODL_gest)) diff --git a/MP.SPEC/Components/ListPODL.razor.cs b/MP.SPEC/Components/ListPODL.razor.cs index 4b75606b..533f647a 100644 --- a/MP.SPEC/Components/ListPODL.razor.cs +++ b/MP.SPEC/Components/ListPODL.razor.cs @@ -230,7 +230,7 @@ namespace MP.SPEC.Components .Select(x => x.IdxMacchina) .ToHashSet(); - ListStati = await MDService.AnagStatiComm(); + ListStati = await MDService.AnagStatiCommAsync(); ListArtKit = await MDService.ArticoliGetByTipoAsync("KIT", "*"); string strMachRecipe = await MDService.ConfigTryGetAsync("MachineWithRecipe"); if (!string.IsNullOrEmpty(strMachRecipe)) diff --git a/MP.SPEC/Data/MpDataService.cs b/MP.SPEC/Data/MpDataService.cs index 3361f169..0a2f1715 100644 --- a/MP.SPEC/Data/MpDataService.cs +++ b/MP.SPEC/Data/MpDataService.cs @@ -171,41 +171,6 @@ namespace MP.SPEC.Data ); } - /// - /// Elenco EVENTI validi x macchina - /// - /// - public List AnagEventiGetByMacch(string IdxMacch) - { - using var activity = ActivitySource.StartActivity("AnagEventiGetByMacch"); - string source = "DB"; - List? result = new List(); - // cerco in redisConn... - string currKey = $"{Utils.redisEventList}:VSEB:{IdxMacch}"; - RedisValue rawData = redisDb.StringGet(currKey); - if (rawData.HasValue) - { - result = JsonConvert.DeserializeObject>($"{rawData}"); - source = "REDIS"; - } - else - { - result = dbController.AnagEventiGetByMacc(IdxMacch); - // serializzo e salvo... - rawData = JsonConvert.SerializeObject(result); - redisDb.StringSet(currKey, rawData, getRandTOut(redisLongTimeCache)); - } - if (result == null) - { - result = new List(); - } - activity?.SetTag("data.source", source); - activity?.SetTag("result.count", result.Count); - activity?.Stop(); - LogTrace($"AnagEventiGetByMacch | {source} | {activity?.Duration.TotalMilliseconds}ms"); - return result; - } - /// /// Delete record AnagraficaGruppi /// @@ -243,42 +208,7 @@ namespace MP.SPEC.Data return result; } - /// - /// Elenco Gruppi - /// - /// - public async Task> AnagKeyValGetAll() - { - // nuovo oggetto span activity - using var activity = ActivitySource.StartActivity("AnagKeyValGetAll"); - string source = "DB"; - List? result = new List(); - // cerco in redis... - RedisValue rawData = await redisDb.StringGetAsync(Utils.redisAKVKey); - if (!string.IsNullOrEmpty($"{rawData}")) - { - result = JsonConvert.DeserializeObject>($"{rawData}"); - source = "REDIS"; - } - else - { - result = await Task.FromResult(dbController.AnagKeyValGetAll()); - // serializzo e salvo... - rawData = JsonConvert.SerializeObject(result); - await redisDb.StringSetAsync(Utils.redisConfKey, rawData, getRandTOut(redisLongTimeCache)); - } - if (result == null) - { - result = new List(); - } - activity?.SetTag("data.source", source); - activity?.SetTag("result.count", result.Count); - activity?.Stop(); - LogTrace($"AnagKeyValGetAll Read from {source}: {activity?.Duration.TotalMilliseconds}ms"); - return result; - } - - public async Task> AnagStatiComm() + public async Task> AnagStatiCommAsync() { return await GetOrFetchAsync( operationName: "AnagStatiCommAsync", @@ -346,9 +276,7 @@ namespace MP.SPEC.Data public async Task> ArticoliGetByTipoAsync(string tipo, string azienda = "*") { string sKey = string.IsNullOrWhiteSpace(tipo) ? "ALL" : tipo.Trim(); - string redisKey = $"{Utils.redisArtList}:{azienda}:Tipo:{sKey}"; - return await GetOrFetchAsync( operationName: "ArticoliGetByTipoAsync", cacheKey: redisKey, @@ -527,12 +455,19 @@ namespace MP.SPEC.Data { using var activity = ActivitySource.StartActivity("ConfigResetCache"); string source = "REDIS"; - await redisDb.StringSetAsync(Utils.redisConfKey, ""); + await ResetConfigCache(); activity?.SetTag("data.source", source); activity?.Stop(); LogTrace($"ConfigResetCache Read from {source}: {activity?.Duration.TotalMilliseconds}ms"); } + private async Task ResetConfigCache() + { + await redisDb.StringSetAsync(Utils.redisConfKey, ""); + List tags2del = new List() { Utils.redisConfKey }; + await FlushCacheByTagsAsync(tags2del); + } + /// /// Restituisce valore della stringa (SE disponibile) /// @@ -584,6 +519,7 @@ namespace MP.SPEC.Data using var activity = ActivitySource.StartActivity("ConfigUpdateAsync"); string source = "DB"; var updRes = await dbController.ConfigUpdateAsync(updRec); + await ResetConfigCache(); activity?.SetTag("data.source", source); activity?.Stop(); LogTrace($"ConfigUpdateAsync Read from {source}: {activity?.Duration.TotalMilliseconds}ms"); @@ -655,7 +591,7 @@ namespace MP.SPEC.Data /// Data Massima per estrazione records /// Num Max records da recuperare /// - public async Task> DossiersGetLastFilt(string IdxMacchina, string CodArticolo, DateTime DtStart, DateTime DtEnd, int MaxRec) + public async Task> DossiersGetLastFiltAsync(string IdxMacchina, string CodArticolo, DateTime DtStart, DateTime DtEnd, int MaxRec) { using var activity = ActivitySource.StartActivity("DossiersGetLastFiltAsync"); List? result = new List(); @@ -3332,6 +3268,9 @@ namespace MP.SPEC.Data await ExecFlushRedisPatternAsync(pattern); pattern = new RedisValue($"{Utils.redisArtList}:*"); await ExecFlushRedisPatternAsync(pattern); + // elimino anche in FusionCache + List tags2del = new List() { Utils.redisArtList, Utils.redisArtByDossier }; + await FlushCacheByTagsAsync(tags2del); activity?.SetTag("data.source", "REDIS"); } diff --git a/MP.SPEC/Pages/ODL.razor.cs b/MP.SPEC/Pages/ODL.razor.cs index a364953f..fbc11aa7 100644 --- a/MP.SPEC/Pages/ODL.razor.cs +++ b/MP.SPEC/Pages/ODL.razor.cs @@ -110,7 +110,7 @@ namespace MP.SPEC.Pages { ListGruppiFase = allGruppiData.Where(x => x.SelEnabled).ToList(); } - ListStati = await MDService.AnagStatiComm(); + ListStati = await MDService.AnagStatiCommAsync(); ListMacchine = MDService.MacchineGetFilt(selReparto); padCodXdl = await MDService.ConfigTryGetAsync("PadCodXdl"); } diff --git a/MP.SPEC/Pages/PODL.razor.cs b/MP.SPEC/Pages/PODL.razor.cs index 9cd43918..1a6b35ac 100644 --- a/MP.SPEC/Pages/PODL.razor.cs +++ b/MP.SPEC/Pages/PODL.razor.cs @@ -135,7 +135,7 @@ namespace MP.SPEC.Pages { ListGruppiFase = allGruppiData.Where(x => x.SelEnabled).ToList(); } - ListStati = await MDService.AnagStatiComm(); + ListStati = await MDService.AnagStatiCommAsync(); currAzienda = await MDService.ConfigTryGetAsync("AZIENDA"); padCodXdl = await MDService.ConfigTryGetAsync("padCodXdl"); useFasi4KeyRich = await MDService.ConfigTryGetAsync("SPEC_KeyRichiesta");