diff --git a/MP.Core/Utils.cs b/MP.Core/Utils.cs
index f45e4f7f..2ce3b97c 100644
--- a/MP.Core/Utils.cs
+++ b/MP.Core/Utils.cs
@@ -118,17 +118,6 @@ namespace MP.Core
return answ;
}
- ///
- /// Hash dati STATUS x la macchina specificata
- ///
- ///
- /// Chiave override per i valori in caso di dati che accedono al dominio dati di un altra app (es: baseAddr x IO legacy)
- ///
- public static RedisKey dtMaccHash(string idxMacchina, string baseAddr = null)
- {
- var prefix = (baseAddr ?? redisBaseAddr).TrimEnd(':');
- return (RedisKey)$"{prefix}:DtMac:{idxMacchina}";
- }
public static string FormDurata(double durataMinuti)
{
@@ -227,6 +216,17 @@ namespace MP.Core
{
return (RedisValue)$"{redisBaseAddr}{keyName}";
}
+ ///
+ /// Hash dati STATUS x la macchina specificata
+ ///
+ ///
+ /// Chiave override per i valori in caso di dati che accedono al dominio dati di un altra app (es: baseAddr x IO legacy)
+ ///
+ public static RedisKey RedKeyDatiMacc(string idxMacchina, string baseAddr = null)
+ {
+ var prefix = (baseAddr ?? redisBaseAddr).TrimEnd(':');
+ return (RedisKey)$"{prefix}:DtMac:{idxMacchina}";
+ }
///
/// Hash dati Task2Exe x la macchina specificata
diff --git a/MP.IOC/Data/MpDataService.cs b/MP.IOC/Data/MpDataService.cs
index a22d96d8..c4fae613 100644
--- a/MP.IOC/Data/MpDataService.cs
+++ b/MP.IOC/Data/MpDataService.cs
@@ -1422,7 +1422,7 @@ namespace MP.IOC.Data
// ORA recupero da memoria redis...
try
{
- var currHash = Utils.dtMaccHash(idxMacchina);
+ var currHash = Utils.RedKeyDatiMacc(idxMacchina, MpIoNS);
answ = RedisGetHashDict(currHash);
// se รจ vuoto... leggo da DB e popolo!
if (answ.Count == 0)
@@ -3181,7 +3181,7 @@ namespace MP.IOC.Data
///
private Dictionary ResetDatiMacchina(string idxMacc)
{
- var currHash = Utils.dtMaccHash(idxMacc);
+ var currHash = Utils.RedKeyDatiMacc(idxMacc, MpIoNS);
// inizio con un bel reset...
RedisFlushPattern($"{currHash}");
Dictionary? result = new Dictionary();
diff --git a/MP.IOC/MP.IOC.csproj b/MP.IOC/MP.IOC.csproj
index 4677cd5a..8b1c7d14 100644
--- a/MP.IOC/MP.IOC.csproj
+++ b/MP.IOC/MP.IOC.csproj
@@ -4,7 +4,7 @@
net8.0
enable
enable
- 6.16.2604.1317
+ 6.16.2604.1318
diff --git a/MP.IOC/Resources/ChangeLog.html b/MP.IOC/Resources/ChangeLog.html
index c7d8e9f9..7dfec0c7 100644
--- a/MP.IOC/Resources/ChangeLog.html
+++ b/MP.IOC/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
Modulo MP-IOC
- Versione: 6.16.2604.1317
+ Versione: 6.16.2604.1318
Note di rilascio:
-
diff --git a/MP.IOC/Resources/VersNum.txt b/MP.IOC/Resources/VersNum.txt
index 762a3aac..1d3ada7b 100644
--- a/MP.IOC/Resources/VersNum.txt
+++ b/MP.IOC/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2604.1317
+6.16.2604.1318
diff --git a/MP.IOC/Resources/manifest.xml b/MP.IOC/Resources/manifest.xml
index 4dc8e9e3..7e3b5ed1 100644
--- a/MP.IOC/Resources/manifest.xml
+++ b/MP.IOC/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 6.16.2604.1317
+ 6.16.2604.1318
https://nexus.steamware.net/repository/SWS/MP-IOC/stable/LAST/MP.IOC.zip
https://nexus.steamware.net/repository/SWS/MP-IOC/stable/LAST/ChangeLog.html
false