Merge branch 'MongoDb'

This commit is contained in:
Samuele E. Locatelli
2019-11-23 17:15:54 +01:00
5 changed files with 13 additions and 12 deletions
Vendored
+1 -7
View File
@@ -10,15 +10,9 @@ pipeline {
stage('Checkout') {
agent any
steps {
/* build delle SteamWare libs! */
/* build 'SteamWare/SteamWareLib' */
/* copio le libs...*/
// mirroring directory x SteamWare Libs
// bat "robocopy /MIR ..\\..\\SteamWare\\SteamWareLib ..\\SteamWare\\SteamWareLib || EXIT /B 0"
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=1258']) {
withEnv(['NEXT_BUILD_NUMBER=1259']) {
// 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'
+2
View File
@@ -20,6 +20,8 @@
<add key="sqlLongCommandTimeout" value="600" />
<!--MongoDB-->
<add key="mdbConnString" value="mongodb://W2019-MONGODB:27017" />
<!--JSON deserialization-->
<add key="aspnet:MaxJsonDeserializerMembers" value="150000" />
<!--stringhe connessione-->
<add key="DbConfConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
<add key="MoonProConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
+9 -2
View File
@@ -44,9 +44,16 @@ namespace MapoDb
var collMtcSetup = database.GetCollection<MtcSetup>("MtcSetup");
// compongo filtro ricerca e metodo update
var filter = Builders<MtcSetup>.Filter.Eq(u => u.idxMacchina, idxMacchina);
var update = Builders<MtcSetup>.Update.Set(u => u.dataItems, dataItems);
// chiamo update: cerco riga, se c'è aggiorno sennò creo
collMtcSetup.UpdateOne(filter, update);
MtcSetup newDoc = new MtcSetup()
{
idxMacchina = idxMacchina,
dataItems = dataItems
};
// elimino se ci fosse già...
collMtcSetup.DeleteMany(filter);
// inserisco ex novo!
collMtcSetup.InsertOne(newDoc);
answ = true;
}
catch
-2
View File
@@ -2,7 +2,6 @@
using Newtonsoft.Json.Converters;
using System;
using System.Collections.Generic;
using System.Xml.Serialization;
namespace MapoSDK
{
@@ -588,7 +587,6 @@ namespace MapoSDK
#endregion
#if false
/// <summary>
/// Classe definizione parametri singolo ordine produzione
File diff suppressed because one or more lines are too long