Egalware/MoonPro.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v 1019: faccio SEMPRE conteggio esatto del delta tempo...

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-12-05 18:56:12 +01:00
parent 3b88a6b20f
commit 704539cd5e
2 changed files with 26 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -18,7 +18,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=1018']) {
withEnv(['NEXT_BUILD_NUMBER=1019']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
MapoDb/DataLayer.cs
+25 -30
View File
@@ -479,40 +479,35 @@ namespace MapoDb
delta = Convert.ToInt64(dtCurr) - Convert.ToInt64(dtEve);
// log della classe del delta (1-10, 10-100, 100-1k, 1k-10k, > 10k ms)
string deltaClass = "";
// se meno di 1'000 ms = 1 secondo... (semplificazione possibile SE prima del cambio di minuto, sino al sec 58... dal 59 allo 00 successivo conta 41'000 x cui NON va bene e fa calcolo ESTESO)
if (delta <= 999)
// faccio SEMPRE calcolo esatto sennò sbaglia...
CultureInfo provider = CultureInfo.InvariantCulture;
string format = "yyyyMMddHHmmssfff";
dtEvento = DateTime.ParseExact(dtEve, format, provider);
dtCorrente = DateTime.ParseExact(dtCurr, format, provider);
Int64 tiks = dtCorrente.Ticks - dtEvento.Ticks;
TimeSpan ts = new TimeSpan(tiks);
double ms = Math.Abs(ts.TotalMilliseconds);
// calcolo ESATTO dataora evento
dataOraEvento = dataOraEvento.AddTicks(-tiks);
if (ms <= 10)
{
dataOraEvento = dataOraEvento.AddMilliseconds(-delta);
if (delta <= 10)
{
deltaClass = "delta 0-10 ms";
}
else if (delta <= 100)
{
deltaClass = "delta 10-100 ms";
}
else
{
deltaClass = "delta 100-1000 ms";
}
deltaClass = "delta 0-10 ms";
}
else if (ms <= 100)
{
deltaClass = "delta 10-100 ms";
}
else if (ms <= 1000)
{
deltaClass = "delta 100-1000 ms";
}
else if (ms <= 10000)
{
deltaClass = "delta 1-10 sec";
}
else
{
// in questo caso elimino i MS dalle stringhe e converto i datetime....
CultureInfo provider = CultureInfo.InvariantCulture;
string format = "yyyyMMddHHmmssfff";
dtEvento = DateTime.ParseExact(dtEve, format, provider);
dtCorrente = DateTime.ParseExact(dtCurr, format, provider);
Int64 tiks = dtCorrente.Ticks - dtEvento.Ticks;
dataOraEvento = dataOraEvento.AddTicks(-tiks);
if (delta <= 10000)
{
deltaClass = "delta 1-10 sec";
}
else
{
deltaClass = "delta > 10 sec";
}
deltaClass = "delta > 10 sec";
}
// se ho deltaClass loggo
if (deltaClass != "")