diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6e3ebc71..f8832a75 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -79,14 +79,14 @@ variables: echo "mCurl -s -u GitLab:$NEXUS_PASSWD --upload-file $FileCLogOut https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/LAST/ChangeLog.html" mCurl -s -u GitLab:$NEXUS_PASSWD --upload-file $FileCLogOut https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/LAST/ChangeLog.html -# helper x send su NEXUS di pack SDK in formato nuget -.sendSDK: &sendSDK - - | - '& "$env:MSBUILD_PATH" MapoSDK/MapoSDK.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/Release /verbosity:minimal /m' - '& Remove-Item *.nupkg' - '& $env:NUGET_PATH pack MapoSDK\MapoSDK.csproj -properties Configuration=$env:APP_CONF -Description="Mapo SDK helper library" -Author=EgalWare -Version $env:NEW_REL' - '& $env:NUGET_PATH setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source https://nexus.steamware.net/repository/nuget-hosted' - '& $env:NUGET_PATH push MapoSDK.$env:NEW_REL.nupkg -Source https://nexus.steamware.net/repository/nuget-hosted' +# # helper x send su NEXUS di pack SDK in formato nuget +# .sendSDK: &sendSDK +# - | +# '& "$env:MSBUILD_PATH" MapoSDK/MapoSDK.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/Release /verbosity:minimal /m' +# '& Remove-Item *.nupkg' +# '& $env:NUGET_PATH pack MapoSDK\MapoSDK.csproj -properties Configuration=$env:APP_CONF -Description="Mapo SDK helper library" -Author=EgalWare -Version $env:NEW_REL' +# '& $env:NUGET_PATH setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source https://nexus.steamware.net/repository/nuget-hosted' +# '& $env:NUGET_PATH push MapoSDK.$env:NEW_REL.nupkg -Source https://nexus.steamware.net/repository/nuget-hosted' # helper x fix version number .version-fix: &version-fix @@ -119,7 +119,12 @@ SDK: - '& "$env:NUGET_PATH" restore MAPO.sln -verbosity quiet' - *version-fix script: - - *sendSDK + - '& "$env:MSBUILD_PATH" MapoSDK/MapoSDK.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/Release /verbosity:minimal /m' + - '& Remove-Item *.nupkg' + - '& $env:NUGET_PATH pack MapoSDK\MapoSDK.csproj -properties Configuration=$env:APP_CONF -Version $env:NEW_REL' + - '& $env:NUGET_PATH setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source https://nexus.steamware.net/repository/nuget-hosted' + - '& $env:NUGET_PATH push MapoSDK.$env:NEW_REL.nupkg -Source https://nexus.steamware.net/repository/nuget-hosted' + # - *sendSDK ADM:build: stage: build diff --git a/MP-IO/Controllers/IOBController.cs b/MP-IO/Controllers/IOBController.cs index b412ec5c..f169145a 100644 --- a/MP-IO/Controllers/IOBController.cs +++ b/MP-IO/Controllers/IOBController.cs @@ -70,7 +70,7 @@ namespace MP_IO.Controllers } else { - logger.lg.scriviLog($"addTask2Exe: impossibile riconoscere il comando {taskName} come uno deitipi ammessi, NON aggiunto", tipoLog.ERROR); + logger.lg.scriviLog($"addTask2Exe: impossibile riconoscere il comando {taskName} come uno dei tipi ammessi, NON aggiunto", tipoLog.ERROR); } answ = getTask2Exe(id); } @@ -685,7 +685,7 @@ namespace MP_IO.Controllers try { DataLayer DataLayerObj = new DataLayer(); - // deserializzo. + // deserializzo currParams = DataLayerObj.getCurrObjItems(id); // se != null --> salvo! if (currParams != null) @@ -695,7 +695,7 @@ namespace MP_IO.Controllers } catch (Exception exc) { - logger.lg.scriviLog($"Errore in getCurrParams{Environment.NewLine}{exc}"); + logger.lg.scriviLog($"Errore in getObjItems{Environment.NewLine}{exc}"); answ = "NO"; } } @@ -722,7 +722,7 @@ namespace MP_IO.Controllers try { DataLayer DataLayerObj = new DataLayer(); - // deserializzo. + // deserializzo currParams = DataLayerObj.getCurrObjItemsPendigWrite(id); // se != null --> salvo! if (currParams != null) @@ -1348,7 +1348,7 @@ namespace MP_IO.Controllers } catch (Exception exc) { - logger.lg.scriviLog($"Errore in setCurrParams{Environment.NewLine}{exc}"); + logger.lg.scriviLog($"Errore in upsertObjItems{Environment.NewLine}{exc}"); answ = "NO"; } } diff --git a/MapoDb/DataLayer.cs b/MapoDb/DataLayer.cs index 75b89af8..7a4c44ef 100644 --- a/MapoDb/DataLayer.cs +++ b/MapoDb/DataLayer.cs @@ -849,7 +849,6 @@ namespace MapoDb } catch { } - // chiamo update come task di scrittura return answ; } @@ -2084,7 +2083,7 @@ namespace MapoDb } catch (Exception exc) { - logger.lg.scriviLog(string.Format("Errore in recupero dati SAVED TASK x Redis mSavedTaskMacchina - idxMacchina {2}:{0}{1}", Environment.NewLine, exc, idxMacchina)); + logger.lg.scriviLog($"Errore in recupero dati SAVED TASK x Redis mSavedTaskMacchina | idxMacchina {idxMacchina}{Environment.NewLine}{exc}"); } return answ; } @@ -3491,7 +3490,6 @@ namespace MapoDb { string serVal = JsonConvert.SerializeObject(currValues); memLayer.ML.setRSV(currParametersHash(idxMacchina), serVal); - // controllo se ha valori write... foreach (var item in currValues) { diff --git a/MapoSDK/Objects.cs b/MapoSDK/Objects.cs index d38ca404..ad72c8b9 100644 --- a/MapoSDK/Objects.cs +++ b/MapoSDK/Objects.cs @@ -310,6 +310,11 @@ namespace MapoSDK [JsonConverter(typeof(StringEnumConverter))] public plcDataType tipoMem { get; set; } = plcDataType.Int; + /// + /// Unità di misura del parametro + /// + public string unit { get; set; } = ""; + /// /// Valore parametro (come stringa, decimali con ",", default VUOTO), poi LETTO da PLC (o appena scritto) /// @@ -819,6 +824,20 @@ namespace MapoSDK #endregion Public Properties } + public class StCheckOverride + { + #region Public Properties + + public bool CanForce { get; set; } = false; + public string CodGruppo { get; set; } = ""; + public string CodTipo { get; set; } = ""; + public int IdxST { get; set; } = 0; + public int Num { get; set; } = 0; + public int Oggetto { get; set; } = 0; + + #endregion Public Properties + } + /// /// Classe oggetto base TimeSeries /// @@ -982,14 +1001,4 @@ namespace MapoSDK #endregion Public Properties } - - public class StCheckOverride - { - public bool CanForce { get; set; } = false; - public string CodGruppo { get; set; } = ""; - public string CodTipo { get; set; } = ""; - public int IdxST { get; set; } = 0; - public int Num { get; set; } = 0; - public int Oggetto { get; set; } = 0; - } } \ No newline at end of file