diff --git a/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj b/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj
index ac2e3c6..e408a0d 100644
--- a/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj
+++ b/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj
@@ -6,7 +6,7 @@
enable
enable
AnyCPU;x86;x64
- 1.2.2210.2418
+ 1.2.2210.2420
diff --git a/MP.MONO.ANALYZER/Resources/ChangeLog.html b/MP.MONO.ANALYZER/Resources/ChangeLog.html
index 4bde5ec..c1d4f3a 100644
--- a/MP.MONO.ANALYZER/Resources/ChangeLog.html
+++ b/MP.MONO.ANALYZER/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
MAPO-MONO
- Version: 1.2.2210.2418
+ Version: 1.2.2210.2420
Release Note:
-
diff --git a/MP.MONO.ANALYZER/Resources/VersNum.txt b/MP.MONO.ANALYZER/Resources/VersNum.txt
index 8b9ae25..0a68100 100644
--- a/MP.MONO.ANALYZER/Resources/VersNum.txt
+++ b/MP.MONO.ANALYZER/Resources/VersNum.txt
@@ -1 +1 @@
-1.2.2210.2418
+1.2.2210.2420
diff --git a/MP.MONO.ANALYZER/Resources/manifest.xml b/MP.MONO.ANALYZER/Resources/manifest.xml
index dba65b0..fd573ad 100644
--- a/MP.MONO.ANALYZER/Resources/manifest.xml
+++ b/MP.MONO.ANALYZER/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 1.2.2210.2418
+ 1.2.2210.2420
http://nexus.steamware.net/repository/SWS/MP.MONO.ANALYZER/stable/LAST/MP.Mon.zip
http://nexus.steamware.net/repository/SWS/MP.MONO.ANALYZER/stable/LAST/ChangeLog.html
false
diff --git a/MP.MONO.DECODER/AlarmsBlinkManager.cs b/MP.MONO.DECODER/AlarmsBlinkManager.cs
index d925ce6..74ab9b7 100644
--- a/MP.MONO.DECODER/AlarmsBlinkManager.cs
+++ b/MP.MONO.DECODER/AlarmsBlinkManager.cs
@@ -299,151 +299,7 @@ namespace MP.MONO.DECODER
// loggo controllo
Log.Debug($"Esito controllo | {alarmListReceivedOk.Count} ricevuti | {alarmListAdded.Count} aggiunti | {alarmListCeased.Count} cessati");
-#if false
-
- // rileggo da REDIS la conf attuale allarmi già attivi da area ALARM_CURR_KEY
- // FIXME TODO !!! usare una lista thread safe?!?!?
- List lastAlarms = getAlarms("Current");
- List startedAlarms = new List();
- List ceasedAlarms = new List();
- string serAlarms = "";
-
- // ciclo x ogni allarme ricevuto x vedere se sia INIZIATO o vada filtrato x muted
- if (alarmList != null)
- {
- // ciclo x ogni allarme attivo x verificare se si sia CHIUSO
- foreach (var newAlarm in alarmList)
- {
- var currNewAlarm = newAlarm;
- // se ho valori trim pre/post li applica...
- if (!string.IsNullOrEmpty(AlarmCleanPre))
- {
- currNewAlarm = currNewAlarm.Replace(AlarmCleanPre, "");
- }
- if (!string.IsNullOrEmpty(AlarmCleanPost))
- {
- currNewAlarm = currNewAlarm.Replace(AlarmCleanPost, "");
- }
- // se AlarmIgnoreEmpty=true + vuoto --> salto
- if (AlarmIgnoreEmpty && string.IsNullOrWhiteSpace(currNewAlarm))
- {
- alarmList.Remove(currNewAlarm);
- alarmList.Remove(newAlarm);
- }
- else
- {
- // in primis... se è muted --> lo escludo...
- bool isMuted = false;
- var maybeMuted = mutedAlarmsList.Where(x => x.FullValue == currNewAlarm).FirstOrDefault();
- if (maybeMuted != null)
- {
- isMuted = maybeMuted.Muted;
- }
- // cerco l'allarme nell'elenco degli allarmi dal DB
- AlarmListModel? foundAlarm = getAlarmModel(currNewAlarm);
-
- if (!isMuted)
- {
- if (!lastAlarms.Contains(currNewAlarm))
- {
- if (foundAlarm != null)
- {
- // segno come iniziato...
- AlarmRecModel newAlarmRec = new AlarmRecModel()
- {
- MachineId = MachineId,
- DtStart = adesso,
- DtEnd = adesso.AddMinutes(-1),
- AlarmId = foundAlarm.AlarmId
- };
- alarmRecList.Add(newAlarmRec);
- startedAlarms.Add(currNewAlarm);
- lastAlarms.Add(currNewAlarm);
- needsWrite = true;
- }
- }
- }
- else
- {
- // rimuovo da alarmList perché muted...
- alarmList.Remove(currNewAlarm);
- alarmList.Remove(newAlarm);
- }
- }
- }
- }
-
- // salvo
- serAlarms = JsonConvert.SerializeObject(lastAlarms);
- // invio sulla message pipeline corretta TUTTI gli allarmi serializzati
- alarmsSendPipe.saveAndSendMessage(Constants.ALARM_CURR_KEY, serAlarms);
-
- // calcolo allarmi cessati...
- if (lastAlarms != null)
- {
- // ciclo x ogni allarme attivo x verificare se si sia CHIUSO
- foreach (var oldData in lastAlarms)
- {
- bool trovato = false;
- if (alarmList != null)
- {
- trovato = alarmList.Contains(oldData);
- }
- // se non c'è... segno cessato
- if (!trovato)
- {
- ceasedAlarms.Add(oldData);
- await Task.Run(async () =>
- {
- await checkCeasedAlarm(oldData);
- });
- }
- }
- }
-
- Log.Debug($"Stato lastAlarms | count {lastAlarms.Count}");
-
- // gli allarmi cessati avvio un task di verifica dopo periodo di blink
- if (needsWrite)
- {
- Log.Debug($"Preparazione AlarmLogRecord | count {lastAlarms.Count}");
-
- // preparo dati x alarmLog
- AlarmLogModel newAlarmLog = new AlarmLogModel()
- {
- MachineId = MachineId,
- DtRif = adesso,
- MemAddress = "ND",
- Index = 0,
- // usare alarmList o lastAlarms
- Status = (uint)alarmList.Count,
- ValDecoded = alarmList.Count > 0 ? string.Join(", ", alarmList) : "All OK"
- };
- alarmLogList.Add(newAlarmLog);
- }
-
- if (lastAlarms != null)
- {
- lastAlarms = lastAlarms.OrderBy(x => x).ToList();
- // serializzo l'elenco allarmi...
- serAlarms = JsonConvert.SerializeObject(lastAlarms);
-
- // se vuoto metto controllo x chiusura
- if (lastAlarms.Count() == 0)
- {
- await Task.Run(async () =>
- {
- await checkCloseAllAlarm();
- });
- }
-
- // invio sulla message pipeline corretta TUTTI gli allarmi serializzati
- alarmsSendPipe.saveAndSendMessage(Constants.ALARM_CURR_KEY, serAlarms);
-
- Log.Debug($"Salvataggio/invio allarmi | serAlarms | count {lastAlarms.Count}");
- }
-#endif
// restituisco esito = allarmi ricevuti da registrare
answ = (alarmListAdded.Count > 0);
return answ;
diff --git a/MP.MONO.DECODER/MP.MONO.DECODER.csproj b/MP.MONO.DECODER/MP.MONO.DECODER.csproj
index 2d402cb..fee7fa8 100644
--- a/MP.MONO.DECODER/MP.MONO.DECODER.csproj
+++ b/MP.MONO.DECODER/MP.MONO.DECODER.csproj
@@ -6,7 +6,7 @@
enable
enable
AnyCPU;x86;x64
- 1.2.2210.2418
+ 1.2.2210.2420
diff --git a/MP.MONO.DECODER/Program.cs b/MP.MONO.DECODER/Program.cs
index a97b01f..1067dec 100644
--- a/MP.MONO.DECODER/Program.cs
+++ b/MP.MONO.DECODER/Program.cs
@@ -596,7 +596,7 @@ async void AlarmsValPipe_EA_NewMessage(object? sender, EventArgs e)
// salvo sul DB
if (alarmRecList.Count > 0)
{
- _ = dbController.AlarmRecInsertMany(alarmRecList).Result;
+ _ = dbController.AlarmRecInsertMany(alarmRecList);
}
if (alarmLogList.Count > 0)
{
@@ -677,7 +677,7 @@ async void AlarmsValPipe_EA_NewMessage(object? sender, EventArgs e)
}
}
// salvo sul DB
- _ = dbController.AlarmRecInsertMany(alarmRecList).Result;
+ _ = dbController.AlarmRecInsertMany(alarmRecList);
Log.Debug($"Inseriti {alarmRecList.Count} Records AlarmRecModel");
}
if (ceasedAlarms.Count > 0)
diff --git a/MP.MONO.DECODER/Resources/ChangeLog.html b/MP.MONO.DECODER/Resources/ChangeLog.html
index 4bde5ec..c1d4f3a 100644
--- a/MP.MONO.DECODER/Resources/ChangeLog.html
+++ b/MP.MONO.DECODER/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
MAPO-MONO
-
Version: 1.2.2210.2418
+ Version: 1.2.2210.2420
Release Note:
-
diff --git a/MP.MONO.DECODER/Resources/VersNum.txt b/MP.MONO.DECODER/Resources/VersNum.txt
index 8b9ae25..0a68100 100644
--- a/MP.MONO.DECODER/Resources/VersNum.txt
+++ b/MP.MONO.DECODER/Resources/VersNum.txt
@@ -1 +1 @@
-1.2.2210.2418
+1.2.2210.2420
diff --git a/MP.MONO.DECODER/Resources/manifest.xml b/MP.MONO.DECODER/Resources/manifest.xml
index bcb062d..855c6ae 100644
--- a/MP.MONO.DECODER/Resources/manifest.xml
+++ b/MP.MONO.DECODER/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 1.2.2210.2418
+ 1.2.2210.2420
http://nexus.steamware.net/repository/SWS/MP.MONO.DECODER/stable/LAST/MP.Mon.zip
http://nexus.steamware.net/repository/SWS/MP.MONO.DECODER/stable/LAST/ChangeLog.html
false
diff --git a/MP.MONO.Data/Controllers/MpDbController.cs b/MP.MONO.Data/Controllers/MpDbController.cs
index 4e3d963..7e1fafb 100644
--- a/MP.MONO.Data/Controllers/MpDbController.cs
+++ b/MP.MONO.Data/Controllers/MpDbController.cs
@@ -527,7 +527,7 @@ namespace MP.MONO.Data.Controllers
///
/// Lista Record da inserire (senza ID...)
///
- public async Task AlarmRecInsertMany(List newItems)
+ public bool AlarmRecInsertMany(List newItems)
{
bool fatto = false;
using (MapoMonoContext localDbCtx = new MapoMonoContext())
@@ -552,24 +552,28 @@ namespace MP.MONO.Data.Controllers
.ToList();
var alarm2rem = listNewId.Intersect(stillOpenAlarms).ToList();
+
// andrò ad inserire solo gli item NON già presenti...
foreach (var item in alarm2rem)
{
- var item2del = newItems.FirstOrDefault(x => x.AlarmId == item);
+ var item2del = newItems.Where(x => x.AlarmId == item).ToList();
if (item2del != null)
{
- newItems.Remove(item2del);
+ foreach (var singleItem in item2del)
+ {
+ newItems.Remove(singleItem);
+ }
}
}
if (newItems.Count > 0)
{
// aggiungo
- await localDbCtx
+ localDbCtx
.DbSetAlarmRec
- .AddRangeAsync(newItems);
+ .AddRange(newItems);
// salvo!
- await localDbCtx.SaveChangesAsync();
+ localDbCtx.SaveChanges();
fatto = true;
stopWatch.Stop();
TimeSpan ts = stopWatch.Elapsed;
diff --git a/MP.MONO.SIM/MP.MONO.SIM.csproj b/MP.MONO.SIM/MP.MONO.SIM.csproj
index 3ae6a1f..88c7247 100644
--- a/MP.MONO.SIM/MP.MONO.SIM.csproj
+++ b/MP.MONO.SIM/MP.MONO.SIM.csproj
@@ -6,7 +6,7 @@
enable
enable
AnyCPU;x86;x64
- 1.2.2210.2418
+ 1.2.2210.2420
diff --git a/MP.MONO.SIM/Resources/ChangeLog.html b/MP.MONO.SIM/Resources/ChangeLog.html
index 4bde5ec..c1d4f3a 100644
--- a/MP.MONO.SIM/Resources/ChangeLog.html
+++ b/MP.MONO.SIM/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
MAPO-MONO
-
Version: 1.2.2210.2418
+ Version: 1.2.2210.2420
Release Note:
-
diff --git a/MP.MONO.SIM/Resources/VersNum.txt b/MP.MONO.SIM/Resources/VersNum.txt
index 8b9ae25..0a68100 100644
--- a/MP.MONO.SIM/Resources/VersNum.txt
+++ b/MP.MONO.SIM/Resources/VersNum.txt
@@ -1 +1 @@
-1.2.2210.2418
+1.2.2210.2420
diff --git a/MP.MONO.SIM/Resources/manifest.xml b/MP.MONO.SIM/Resources/manifest.xml
index dd244ea..abb41f8 100644
--- a/MP.MONO.SIM/Resources/manifest.xml
+++ b/MP.MONO.SIM/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 1.2.2210.2418
+ 1.2.2210.2420
http://nexus.steamware.net/repository/SWS/MP.MONO.SIM/stable/LAST/MP.Mon.zip
http://nexus.steamware.net/repository/SWS/MP.MONO.SIM/stable/LAST/ChangeLog.html
false
diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj
index 2ed84aa..87c2d66 100644
--- a/MP.MONO.UI/MP.MONO.UI.csproj
+++ b/MP.MONO.UI/MP.MONO.UI.csproj
@@ -5,7 +5,7 @@
enable
enable
AnyCPU;x86;x64
- 1.2.2210.2418
+ 1.2.2210.2420
diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html
index 4bde5ec..c1d4f3a 100644
--- a/MP.MONO.UI/Resources/ChangeLog.html
+++ b/MP.MONO.UI/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
MAPO-MONO
-
Version: 1.2.2210.2418
+ Version: 1.2.2210.2420
Release Note:
-
diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt
index 8b9ae25..0a68100 100644
--- a/MP.MONO.UI/Resources/VersNum.txt
+++ b/MP.MONO.UI/Resources/VersNum.txt
@@ -1 +1 @@
-1.2.2210.2418
+1.2.2210.2420
diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml
index 80c3b60..008ac93 100644
--- a/MP.MONO.UI/Resources/manifest.xml
+++ b/MP.MONO.UI/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 1.2.2210.2418
+ 1.2.2210.2420
http://nexus.steamware.net/repository/SWS/MP.MONO.UI/stable/LAST/MP.Mon.zip
http://nexus.steamware.net/repository/SWS/MP.MONO.UI/stable/LAST/ChangeLog.html
false