diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj
index 47cbc7b3..d1845ee3 100644
--- a/MP.SPEC/MP.SPEC.csproj
+++ b/MP.SPEC/MP.SPEC.csproj
@@ -5,7 +5,7 @@
enable
enable
MP.SPEC
- 6.16.2603.2308
+ 6.16.2604.712
1800a78a-6ff1-40f9-b490-87fb8bfc1394
en
diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html
index 26afcaa8..02e4d76c 100644
--- a/MP.SPEC/Resources/ChangeLog.html
+++ b/MP.SPEC/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
Modulo MAPOSPEC
- Versione: 6.16.2603.2308
+ Versione: 6.16.2604.712
Note di rilascio:
-
diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt
index 3d5acf67..e400f432 100644
--- a/MP.SPEC/Resources/VersNum.txt
+++ b/MP.SPEC/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2603.2308
+6.16.2604.712
diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml
index 924797a8..3207aa51 100644
--- a/MP.SPEC/Resources/manifest.xml
+++ b/MP.SPEC/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 6.16.2603.2308
+ 6.16.2604.712
https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/MP.SPEC.zip
https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/ChangeLog.html
false
diff --git a/MP.Stats/Data/MpStatsService.cs b/MP.Stats/Data/MpStatsService.cs
index af77da86..ea91785f 100644
--- a/MP.Stats/Data/MpStatsService.cs
+++ b/MP.Stats/Data/MpStatsService.cs
@@ -66,7 +66,7 @@ namespace MP.Stats.Data
// cerco in redis...
DateTime adesso = DateTime.Now;
string currKey = $"{redisBaseKey}:Cache:AZIONI_ALL";
- RedisValue rawData = await redisDb.StringGetAsync(currKey);
+ RedisValue rawData = await _redisDb.StringGetAsync(currKey);
if (rawData.HasValue)
{
result = JsonConvert.DeserializeObject>($"{rawData}");
@@ -77,7 +77,7 @@ namespace MP.Stats.Data
result = dbController.ActionsGetAll();
// serializzp e salvo...
rawData = JsonConvert.SerializeObject(result);
- await redisDb.StringSetAsync(currKey, rawData, FastCache);
+ await _redisDb.StringSetAsync(currKey, rawData, FastCache);
}
if (result == null)
{
@@ -98,7 +98,7 @@ namespace MP.Stats.Data
// cerco in redis...
DateTime adesso = DateTime.Now;
string currKey = $"{redisBaseKey}:Cache:FLTrans";
- RedisValue rawData = await redisDb.StringGetAsync(currKey);
+ RedisValue rawData = await _redisDb.StringGetAsync(currKey);
if (rawData.HasValue)
{
result = JsonConvert.DeserializeObject>($"{rawData}");
@@ -109,7 +109,7 @@ namespace MP.Stats.Data
result = dbController.AnagFLTransGetAll();
// serializzp e salvo...
rawData = JsonConvert.SerializeObject(result);
- await redisDb.StringSetAsync(currKey, rawData, FastCache);
+ await _redisDb.StringSetAsync(currKey, rawData, FastCache);
}
if (result == null)
{
@@ -171,7 +171,7 @@ namespace MP.Stats.Data
List? result = new List();
// cerco in redis...
string currKey = $"{redisBaseKey}:Conf";
- RedisValue rawData = await redisDb.StringGetAsync(currKey);
+ RedisValue rawData = await _redisDb.StringGetAsync(currKey);
//if (!string.IsNullOrEmpty($"{rawData}"))
if (rawData.HasValue)
{
@@ -183,7 +183,7 @@ namespace MP.Stats.Data
result = dbController.ConfigGetAll();
// serializzo e salvo...
rawData = JsonConvert.SerializeObject(result);
- redisDb.StringSet(currKey, rawData, LongCache);
+ _redisDb.StringSet(currKey, rawData, LongCache);
}
if (result == null)
{
@@ -251,7 +251,7 @@ namespace MP.Stats.Data
// cerco in redis...
DateTime adesso = DateTime.Now;
string currKey = getCacheKey($"{redisBaseKey}:FL_DATA:FT_{fluxType}", CurrFilter);
- RedisValue rawData = await redisDb.StringGetAsync(currKey);
+ RedisValue rawData = await _redisDb.StringGetAsync(currKey);
if (rawData.HasValue)
{
result = JsonConvert.DeserializeObject>($"{rawData}");
@@ -262,7 +262,7 @@ namespace MP.Stats.Data
result = dbController.FluxLogRawData(CurrFilter.IdxMacchina, CurrFilter.DateStart, CurrFilter.DateEnd, fluxType);
// serializzp e salvo...
rawData = JsonConvert.SerializeObject(result);
- await redisDb.StringSetAsync(currKey, rawData, FastCache);
+ await _redisDb.StringSetAsync(currKey, rawData, FastCache);
}
if (result == null)
{
@@ -287,7 +287,7 @@ namespace MP.Stats.Data
// cerco in redis...
DateTime adesso = DateTime.Now;
string currKey = $"{redisBaseKey}:FTList";
- RedisValue rawData = await redisDb.StringGetAsync(currKey);
+ RedisValue rawData = await _redisDb.StringGetAsync(currKey);
if (rawData.HasValue)
{
result = JsonConvert.DeserializeObject>($"{rawData}");
@@ -298,7 +298,7 @@ namespace MP.Stats.Data
result = dbController.FluxTypeList();
// serializzp e salvo...
rawData = JsonConvert.SerializeObject(result);
- await redisDb.StringSetAsync(currKey, rawData, UltraLongCache);
+ await _redisDb.StringSetAsync(currKey, rawData, UltraLongCache);
}
if (result == null)
{
@@ -319,7 +319,7 @@ namespace MP.Stats.Data
// cerco in redis...
DateTime adesso = DateTime.Now;
string currKey = $"{redisBaseKey}:Cache:MacchineEnergy";
- RedisValue rawData = redisDb.StringGet(currKey);
+ RedisValue rawData = _redisDb.StringGet(currKey);
if (rawData.HasValue)
{
result = JsonConvert.DeserializeObject>($"{rawData}");
@@ -330,7 +330,7 @@ namespace MP.Stats.Data
result = dbController.MacchineEnergy();
// serializzp e salvo...
rawData = JsonConvert.SerializeObject(result);
- redisDb.StringSet(currKey, rawData, FastCache);
+ _redisDb.StringSet(currKey, rawData, FastCache);
}
if (result == null)
{
@@ -351,7 +351,7 @@ namespace MP.Stats.Data
// cerco in redis...
DateTime adesso = DateTime.Now;
string currKey = $"{redisBaseKey}:Cache:Macchine";
- RedisValue rawData = redisDb.StringGet(currKey);
+ RedisValue rawData = _redisDb.StringGet(currKey);
if (rawData.HasValue)
{
result = JsonConvert.DeserializeObject>($"{rawData}");
@@ -362,7 +362,7 @@ namespace MP.Stats.Data
result = dbController.MacchineGetAll().ToList();
// serializzp e salvo...
rawData = JsonConvert.SerializeObject(result);
- redisDb.StringSet(currKey, rawData, FastCache);
+ _redisDb.StringSet(currKey, rawData, FastCache);
}
if (result == null)
{
@@ -431,7 +431,7 @@ namespace MP.Stats.Data
// cerco in redis...
DateTime adesso = DateTime.Now;
string currKey = getCacheKey($"{redisBaseKey}:CONTROLLI", CurrFilter);
- RedisValue rawData = await redisDb.StringGetAsync(currKey);
+ RedisValue rawData = await _redisDb.StringGetAsync(currKey);
if (rawData.HasValue)
{
result = JsonConvert.DeserializeObject>($"{rawData}");
@@ -442,7 +442,7 @@ namespace MP.Stats.Data
result = dbController.StatControlliGetAll(CurrFilter.DateStart, CurrFilter.DateEnd, CurrFilter.IdxMacchina, CurrFilter.IdxOdl, CurrFilter.KeyRichiesta, CurrFilter.CodArticolo);
// serializzp e salvo...
rawData = JsonConvert.SerializeObject(result);
- await redisDb.StringSetAsync(currKey, rawData, FastCache);
+ await _redisDb.StringSetAsync(currKey, rawData, FastCache);
}
if (result == null)
{
@@ -470,7 +470,7 @@ namespace MP.Stats.Data
// cerco in redis...
DateTime adesso = DateTime.Now;
string currKey = getCacheKeyPaged($"{redisBaseKey}:DDBT", CurrFilter);
- RedisValue rawData = await redisDb.StringGetAsync(currKey);
+ RedisValue rawData = await _redisDb.StringGetAsync(currKey);
if (rawData.HasValue)
{
result = JsonConvert.DeserializeObject>($"{rawData}");
@@ -481,7 +481,7 @@ namespace MP.Stats.Data
result = dbController.StatDdbGetAll(CurrFilter.DateStart, CurrFilter.DateEnd, CurrFilter.IdxMacchina, CurrFilter.IdxOdl, CurrFilter.KeyRichiesta, CurrFilter.CodArticolo, CurrFilter.FirstRecord, CurrFilter.NumRecord);
// serializzp e salvo...
rawData = JsonConvert.SerializeObject(result);
- await redisDb.StringSetAsync(currKey, rawData, FastCache);
+ await _redisDb.StringSetAsync(currKey, rawData, FastCache);
}
if (result == null)
{
@@ -521,7 +521,7 @@ namespace MP.Stats.Data
// cerco in redis...
DateTime adesso = DateTime.Now;
string currKey = getCacheKey($"{redisBaseKey}:DDBT-COUNT", CurrFilter);
- RedisValue rawData = await redisDb.StringGetAsync(currKey);
+ RedisValue rawData = await _redisDb.StringGetAsync(currKey);
if (rawData.HasValue)
{
numRec = JsonConvert.DeserializeObject($"{rawData}");
@@ -532,7 +532,7 @@ namespace MP.Stats.Data
numRec = dbController.StatDdbGetCount(CurrFilter.DateStart, CurrFilter.DateEnd, CurrFilter.IdxMacchina, CurrFilter.IdxOdl, CurrFilter.KeyRichiesta, CurrFilter.CodArticolo);
// serializzp e salvo...
rawData = JsonConvert.SerializeObject(numRec);
- await redisDb.StringSetAsync(currKey, rawData, FastCache);
+ await _redisDb.StringSetAsync(currKey, rawData, FastCache);
}
sw.Stop();
Log.Debug($"StatDdbGetCount | {source} | {sw.Elapsed.TotalMilliseconds}ms");
@@ -555,7 +555,7 @@ namespace MP.Stats.Data
// cerco in redis...
DateTime adesso = DateTime.Now;
string currKey = getCacheKey($"{redisBaseKey}:ODL_ENERGY", CurrFilter);
- RedisValue rawData = await redisDb.StringGetAsync(currKey);
+ RedisValue rawData = await _redisDb.StringGetAsync(currKey);
if (rawData.HasValue)
{
result = JsonConvert.DeserializeObject>($"{rawData}");
@@ -566,7 +566,7 @@ namespace MP.Stats.Data
result = dbController.StatOdlEnergyGetFilt(CurrFilter.IdxMacchina, CurrFilter.DateStart, CurrFilter.DateEnd, CurrFilter.IdxOdl, CurrFilter.KeyRichiesta, CurrFilter.CodArticolo);
// serializzp e salvo...
rawData = JsonConvert.SerializeObject(result);
- await redisDb.StringSetAsync(currKey, rawData, FastCache);
+ await _redisDb.StringSetAsync(currKey, rawData, FastCache);
}
if (result == null)
{
@@ -593,7 +593,7 @@ namespace MP.Stats.Data
// cerco in redis...
DateTime adesso = DateTime.Now;
string currKey = getCacheKey($"{redisBaseKey}:ODL", CurrFilter);
- RedisValue rawData = await redisDb.StringGetAsync(currKey);
+ RedisValue rawData = await _redisDb.StringGetAsync(currKey);
if (rawData.HasValue)
{
result = JsonConvert.DeserializeObject>($"{rawData}");
@@ -604,7 +604,7 @@ namespace MP.Stats.Data
result = dbController.StatOdlGetAll(CurrFilter.DateStart, CurrFilter.DateEnd, CurrFilter.IdxMacchina, CurrFilter.IdxOdl, CurrFilter.KeyRichiesta, CurrFilter.CodArticolo);
// serializzp e salvo...
rawData = JsonConvert.SerializeObject(result);
- await redisDb.StringSetAsync(currKey, rawData, FastCache);
+ await _redisDb.StringSetAsync(currKey, rawData, FastCache);
}
if (result == null)
{
@@ -625,7 +625,7 @@ namespace MP.Stats.Data
// cerco in redis...
DateTime adesso = DateTime.Now;
string currKey = getCacheKey($"{redisBaseKey}:SCARTI:RAW", CurrFilter);
- RedisValue rawData = await redisDb.StringGetAsync(currKey);
+ RedisValue rawData = await _redisDb.StringGetAsync(currKey);
if (rawData.HasValue)
{
result = JsonConvert.DeserializeObject>($"{rawData}");
@@ -636,7 +636,7 @@ namespace MP.Stats.Data
result = dbController.StatScartiGetAll(CurrFilter.DateStart, CurrFilter.DateEnd, CurrFilter.IdxMacchina, CurrFilter.IdxOdl, CurrFilter.KeyRichiesta, CurrFilter.CodArticolo);
// serializzp e salvo...
rawData = JsonConvert.SerializeObject(result);
- await redisDb.StringSetAsync(currKey, rawData, FastCache);
+ await _redisDb.StringSetAsync(currKey, rawData, FastCache);
}
if (result == null)
{
@@ -662,7 +662,7 @@ namespace MP.Stats.Data
// cerco in redis...
DateTime adesso = DateTime.Now;
string currKey = getCacheKey($"{redisBaseKey}:OEE", CurrFilter);
- RedisValue rawData = await redisDb.StringGetAsync(currKey);
+ RedisValue rawData = await _redisDb.StringGetAsync(currKey);
if (rawData.HasValue)
{
result = JsonConvert.DeserializeObject>($"{rawData}");
@@ -673,7 +673,7 @@ namespace MP.Stats.Data
result = dbController.StatTurniOeeGetAll(CurrFilter.DateStart, CurrFilter.DateEnd, CurrFilter.IdxMacchina, CurrFilter.IdxOdl, CurrFilter.KeyRichiesta, CurrFilter.CodArticolo);
// serializzp e salvo...
rawData = JsonConvert.SerializeObject(result);
- await redisDb.StringSetAsync(currKey, rawData, FastCache);
+ await _redisDb.StringSetAsync(currKey, rawData, FastCache);
}
if (result == null)
{
@@ -694,7 +694,7 @@ namespace MP.Stats.Data
// cerco in redis...
DateTime adesso = DateTime.Now;
string currKey = getCacheKey($"{redisBaseKey}:USRACTLOG", CurrFilter);
- RedisValue rawData = await redisDb.StringGetAsync(currKey);
+ RedisValue rawData = await _redisDb.StringGetAsync(currKey);
if (rawData.HasValue)
{
result = JsonConvert.DeserializeObject>($"{rawData}");
@@ -710,7 +710,7 @@ namespace MP.Stats.Data
}
// serializzp e salvo...
rawData = JsonConvert.SerializeObject(result);
- await redisDb.StringSetAsync(currKey, rawData, FastCache);
+ await _redisDb.StringSetAsync(currKey, rawData, FastCache);
}
if (result == null)
{
@@ -733,7 +733,7 @@ namespace MP.Stats.Data
List result = new List();
// cerco in redis...
string currKey = $"{redisBaseKey}:Vocabolario";
- RedisValue rawData = await redisDb.StringGetAsync(currKey);
+ RedisValue rawData = await _redisDb.StringGetAsync(currKey);
//if (!string.IsNullOrEmpty($"{rawData}"))
if (rawData.HasValue)
{
@@ -745,7 +745,7 @@ namespace MP.Stats.Data
result = dbController.VocabolarioGetAll();
// serializzo e salvo...
rawData = JsonConvert.SerializeObject(result);
- redisDb.StringSet(currKey, rawData, LongCache);
+ _redisDb.StringSet(currKey, rawData, LongCache);
}
if (result == null)
{
@@ -832,24 +832,24 @@ namespace MP.Stats.Data
private async Task ExecFlushRedisPattern(RedisValue pat2Flush)
{
bool answ = false;
- var masterEndpoint = redisConn.GetEndPoints()
- .Where(ep => redisConn.GetServer(ep).IsConnected && !redisConn.GetServer(ep).IsReplica)
+ var masterEndpoint = _redisConn.GetEndPoints()
+ .Where(ep => _redisConn.GetServer(ep).IsConnected && !_redisConn.GetServer(ep).IsReplica)
.FirstOrDefault();
// sepattern รจ "*" elimino intero DB...
if (masterEndpoint != null && (pat2Flush.Equals(new RedisValue("*")) || pat2Flush == RedisValue.Null))
{
- redisConn.GetServer(masterEndpoint).FlushDatabase(database: redisDb.Database);
+ _redisConn.GetServer(masterEndpoint).FlushDatabase(database: _redisDb.Database);
}
else
{
- var server = redisConn.GetServer(masterEndpoint);
- var keys = server.Keys(database: redisDb.Database, pattern: pat2Flush, pageSize: 1000);
+ var server = _redisConn.GetServer(masterEndpoint);
+ var keys = server.Keys(database: _redisDb.Database, pattern: pat2Flush, pageSize: 1000);
var deleteTasks = new List();
foreach (var key in keys)
{
- deleteTasks.Add(redisDb.KeyDeleteAsync(key));
+ deleteTasks.Add(_redisDb.KeyDeleteAsync(key));
if (deleteTasks.Count >= 1000)
{
await Task.WhenAll(deleteTasks);
@@ -863,17 +863,17 @@ namespace MP.Stats.Data
}
answ = true;
#if false
- var listEndpoints = redisConn.GetEndPoints();
+ var listEndpoints = _redisConn.GetEndPoints();
foreach (var endPoint in listEndpoints)
{
- //var server = redisConnAdmin.GetServer(listEndpoints[0]);
- var server = redisConn.GetServer(endPoint);
+ //var server = _redisConnAdmin.GetServer(listEndpoints[0]);
+ var server = _redisConn.GetServer(endPoint);
if (server != null)
{
- var keyList = server.Keys(redisDb.Database, pattern);
+ var keyList = server.Keys(_redisDb.Database, pattern);
foreach (var item in keyList)
{
- await redisDb.KeyDeleteAsync(item);
+ await _redisDb.KeyDeleteAsync(item);
}
answ = true;
}
diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj
index cbaf21a5..ca324bce 100644
--- a/MP.Stats/MP.Stats.csproj
+++ b/MP.Stats/MP.Stats.csproj
@@ -4,7 +4,7 @@
net6.0
MP.Stats
826e877c-ba70-4253-84cb-d0b1cafd4440
- 6.16.2601.1310
+ 6.16.2604.0712
true
$(NoWarn);1591
en
diff --git a/MP.Stats/Resources/ChangeLog.html b/MP.Stats/Resources/ChangeLog.html
index d7d90128..1f679d5e 100644
--- a/MP.Stats/Resources/ChangeLog.html
+++ b/MP.Stats/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
Modulo statistiche MAPO
-
Versione: 6.16.2601.1310
+ Versione: 6.16.2604.0712
Note di rilascio:
diff --git a/MP.Stats/Resources/VersNum.txt b/MP.Stats/Resources/VersNum.txt
index 93295548..7fba712e 100644
--- a/MP.Stats/Resources/VersNum.txt
+++ b/MP.Stats/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2601.1310
+6.16.2604.0712
diff --git a/MP.Stats/Resources/manifest.xml b/MP.Stats/Resources/manifest.xml
index 0c54652f..9808717c 100644
--- a/MP.Stats/Resources/manifest.xml
+++ b/MP.Stats/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 6.16.2601.1310
+ 6.16.2604.0712
https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/MP.Stats.zip
https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/ChangeLog.html
false