diff --git a/IOB-WIN-FORM/AdapterForm.cs b/IOB-WIN-FORM/AdapterForm.cs index 43a66292..b3b6895b 100644 --- a/IOB-WIN-FORM/AdapterForm.cs +++ b/IOB-WIN-FORM/AdapterForm.cs @@ -148,7 +148,9 @@ namespace IOB_WIN_FORM { if (needSend) { + // calcolo iob url modificato... // segnalo reboot (programma)... + Iob.Generic.callUrl(iobObj.urlReboot, true); } } diff --git a/IOB-WIN-FORM/Iob/Generic.Protected.cs b/IOB-WIN-FORM/Iob/Generic.Protected.cs index 5d7d6759..c35bc859 100644 --- a/IOB-WIN-FORM/Iob/Generic.Protected.cs +++ b/IOB-WIN-FORM/Iob/Generic.Protected.cs @@ -3517,12 +3517,17 @@ namespace IOB_WIN_FORM.Iob { // attenzione: x ora cablato 3 gg e 1 mese le registrazioni DateTime oggi = DateTime.Today; - string rKey = $"{redisMan.redIobTrackKey}:FL:Day:{oggi:yyMMdd}"; + string rKey = $"{redisMan.redIobTrackKey}:DayStats:{oggi:yyMMdd}"; // traccio con scadenza 1 mese da oggi pareto chiamate giornaliere redisMan.redIncrHashCount(rKey, key, oggi.AddMonths(1)); - // traccio con scadenza 3 gg da oggi pareto chaimate x tipo - rKey = $"{redisMan.redIobTrackKey}:FL:Det:{oggi:yyMMdd}:{key}"; - redisMan.redIncrHashCount(rKey, value, oggi.AddDays(3)); + // traccio con scadenza 7 gg da oggi pareto chiamate x tipo + rKey = $"{redisMan.redIobTrackKey}:DetailStats:{oggi:yyMMdd}:{key}"; + redisMan.redIncrHashCount(rKey, value, oggi.AddDays(7)); + // traccio con scadenza 3 gg da oggi TUTTI i dati + KeyValuePair[] kvp = new KeyValuePair[1]; + kvp[0] = new KeyValuePair($"{DateTime.Now:yyyy-MM-dd HH:mm:ss}", value); + rKey = $"{redisMan.redIobTrackKey}:DataLog:{oggi:yyMMdd}:{key}"; + redisMan.redSaveHash(rKey, kvp, oggi.AddDays(3)); } /// @@ -3853,6 +3858,14 @@ namespace IOB_WIN_FORM.Iob return $@"{urlMesServer}{IOBConfFull.MapoMes.ApiUrl(cmqReq)}{IOBConfFull.General.CodIOB}"; } + /// + /// URL come urlCommand + aggiunta codice IOB da file (= specifico x Reboot)da cui viene inviato + /// + protected string urlCommandIobFile(string cmqReq) + { + return $@"{urlMesServer}{IOBConfFull.MapoMes.ApiUrl(cmqReq)}{IOBConfFull.General.FilenameIOB}"; + } + /// /// Verifica se il parametro passi il limite della DeadBand (globale o specifica se /// configurata) Il riferimento รจ al prec valore currProdData diff --git a/IOB-WIN-FORM/Iob/Generic.Public.cs b/IOB-WIN-FORM/Iob/Generic.Public.cs index dbb1012b..62f0e6eb 100644 --- a/IOB-WIN-FORM/Iob/Generic.Public.cs +++ b/IOB-WIN-FORM/Iob/Generic.Public.cs @@ -444,7 +444,7 @@ namespace IOB_WIN_FORM.Iob /// public string urlReboot { - get => $@"{urlCommandIob("sendReboot")}?mac={GetMACAddress()}"; + get => $@"{urlCommandIobFile("sendReboot")}?mac={GetMACAddress()}"; } ///