diff --git a/LiMan.Api/Controllers/ReleaseController.cs b/LiMan.Api/Controllers/ReleaseController.cs index c0e0ef1..3ed71dc 100644 --- a/LiMan.Api/Controllers/ReleaseController.cs +++ b/LiMan.Api/Controllers/ReleaseController.cs @@ -96,8 +96,11 @@ namespace LiMan.APi.Controllers if (CheckReqKeys(CurrReq)) { result = await dataService.ReleaseDtoGetByApp(CurrReq.CodApp); + // non necessario notificare UI... +#if false // invio notifica x app... - dataService.TaskMessPipe.sendMessage(CurrReq.CodImp); + dataService.UpdActMessPipe.sendMessage(CurrReq.CodImp); +#endif // registro updater... dataService.UpdaterRecordAction(CurrReq.CodImp, "GetReleases"); @@ -120,8 +123,11 @@ namespace LiMan.APi.Controllers if (CheckReqKeys(CurrReq)) { result = await dataService.ReleaseGetCritical(); + // non necessario notificare UI... +#if false // invio notifica x app... - dataService.TaskMessPipe.sendMessage(CurrReq.CodImp); + dataService.UpdActMessPipe.sendMessage(CurrReq.CodImp); +#endif // registro updater... dataService.UpdaterRecordAction(CurrReq.CodImp, "GetReleasesCritical"); @@ -154,11 +160,14 @@ namespace LiMan.APi.Controllers NumImp = CurrReq.NumImp, VersNum = CurrReq.VersMin }; - dataService.InstallRelUpsert(checkRec); - // chiamata x effettuare eventuale snapshot sulle installazioni attive - await dataService.InstallRelHistSnapshot(false); - // invio notifica x app... - dataService.TaskMessPipe.sendMessage(CurrReq.CodImp); + bool changed = dataService.InstallRelUpsert(checkRec); + // chiamata x effettuare eventuale snapshot sulle installazioni attive SE variato + await dataService.InstallRelHistSnapshot(changed); + if (changed) + { + // invio notifica x app... + dataService.UpdActMessPipe.sendMessage(CurrReq.CodImp); + } // registro updater... dataService.UpdaterRecordAction(CurrReq.CodImp, "GetReleasesFilt"); @@ -181,9 +190,10 @@ namespace LiMan.APi.Controllers if (CheckReqKeys(CurrReq)) { result = await dataService.ReleaseGetByAppVersLimit(CurrReq.CodApp, CurrReq.VersMin, CurrReq.VersMax); +#if false // invio notifica x app... - dataService.TaskMessPipe.sendMessage(CurrReq.CodImp); - + dataService.UpdActMessPipe.sendMessage(CurrReq.CodImp); +#endif // registro updater... dataService.UpdaterRecordAction(CurrReq.CodImp, "GetReleasesLimit"); @@ -313,7 +323,7 @@ namespace LiMan.APi.Controllers dataService.UpdaterRecordAction(CurrReq.CodImp, "SetManaged"); // invio notifica x app... - dataService.TaskMessPipe.sendMessage(CurrReq.CodImp); + dataService.UpdActMessPipe.sendMessage(CurrReq.CodImp); } await Task.Delay(1); return result; diff --git a/LiMan.Api/Data/ApiDataService.cs b/LiMan.Api/Data/ApiDataService.cs index 2aaec9a..5de8349 100644 --- a/LiMan.Api/Data/ApiDataService.cs +++ b/LiMan.Api/Data/ApiDataService.cs @@ -112,7 +112,7 @@ namespace LiMan.APi.Data } #endif // invio string in messagepipe x forzare refresh... - TaskMessPipe.sendMessage(CodImp); + UpdActMessPipe.sendMessage(CodImp); } /// @@ -139,7 +139,7 @@ namespace LiMan.APi.Data // salvo in altra hash (con key da CodImp) le info specifiche ricevute redisHashKeySet(reqKey, CodImp, Value); // invio string in messagepipe x forzare refresh... - TaskMessPipe.sendMessage(CodImp); + UpdActMessPipe.sendMessage(CodImp); } /// @@ -425,7 +425,7 @@ namespace LiMan.APi.Data answ.TryAdd(item.Key, item.Value); } // invio string in messagepipe x forzare refresh... - TaskMessPipe.sendMessage(CodImp); + UpdActMessPipe.sendMessage(CodImp); return answ; } @@ -453,7 +453,7 @@ namespace LiMan.APi.Data done += answ ? 1 : 0; } // invio string in messagepipe x forzare refresh... - TaskMessPipe.sendMessage(CodImp); + UpdActMessPipe.sendMessage(CodImp); return done; } @@ -483,7 +483,7 @@ namespace LiMan.APi.Data done += answ ? 1 : 0; } // invio string in messagepipe x forzare refresh... - TaskMessPipe.sendMessage(CodImp); + UpdActMessPipe.sendMessage(CodImp); return done; } @@ -547,7 +547,7 @@ namespace LiMan.APi.Data redisHashKeySet((RedisKey)$"{rKeyUpdLastAct}List", CodImp, $"{DateTime.Now:yyyy-MM-dd HH:mm:ss}"); // invio string in messagepipe x forzare refresh... - UpdActMessPipe.sendMessage(CodImp); + TaskMessPipe.sendMessage(CodImp); return done; } diff --git a/LiMan.Api/Resources/ChangeLog.html b/LiMan.Api/Resources/ChangeLog.html index 4c422a6..334fe89 100644 --- a/LiMan.Api/Resources/ChangeLog.html +++ b/LiMan.Api/Resources/ChangeLog.html @@ -1,6 +1,6 @@ License Manager -

Versione: 2.1.2509.1212

+

Versione: 2.1.2512.0311


Note di rilascio: public MessagePipe EnrollMessPipe { get; set; } = null!; - /// - /// Wrapper x invio/ricezione messaggi sul canale dedicato agli eventi Task - /// - public MessagePipe TaskMessPipe { get; set; } = null!; - /// /// Wrapper x invio/ricezione messaggi sul canale dedicato a generico update info dai vari EgwACC /// public MessagePipe UpdActMessPipe { get; set; } = null!; + /// + /// Wrapper x invio/ricezione messaggi sul canale dedicato agli eventi Task + /// + public MessagePipe TaskMessPipe { get; set; } = null!; + #endregion Public Properties #region Public Methods @@ -1196,11 +1196,13 @@ namespace LiMan.DB.Services DateTime adesso = DateTime.Now; if (adesso > VetoInstRelHistSnap || doForce) { - // veto x 4h (+/- rand 60 min) - VetoInstRelHistSnap = adesso.AddHours(4).AddMinutes(rnd.Next(-60, 60)); + // veto x 4h (+/- rand 30 min) + VetoInstRelHistSnap = adesso.AddHours(4).AddMinutes(rnd.Next(-30, 30)); // calcolo periodo come x interfaccia... - DateTime DtFine = DateTime.Today.AddHours(DateTime.Now.Hour); + DateTime DtFine = DateTime.Today.AddHours(DateTime.Now.Hour + 1); DateTime DtInizio = DateTime.Today.AddMonths(-1); + // svuoto cache info... + await ResetInstallStatus(); // recupero info DTO var rawData = await InstallStatusGetInfo(DtInizio, DtFine, "", ""); fatto = dbController.InstallRelHistSnapshot(rawData.InstallStatus); @@ -1218,6 +1220,22 @@ namespace LiMan.DB.Services return fatto; } + /// + /// Reset cache info installazioni x forzare reload + /// + /// + public async Task ResetInstallStatus() + { + bool fatto = false; + Stopwatch sw = new Stopwatch(); + sw.Start(); + string source = "REDIS"; + fatto = await FlushRedisCachePattern($"InstVerSta"); + sw.Stop(); + Log.Debug($"ResetInstallStatus | {source} cleanup in: {sw.Elapsed.TotalMilliseconds} ms"); + return fatto; + } + /// /// Recupera info statistiche installazione dato periodo riferimento, da cache o da db /// @@ -1233,7 +1251,7 @@ namespace LiMan.DB.Services { string filtCli = string.IsNullOrEmpty(CodInst) ? "ALL-INSTALL" : $"{CodInst}"; string filtTipo = string.IsNullOrEmpty(TipoApp) ? "ALL-TIPO" : $"{TipoApp}"; - string currKey = $"{Const.rKeyConfig}:InstVerSta:{filtTipo}:{filtCli}:{dtStart:yyyyMMdd-HHmmss}:{dtEnd:yyyyMMdd-HHmmss}"; + string currKey = $"{Const.rKeyConfig}:InstVerSta:{filtTipo}:{filtCli}:{dtStart:yyyyMMdd-HHmm}:{dtEnd:yyyyMMdd-HHmm}"; Stopwatch sw = new Stopwatch(); sw.Start(); string? rawData = await redisDb.StringGetAsync(currKey); diff --git a/LiMan.DbSync/LiMan.DbSync.csproj b/LiMan.DbSync/LiMan.DbSync.csproj index 80568ea..3e7434d 100644 --- a/LiMan.DbSync/LiMan.DbSync.csproj +++ b/LiMan.DbSync/LiMan.DbSync.csproj @@ -11,13 +11,13 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/LiMan.GLS/LiMan.GLS.csproj b/LiMan.GLS/LiMan.GLS.csproj index 990f0c7..7532db1 100644 --- a/LiMan.GLS/LiMan.GLS.csproj +++ b/LiMan.GLS/LiMan.GLS.csproj @@ -11,10 +11,10 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/LiMan.Transfer/Resources/ChangeLog.html b/LiMan.Transfer/Resources/ChangeLog.html index e618d17..f20ee50 100644 --- a/LiMan.Transfer/Resources/ChangeLog.html +++ b/LiMan.Transfer/Resources/ChangeLog.html @@ -1,6 +1,6 @@ License Manager -

Versione: 2.1.2509.1212

+

Versione: 2.1.2512.0311


Note di rilascio:
    diff --git a/LiMan.Transfer/Resources/VersNum.txt b/LiMan.Transfer/Resources/VersNum.txt index 1d706c2..a7a9080 100644 --- a/LiMan.Transfer/Resources/VersNum.txt +++ b/LiMan.Transfer/Resources/VersNum.txt @@ -1 +1 @@ -2.1.2509.1212 +2.1.2512.0311 diff --git a/LiMan.Transfer/Resources/manifest.xml b/LiMan.Transfer/Resources/manifest.xml index b97fbe6..354df2f 100644 --- a/LiMan.Transfer/Resources/manifest.xml +++ b/LiMan.Transfer/Resources/manifest.xml @@ -1,6 +1,6 @@ - 2.1.2509.1212 + 2.1.2512.0311 https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/LiMan.Transfer.zip https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/ChangeLog.html false diff --git a/LiMan.UI/Components/AggregateStats.razor.cs b/LiMan.UI/Components/AggregateStats.razor.cs index a61b00b..4b25aa6 100644 --- a/LiMan.UI/Components/AggregateStats.razor.cs +++ b/LiMan.UI/Components/AggregateStats.razor.cs @@ -18,7 +18,7 @@ namespace LiMan.UI.Components public void Dispose() { LMDService.EnrollMessPipe.EA_NewMessage -= async (sender, e) => await EnrollMessPipe_EA_NewMessage(sender, e); - LMDService.TaskMessPipe.EA_NewMessage -= async (sender, e) => await TaskMessPipe_EA_NewMessage(sender, e); + LMDService.UpdActMessPipe.EA_NewMessage -= async (sender, e) => await TaskMessPipe_EA_NewMessage(sender, e); MServ.EA_SelCodImp -= async () => await MServ_EA_SelCodImp(); MServ.EA_SelCodInst -= async () => await MServ_EA_SelCodInst(); } @@ -89,7 +89,7 @@ namespace LiMan.UI.Components protected override async Task OnInitializedAsync() { LMDService.EnrollMessPipe.EA_NewMessage += async (sender, e) => await EnrollMessPipe_EA_NewMessage(sender, e); - LMDService.TaskMessPipe.EA_NewMessage += async (sender, e) => await TaskMessPipe_EA_NewMessage(sender, e); + LMDService.UpdActMessPipe.EA_NewMessage += async (sender, e) => await TaskMessPipe_EA_NewMessage(sender, e); MServ.EA_SelCodImp += async () => await MServ_EA_SelCodImp(); MServ.EA_SelCodInst += async () => await MServ_EA_SelCodInst(); await ReloadLicData(); @@ -140,7 +140,7 @@ namespace LiMan.UI.Components private string DevName { get; set; } = ""; - private DateTime DtFine { get; set; } = DateTime.Today.AddHours(DateTime.Now.Hour); + private DateTime DtFine { get; set; } = DateTime.Today.AddHours(DateTime.Now.Hour + 1); private DateTime DtInizio { get; set; } = DateTime.Today.AddMonths(-1); diff --git a/LiMan.UI/Components/InstAppPareto.razor.cs b/LiMan.UI/Components/InstAppPareto.razor.cs index 6b223ce..658046f 100644 --- a/LiMan.UI/Components/InstAppPareto.razor.cs +++ b/LiMan.UI/Components/InstAppPareto.razor.cs @@ -32,7 +32,7 @@ namespace LiMan.UI.Components public void Dispose() { - LMDService.TaskMessPipe.EA_NewMessage -= async (sender, e) => await TaskMessPipe_EA_NewMessage(sender, e); + LMDService.UpdActMessPipe.EA_NewMessage -= async (sender, e) => await TaskMessPipe_EA_NewMessage(sender, e); } #endregion Public Methods @@ -67,7 +67,7 @@ namespace LiMan.UI.Components ReloadTaskStatus(); ReloadTaskResults(); // invio notifica update... - LMDService.TaskMessPipe.sendMessage(selRec.CodApp); + LMDService.UpdActMessPipe.sendMessage(selRec.CodApp); } [Inject] @@ -78,7 +78,7 @@ namespace LiMan.UI.Components protected override void OnInitialized() { - LMDService.TaskMessPipe.EA_NewMessage += async (sender, e) => await TaskMessPipe_EA_NewMessage(sender, e); + LMDService.UpdActMessPipe.EA_NewMessage += async (sender, e) => await TaskMessPipe_EA_NewMessage(sender, e); } protected override void OnParametersSet() diff --git a/LiMan.UI/Components/InstallInfoStats.razor.cs b/LiMan.UI/Components/InstallInfoStats.razor.cs index 74ef3b5..dd90d31 100644 --- a/LiMan.UI/Components/InstallInfoStats.razor.cs +++ b/LiMan.UI/Components/InstallInfoStats.razor.cs @@ -22,7 +22,7 @@ namespace LiMan.UI.Components public void Dispose() { LMDService.EnrollMessPipe.EA_NewMessage -= async (sender, e) => await EnrollMessPipe_EA_NewMessage(sender, e); - LMDService.TaskMessPipe.EA_NewMessage -= async (sender, e) => await TaskMessPipe_EA_NewMessage(sender, e); + LMDService.UpdActMessPipe.EA_NewMessage -= async (sender, e) => await TaskMessPipe_EA_NewMessage(sender, e); MServ.EA_SelCodApp -= async () => await MServ_EA_SelCodApp(); MServ.EA_SelCodImp -= async () => await MServ_EA_SelCodImp(); MServ.EA_SelCodInst -= async () => await MServ_EA_SelCodInst(); @@ -97,7 +97,7 @@ namespace LiMan.UI.Components protected override async Task OnInitializedAsync() { LMDService.EnrollMessPipe.EA_NewMessage += async (sender, e) => await EnrollMessPipe_EA_NewMessage(sender, e); - LMDService.TaskMessPipe.EA_NewMessage += async (sender, e) => await TaskMessPipe_EA_NewMessage(sender, e); + LMDService.UpdActMessPipe.EA_NewMessage += async (sender, e) => await TaskMessPipe_EA_NewMessage(sender, e); MServ.EA_SelCodApp += async () => await MServ_EA_SelCodApp(); MServ.EA_SelCodImp += async () => await MServ_EA_SelCodImp(); MServ.EA_SelCodInst += async () => await MServ_EA_SelCodInst(); @@ -164,7 +164,7 @@ namespace LiMan.UI.Components } private string DevName { get; set; } = ""; - private DateTime DtFine { get; set; } = DateTime.Today.AddHours(DateTime.Now.Hour); + private DateTime DtFine { get; set; } = DateTime.Today.AddHours(DateTime.Now.Hour + 1); private DateTime DtInizio { get; set; } = DateTime.Today.AddMonths(-1); private InstallStatusDTO InfoStats { get; set; } = new InstallStatusDTO(); private bool isLoading { get; set; } = false; @@ -374,7 +374,7 @@ namespace LiMan.UI.Components await Task.Delay(5); } } - // mando notifica con messageservice... + // mando notifica con messageservice... MServ.ReportTaskChange(); } @@ -440,6 +440,13 @@ namespace LiMan.UI.Components if (!string.IsNullOrEmpty(currArgs.newMessage)) { isLoading = true; + InfoStats = null; +#if false + // svuoto cache preliminarmente + await LMDService.ResetInstallStatus(); +#endif + await ReloadLicData(); + await ReloadData(); ReloadTaskStatus(); isLoading = false; await InvokeAsync(StateHasChanged); diff --git a/LiMan.UI/LiMan.UI.csproj b/LiMan.UI/LiMan.UI.csproj index b5ab57e..8e79688 100644 --- a/LiMan.UI/LiMan.UI.csproj +++ b/LiMan.UI/LiMan.UI.csproj @@ -2,7 +2,7 @@ net6.0 - 2.1.2509.1212 + 2.1.2512.0311 LiMan.UI LiMan.UI @@ -50,14 +50,10 @@ - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - + + + + diff --git a/LiMan.UI/Resources/ChangeLog.html b/LiMan.UI/Resources/ChangeLog.html index 4c422a6..334fe89 100644 --- a/LiMan.UI/Resources/ChangeLog.html +++ b/LiMan.UI/Resources/ChangeLog.html @@ -1,6 +1,6 @@ License Manager -

    Versione: 2.1.2509.1212

    +

    Versione: 2.1.2512.0311


    Note di rilascio:
    • diff --git a/LiMan.UI/Resources/VersNum.txt b/LiMan.UI/Resources/VersNum.txt index 1d706c2..a7a9080 100644 --- a/LiMan.UI/Resources/VersNum.txt +++ b/LiMan.UI/Resources/VersNum.txt @@ -1 +1 @@ -2.1.2509.1212 +2.1.2512.0311 diff --git a/LiMan.UI/Resources/manifest.xml b/LiMan.UI/Resources/manifest.xml index 9adec38..f58b298 100644 --- a/LiMan.UI/Resources/manifest.xml +++ b/LiMan.UI/Resources/manifest.xml @@ -1,6 +1,6 @@ - 2.1.2509.1212 + 2.1.2512.0311 https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/LiMan.UI.zip https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/ChangeLog.html false diff --git a/Liman.CadCam/Liman.CadCam.csproj b/Liman.CadCam/Liman.CadCam.csproj index 92db5a9..7cacfa8 100644 --- a/Liman.CadCam/Liman.CadCam.csproj +++ b/Liman.CadCam/Liman.CadCam.csproj @@ -11,13 +11,13 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive