Egalware/Mapo-IOB-WIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix date x non ridurre a duplicato...

Browse Source
This commit is contained in:
Samuele E. Locatelli
2019-12-03 20:45:55 +01:00
parent 3fda4d791b
commit 2b268fa9e6
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN/IobMTC.cs
+6 -2
View File
@@ -495,12 +495,15 @@ namespace IOB_WIN
locTStamp = dataItem.Timestamp.ToLocalTime();
sVal = $"CONDITION: {locTStamp.ToString()} | descr: {descr} | Id: {dataItem.DataItemId} | | Name: {dataItem.Name} | Val: {dataItem.CDATA}";
lgInfo(sVal);
DateTime tStamp = dataItem.Timestamp;
var time2 = tStamp.ToLocalTime();
// verifico se salvare
bool changed = checkSaveItem(dataItem);
if (changed)
{
// accodare ed invia nella coda ALARMS (che POI salva in document MongoDB anche ultimi x minuti di FluxLog...)
accodaAlarmLog(sVal, qEncodeFLog(locTStamp, descr, dataItem.CDATA));
accodaAlarmLog(sVal, qEncodeFLog(time2, descr, dataItem.CDATA));
//accodaAlarmLog(sVal, qEncodeFLog(locTStamp, descr, dataItem.CDATA));
}
}
}
@@ -522,7 +525,8 @@ namespace IOB_WIN
bool changed = checkSaveItem(dataItem);
if (changed)
{
accodaFLog(sVal, qEncodeFLog(locTStamp, descr, dataItem.CDATA));
accodaFLog(sVal, qEncodeFLog(time2, descr, dataItem.CDATA));
//accodaFLog(sVal, qEncodeFLog(locTStamp, descr, dataItem.CDATA));
}
}
}
Jenkinsfile
Vendored
+1 -1
View File
@@ -16,7 +16,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=556']) {
withEnv(['NEXT_BUILD_NUMBER=557']) {
// env.versionNumber = VersionNumber(versionNumberString : '2.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '2.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO-IOB-WIN'