From 4e054c991a2be9e8b457529e460c99671b2b78e4 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 26 Mar 2019 17:05:12 +0100 Subject: [PATCH] Update 1180 x IO --- Jenkinsfile | 2 +- MP-IO/Controllers/IOBController.cs | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a03ca1e5..8d3c0677 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,7 +18,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=1179']) { + withEnv(['NEXT_BUILD_NUMBER=1184']) { // env.versionNumber = VersionNumber(versionNumberString : '6.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '6.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO' diff --git a/MP-IO/Controllers/IOBController.cs b/MP-IO/Controllers/IOBController.cs index 23c3d52d..70c7cbeb 100644 --- a/MP-IO/Controllers/IOBController.cs +++ b/MP-IO/Controllers/IOBController.cs @@ -29,7 +29,7 @@ namespace MP_IO.Controllers return "OK"; } - // GET: IOB/enabled/5 + // GET: IOB/enabled/SIMUL_03 public string enabled(string id) { string answ = "ND"; @@ -53,7 +53,7 @@ namespace MP_IO.Controllers } return answ; } - // GET: IOB/slog/5 + // GET: IOB/slog/SIMUL_03 public string slog(string id) { string answ = "ND"; @@ -76,7 +76,7 @@ namespace MP_IO.Controllers } return answ; } - // GET: IOB/input/5?valore=3&dtEve=20181206180600000&dtCurr=20181206180600000&cnt=999 + // GET: IOB/input/SIMUL_03?valore=3&dtEve=20181206180600000&dtCurr=20181206180600000&cnt=999 public string input(string id, string valore, string dtEve, string dtCurr, string cnt) { string answ = ""; @@ -102,7 +102,7 @@ namespace MP_IO.Controllers } return answ; } - // GET: IOB/flog/5?flux=PROG&valore=P0001&dtEve=20161223180600000&dtCurr=20161223180600000&cnt=999 + // GET: IOB/flog/SIMUL_03?flux=PROG&valore=P0001&dtEve=20161223180600000&dtCurr=20161223180600000&cnt=999 public string flog(string id, string flux, string valore, string dtEve, string dtCurr, string cnt) { string answ = ""; @@ -130,7 +130,7 @@ namespace MP_IO.Controllers } return answ; } - // GET: IOB/liveRec/5?&liveData=chiave1|valore1#chiave2|valore#|chiave3|valore3 + // GET: IOB/liveRec/SIMUL_03?&liveData=chiave1|valore1#chiave2|valore#|chiave3|valore3 public string liveRec(string id, string liveData) { string answ = ""; @@ -153,7 +153,7 @@ namespace MP_IO.Controllers /// /// Recupera ODL corrente x macchina: /// - /// GET: IOB/getCurrODL/5 + /// GET: IOB/getCurrODL/SIMUL_03 /// /// /// @@ -176,7 +176,7 @@ namespace MP_IO.Controllers /// /// Recupera DATI correnti x macchina: /// - /// GET: IOB/getCurrData/5 + /// GET: IOB/getCurrData/SIMUL_03 /// /// /// @@ -200,7 +200,7 @@ namespace MP_IO.Controllers /// /// Recupera TASK richiesto x macchina: /// - /// GET: IOB/getTask2Exe/5 + /// GET: IOB/getTask2Exe/SIMUL_03 /// /// /// @@ -224,7 +224,7 @@ namespace MP_IO.Controllers /// /// AGGIUNGE TASK richiesto x macchina: /// - /// GET: IOB/addTask2Exe/5?taskName=T180326160502&taskVal=setPrg#PRG001 + /// GET: IOB/addTask2Exe/SIMUL_03?taskName=T180326160502&taskVal=setPrg:PRG001 /// /// /// @@ -248,7 +248,7 @@ namespace MP_IO.Controllers /// /// ELIMINA TASK richiesto x macchina: /// - /// GET: IOB/remTask2Exe/5?taskName=T180326160502 + /// GET: IOB/remTask2Exe/SIMUL_03?taskName=T180326160502 /// /// ///