diff --git a/MP-IO/Controllers/IOBController.cs b/MP-IO/Controllers/IOBController.cs
index 1832ac08..f4284443 100644
--- a/MP-IO/Controllers/IOBController.cs
+++ b/MP-IO/Controllers/IOBController.cs
@@ -154,6 +154,7 @@ namespace MP_IO.Controllers
// per ora salvo su REDIS ultimo x tipo
DataLayerObj.lastRawTrasfData = JsonConvert.SerializeObject(item.mesContent);
+ //DataLayerObj.lastRawTrasfData = item.mesContent;
// !!! FixMe ToDo fare
// deserializzazione e salvataggio su MongoDB
@@ -1508,14 +1509,14 @@ namespace MP_IO.Controllers
if (currParams != null)
{
DataLayer DataLayerObj = new DataLayer();
- DataLayerObj.setCurrObjItems(id, currParams);
- answ = "OK";
+ bool fatto = DataLayerObj.setCurrObjItems(id, currParams);
+ answ = fatto ? "OK" : "KO";
}
}
catch (Exception exc)
{
logger.lg.scriviLog($"Errore in setCurrParams{Environment.NewLine}{exc}");
- answ = "NO";
+ answ = "EXC";
}
}
return answ;
diff --git a/MapoDb/DataLayer.cs b/MapoDb/DataLayer.cs
index 4366bec8..f4e326ac 100644
--- a/MapoDb/DataLayer.cs
+++ b/MapoDb/DataLayer.cs
@@ -3622,7 +3622,7 @@ namespace MapoDb
gestEmail.geAuth.mandaEmail(mittente, destinatario, oggetto, corpo);
fatto = true;
}
- catch(Exception exc)
+ catch (Exception exc)
{
logger.lg.scriviLog($"Eccezione in sendEmail{Environment.NewLine}{exc}", tipoLog.ERROR);
}
@@ -3679,13 +3679,23 @@ namespace MapoDb
foreach (var item in currValues)
{
// se fosse un valore WRITE e mi ha dato un valore vuoto --> mando un fix x riscrittura
- if (item.writable && string.IsNullOrEmpty(item.value))
+ if (item.writable && (string.IsNullOrEmpty(item.value) || string.IsNullOrEmpty(item.reqValue)))
{
- logger.lg.scriviLog($"setCurrObjItems | parametro empty | {item.uid} | reqVal: {item.reqValue}");
- taskType currTask = (taskType)Enum.Parse(typeof(taskType), item.uid);
- addCheckTask4Machine(idxMacchina, currTask, item.value);
+ logger.lg.scriviLog($"setCurrObjItems | parametro empty | {item.uid} | Value: {item.value} | reqVal: {item.reqValue}");
+ // se è un parametro dei "task principali...
+ try
+ {
+ taskType currTask = (taskType)Enum.Parse(typeof(taskType), item.uid);
+ string newVal = !string.IsNullOrEmpty(item.reqValue) ? item.reqValue : $"{item.value}";
+ addCheckTask4Machine(idxMacchina, currTask, newVal);
+ }
+ catch (Exception exc)
+ {
+ logger.lg.scriviLog($"Eccezione in setCurrObjItems in fase di riaccodamento{Environment.NewLine}{exc}");
+ }
}
}
+ answ = true;
}
return answ;
}
diff --git a/MapoSDK/Enums.cs b/MapoSDK/Enums.cs
index 309f4c95..ec175d0f 100644
--- a/MapoSDK/Enums.cs
+++ b/MapoSDK/Enums.cs
@@ -120,6 +120,16 @@ namespace MapoSDK
///
Real,
+ ///
+ /// Tipo REAL 32 bit standard (HighLow) - sinonimo di Real, creato x simmetria con caso LH
+ ///
+ RealHL,
+
+ ///
+ /// Tipo REAL 32 bit con swap byte (LowHigh) al posto del normale caso HL (HighLow)
+ ///
+ RealLH,
+
///
/// Tipo stringa
///
diff --git a/MapoSDK/Objects.cs b/MapoSDK/Objects.cs
index 05f2cbda..7da35324 100644
--- a/MapoSDK/Objects.cs
+++ b/MapoSDK/Objects.cs
@@ -1,5 +1,6 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -160,7 +161,7 @@ namespace MapoSDK
///
/// Messaggio in modalità raw/stringa
///
- public object mesContent { get; set; } = null;
+ public JObject mesContent { get; set; } = new JObject();
///
/// Tipo di messaggio trasmesso
@@ -173,7 +174,7 @@ namespace MapoSDK
public BaseRawTransf()
{
this.dataRif = DateTime.Now;
- this.mesContent = "";
+ this.mesContent = new JObject();
this.mesType = rawTransfType.ND;
}
@@ -183,7 +184,7 @@ namespace MapoSDK
///
///
///
- public BaseRawTransf(DateTime dataRif, object mesContent, rawTransfType mesType)
+ public BaseRawTransf(DateTime dataRif, JObject mesContent, rawTransfType mesType)
{
this.dataRif = dataRif;
this.mesContent = mesContent;