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

Merge branch 'develop'

Browse Source
This commit is contained in:
Samuele E. Locatelli
2019-12-18 13:03:27 +01:00
parent b648994db0 82a39c74b5
commit e4ffddacfc
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -12,7 +12,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=1268']) {
withEnv(['NEXT_BUILD_NUMBER=1269']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
MP-IO/Controllers/IOBController.cs
+18
View File
@@ -113,6 +113,7 @@ namespace MP_IO.Controllers
[HttpPost]
public string evListJson(string id)
{
int insDone = 0;
string answ = "-";
// questa classe è derivata da Controller.Response... x cui recupero lo stream in altro modo...
string content = "";
@@ -154,6 +155,12 @@ namespace MP_IO.Controllers
// formato datetime come yyyyMMddHHmmssfff -->es: 20181223180600000
answ = DataLayer.processInput(id, item.valore, item.dtEve.ToString("yyyyMMddHHmmssfff"), item.dtCurr.ToString("yyyyMMddHHmmssfff"), item.cnt.ToString());
insDone++;
}
// se vuoto --> OK!
if (string.IsNullOrEmpty(answ))
{
answ = $"OK {insDone} processed";
}
}
catch (Exception exc)
@@ -202,6 +209,7 @@ namespace MP_IO.Controllers
[HttpPost]
public string flogJson(string id)
{
int insDone = 0;
string answ = "-";
// questa classe è derivata da Controller.Response... x cui recupero lo stream in altro modo...
string content = "";
@@ -239,6 +247,11 @@ namespace MP_IO.Controllers
// formato datetime come yyyyMMddHHmmssfff -->es: 20181223180600000
answ = DataLayer.processFluxLog(id, item.flux, item.valore, item.dtEve.ToString("yyyyMMddHHmmssfff"), item.dtCurr.ToString("yyyyMMddHHmmssfff"), item.cnt);
}
// se vuoto --> OK!
if (string.IsNullOrEmpty(answ))
{
answ = $"OK {insDone} processed";
}
}
catch (Exception exc)
{
@@ -315,6 +328,11 @@ namespace MP_IO.Controllers
// deserializzo.
liveIOB receivedData = JsonConvert.DeserializeObject<liveIOB>(content);
answ = DataLayer.processLiveJson(id, receivedData);
// se vuoto --> OK!
if (string.IsNullOrEmpty(answ))
{
answ = "OK 1 done";
}
}
catch (Exception exc)
{