diff --git a/EgwProxy.SqlDb.Test/Program.cs b/EgwProxy.SqlDb.Test/Program.cs
index 746e0e9a..867255f5 100644
--- a/EgwProxy.SqlDb.Test/Program.cs
+++ b/EgwProxy.SqlDb.Test/Program.cs
@@ -149,14 +149,14 @@ namespace EgwProxy.SqlDb.Test
sb.AppendLine($"Aggiunto PODL{podl:0000000}");
}
// chiamo procedura insert PODL
- bool fatto = dbClient.PodlWriteReq(CurrPodlReq);
+ bool fatto = dbClient.MesPodlWriteReq(CurrPodlReq);
sb.AppendLine($"Records Aggiunti!");
sb.AppendLine(separator);
break;
case stepType.DbMigrateAndSync:
try
{
- var esitoMigrate = dbClient.forceMigrate();
+ var esitoMigrate = dbClient.DbForceMigrate();
sb.Append($"Migration: {esitoMigrate}");
}
catch (Exception exc)
@@ -285,7 +285,7 @@ namespace EgwProxy.SqlDb.Test
private static void serverTest(DbController dbClient)
{
Console.WriteLine(separator);
- string testServer = dbClient.serverOk();
+ string testServer = dbClient.ServerOk();
Console.WriteLine($"Test connessione: esito {testServer}");
Console.WriteLine(separator);
Console.WriteLine();
diff --git a/EgwProxy.SqlDb/Controllers/DbController.cs b/EgwProxy.SqlDb/Controllers/DbController.cs
index 9125ce9d..164b6d9f 100644
--- a/EgwProxy.SqlDb/Controllers/DbController.cs
+++ b/EgwProxy.SqlDb/Controllers/DbController.cs
@@ -45,15 +45,22 @@ namespace EgwProxy.SqlDb.Controllers
}
///
- /// Dispose classe
+ /// Recupera la tab di ActType corrente
///
- public void Dispose()
+ ///
+ public List ActTypeGetAll()
{
- // Clear database context
- connString = "";
+ List dbResult = new List();
+ using (var dbSyncStateCtx = new SyncStateDbContext(connString))
+ {
+ dbResult = dbSyncStateCtx
+ .DbSetActListType
+ .ToList();
+ }
+ return dbResult;
}
- public bool forceMigrate()
+ public bool DbForceMigrate()
{
bool fatto = false;
using (var dbSyncStateCtx = new SyncStateDbContext(connString))
@@ -64,6 +71,15 @@ namespace EgwProxy.SqlDb.Controllers
return fatto;
}
+ ///
+ /// Dispose classe
+ ///
+ public void Dispose()
+ {
+ // Clear database context
+ connString = "";
+ }
+
///
/// Recupera la tab FluxLog x i record successivi all'ID già processato
///
@@ -75,10 +91,29 @@ namespace EgwProxy.SqlDb.Controllers
using (var dbSyncStateCtx = new SyncStateDbContext(connString))
{
dbResult = dbSyncStateCtx
- .DbSetMachFluxLog
- .Where(x => x.Id > lastIdx)
- .OrderBy(x => x.Id)
- .ToList();
+ .DbSetMachFluxLog
+ .Where(x => x.Id > lastIdx)
+ .OrderBy(x => x.Id)
+ .ToList();
+ }
+ return dbResult;
+ }
+
+ ///
+ /// Recupera la tab PODL Macchina x i record successivi all'ID già processato
+ ///
+ ///
+ ///
+ public List MachPOdlGetNew(int lastIdx)
+ {
+ List dbResult = new List();
+ using (var dbSyncStateCtx = new SyncStateDbContext(connString))
+ {
+ dbResult = dbSyncStateCtx
+ .DbSetMachPODL
+ .Where(x => x.IdxPromessa > lastIdx)
+ .OrderBy(x => x.IdxPromessa)
+ .ToList();
}
return dbResult;
}
@@ -94,10 +129,10 @@ namespace EgwProxy.SqlDb.Controllers
using (var dbSyncStateCtx = new SyncStateDbContext(connString))
{
dbResult = dbSyncStateCtx
- .DbSetMachProdData
- .Where(x => x.Id > lastIdx)
- .OrderBy(x => x.Id)
- .ToList();
+ .DbSetMachProdData
+ .Where(x => x.Id > lastIdx)
+ .OrderBy(x => x.Id)
+ .ToList();
}
return dbResult;
}
@@ -126,7 +161,7 @@ namespace EgwProxy.SqlDb.Controllers
///
///
///
- public bool PodlWriteReq(List CurrPodlReq)
+ public bool MesPodlWriteReq(List CurrPodlReq)
{
bool fatto = false;
using (var dbSyncStateCtx = new SyncStateDbContext(connString))
@@ -166,13 +201,13 @@ namespace EgwProxy.SqlDb.Controllers
{
dbResult = dbSyncStateCtx
.Database
- .SqlQuery("EXEC dbo.ResetPodlMes")
+ .SqlQuery("EXEC dbo.stp_ResetPodlMes")
.ToList();
}
return dbResult;
}
- public string serverOk()
+ public string ServerOk()
{
return SyncStateGetAll().Count() > 0 ? "OK" : "NA";
}
@@ -188,9 +223,9 @@ namespace EgwProxy.SqlDb.Controllers
using (var dbSyncStateCtx = new SyncStateDbContext(connString))
{
dbResult = dbSyncStateCtx
- .Database
- .SqlQuery("EXEC dbo.stp_ExportAll")
- .ToList();
+ .Database
+ .SqlQuery("EXEC dbo.stp_ExportAll")
+ .ToList();
}
return dbResult;
}
@@ -206,9 +241,9 @@ namespace EgwProxy.SqlDb.Controllers
using (var dbSyncStateCtx = new SyncStateDbContext(connString))
{
dbResult = dbSyncStateCtx
- .Database
- .SqlQuery("EXEC dbo.stp_ImportAll")
- .ToList();
+ .Database
+ .SqlQuery("EXEC dbo.stp_ImportAll")
+ .ToList();
}
return dbResult;
}
@@ -228,6 +263,7 @@ namespace EgwProxy.SqlDb.Controllers
}
return dbResult;
}
+
///
/// Aggiorna record SyncState corrente
///
@@ -239,11 +275,11 @@ namespace EgwProxy.SqlDb.Controllers
{
// cerco record
var dbResult = dbSyncStateCtx
- .DbSetSyncState
- .Where(x => x.TableName == newVal.TableName)
- .FirstOrDefault();
+ .DbSetSyncState
+ .Where(x => x.TableName == newVal.TableName)
+ .FirstOrDefault();
// se trovato aggiorno
- if(dbResult!=null)
+ if (dbResult != null)
{
dbResult.LastIdx = newVal.LastIdx;
dbResult.Note = newVal.Note;
@@ -253,7 +289,7 @@ namespace EgwProxy.SqlDb.Controllers
// altrimenti aggiungo
else
{
- dbSyncStateCtx.DbSetSyncState.Add(newVal);
+ dbSyncStateCtx.DbSetSyncState.Add(newVal);
}
// salvo
diff --git a/EgwProxy.SqlDb/EgwProxy.SqlDb.csproj b/EgwProxy.SqlDb/EgwProxy.SqlDb.csproj
index cf54fcd4..38d1d018 100644
--- a/EgwProxy.SqlDb/EgwProxy.SqlDb.csproj
+++ b/EgwProxy.SqlDb/EgwProxy.SqlDb.csproj
@@ -98,7 +98,10 @@
+
+
+