MP.DATA, riorganizzazioni varie:

- renaming classi gestione DbModels in
- spostamento anagrafica flussi da auth a generale
This commit is contained in:
Samuele E. Locatelli
2025-03-08 10:40:09 +01:00
parent f33a17c156
commit 50d65eebaa
227 changed files with 400 additions and 367 deletions
+25 -25
View File
@@ -38,9 +38,9 @@ namespace MP.FileData.Controllers
/// Elenco tabella Macchine
/// </summary>
/// <returns></returns>
public List<DatabaseModels.ArchMaccModel> ArchMaccGetAll()
public List<DbModels.ArchMaccModel> ArchMaccGetAll()
{
List<DatabaseModels.ArchMaccModel> dbResult = new List<DatabaseModels.ArchMaccModel>();
List<DbModels.ArchMaccModel> dbResult = new List<DbModels.ArchMaccModel>();
using (MoonPro_ProgContext localDbCtx = new MoonPro_ProgContext(_configuration))
{
dbResult = localDbCtx
@@ -1241,9 +1241,9 @@ namespace MP.FileData.Controllers
/// <param name="searchVal"></param>
/// <param name="maxNum"></param>
/// <returns></returns>
public List<DatabaseModels.TagModel> TagGetAll()
public List<DbModels.TagModel> TagGetAll()
{
List<DatabaseModels.TagModel> dbResult = new List<DatabaseModels.TagModel>();
List<DbModels.TagModel> dbResult = new List<DbModels.TagModel>();
using (MoonPro_ProgContext localDbCtx = new MoonPro_ProgContext(_configuration))
{
dbResult = localDbCtx
@@ -1260,10 +1260,10 @@ namespace MP.FileData.Controllers
/// <param name="searchVal"></param>
/// <param name="maxNum"></param>
/// <returns></returns>
public List<DatabaseModels.TagModel> TagGetFilt(string searchVal, int maxNum = 100)
public List<DbModels.TagModel> TagGetFilt(string searchVal, int maxNum = 100)
{
maxNum = maxNum <= 0 ? 100 : maxNum;
List<DatabaseModels.TagModel> dbResult = new List<DatabaseModels.TagModel>();
List<DbModels.TagModel> dbResult = new List<DbModels.TagModel>();
using (MoonPro_ProgContext localDbCtx = new MoonPro_ProgContext(_configuration))
{
int totRecord = localDbCtx
@@ -1278,7 +1278,7 @@ namespace MP.FileData.Controllers
.OrderBy(x => x.TagId)
.Take(maxNum)
.ToList();
dbResult.Add(new DatabaseModels.TagModel() { TagId = $"... +{totRecord - maxNum} rec ..." });
dbResult.Add(new DbModels.TagModel() { TagId = $"... +{totRecord - maxNum} rec ..." });
}
else
{
@@ -1348,9 +1348,9 @@ namespace MP.FileData.Controllers
/// Elenco Azioni (decodifica)
/// </summary>
/// <returns></returns>
public List<DatabaseModels.AzioniUL> ActionsGetAll()
public List<DbModels.AzioniUL> ActionsGetAll()
{
List<DatabaseModels.AzioniUL> dbResult = new List<DatabaseModels.AzioniUL>();
List<DbModels.AzioniUL> dbResult = new List<DbModels.AzioniUL>();
dbResult = dbCtx
.DbSetAzioniUL
@@ -1365,9 +1365,9 @@ namespace MP.FileData.Controllers
/// <param name="numRecord"></param>
/// <param name="searchVal"></param>
/// <returns></returns>
public List<DatabaseModels.AnagArticoli> ArticoliGetSearch(int numRecord, string searchVal = "")
public List<DbModels.AnagArticoli> ArticoliGetSearch(int numRecord, string searchVal = "")
{
List<DatabaseModels.AnagArticoli> dbResult = new List<DatabaseModels.AnagArticoli>();
List<DbModels.AnagArticoli> dbResult = new List<DbModels.AnagArticoli>();
dbResult = dbCtx
.DbSetArticoli
@@ -1385,9 +1385,9 @@ namespace MP.FileData.Controllers
/// <param name="numRecord"></param>
/// <param name="searchVal"></param>
/// <returns></returns>
public List<DatabaseModels.ODL> CommesseGetSearch(int numRecord, string searchVal = "")
public List<DbModels.ODL> CommesseGetSearch(int numRecord, string searchVal = "")
{
List<DatabaseModels.ODL> dbResult = new List<DatabaseModels.ODL>();
List<DbModels.ODL> dbResult = new List<DbModels.ODL>();
dbResult = dbCtx
.DbSetODL
@@ -1406,9 +1406,9 @@ namespace MP.FileData.Controllers
/// <param name="numRecord"></param>
/// <param name="searchVal"></param>
/// <returns></returns>
public List<DatabaseModels.ResControlli> StatControlliGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo)
public List<DbModels.ResControlli> StatControlliGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo)
{
List<DatabaseModels.ResControlli> dbResult = new List<DatabaseModels.ResControlli>();
List<DbModels.ResControlli> dbResult = new List<DbModels.ResControlli>();
var dataFrom = new SqlParameter("@dataFrom", DataStart);
var dataTo = new SqlParameter("@dataTo", DataEnd);
@@ -1437,9 +1437,9 @@ namespace MP.FileData.Controllers
/// <param name="FirstRecord"></param>
/// <param name="NumRecord"></param>
/// <returns></returns>
public List<DatabaseModels.DdbTurni> StatDdbGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, int FirstRecord, int NumRecord)
public List<DbModels.DdbTurni> StatDdbGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, int FirstRecord, int NumRecord)
{
List<DatabaseModels.DdbTurni> dbResult = new List<DatabaseModels.DdbTurni>();
List<DbModels.DdbTurni> dbResult = new List<DbModels.DdbTurni>();
var dataFrom = new SqlParameter("@dataFrom", DataStart);
var dataTo = new SqlParameter("@dataTo", DataEnd);
@@ -1484,9 +1484,9 @@ namespace MP.FileData.Controllers
/// <param name="numRecord"></param>
/// <param name="searchVal"></param>
/// <returns></returns>
public List<DatabaseModels.ODL> StatOdlGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo)
public List<DbModels.ODL> StatOdlGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo)
{
List<DatabaseModels.ODL> dbResult = new List<DatabaseModels.ODL>();
List<DbModels.ODL> dbResult = new List<DbModels.ODL>();
var dataFrom = new SqlParameter("@dataFrom", DataStart);
var dataTo = new SqlParameter("@dataTo", DataEnd);
@@ -1511,9 +1511,9 @@ namespace MP.FileData.Controllers
/// <param name="IdxMacchina"></param>
/// <param name="DataEnd"></param>
/// <returns></returns>
public List<DatabaseModels.ResScarti> StatScartiGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo)
public List<DbModels.ResScarti> StatScartiGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo)
{
List<DatabaseModels.ResScarti> dbResult = new List<DatabaseModels.ResScarti>();
List<DbModels.ResScarti> dbResult = new List<DbModels.ResScarti>();
var dataFrom = new SqlParameter("@dataFrom", DataStart);
var dataTo = new SqlParameter("@dataTo", DataEnd);
@@ -1538,9 +1538,9 @@ namespace MP.FileData.Controllers
/// <param name="IdxMacchina"></param>
/// <param name="DataEnd"></param>
/// <returns></returns>
public List<DatabaseModels.TurniOee> StatTurniOeeGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo)
public List<DbModels.TurniOee> StatTurniOeeGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo)
{
List<DatabaseModels.TurniOee> dbResult = new List<DatabaseModels.TurniOee>();
List<DbModels.TurniOee> dbResult = new List<DbModels.TurniOee>();
var dataFrom = new SqlParameter("@dataFrom", DataStart);
var dataTo = new SqlParameter("@dataTo", DataEnd);
@@ -1563,9 +1563,9 @@ namespace MP.FileData.Controllers
/// <param name="numRecord"></param>
/// <param name="searchVal"></param>
/// <returns></returns>
public List<DatabaseModels.UserActionLog> StatUserLogGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo)
public List<DbModels.UserActionLog> StatUserLogGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo)
{
List<DatabaseModels.UserActionLog> dbResult = new List<DatabaseModels.UserActionLog>();
List<DbModels.UserActionLog> dbResult = new List<DbModels.UserActionLog>();
//dbResult = dbCtx
// .DbSetUserLog
+7 -7
View File
@@ -37,7 +37,7 @@ namespace MP.FileData.Migrations
b.ToTable("FileModelTagModel");
});
modelBuilder.Entity("MP.FileData.DatabaseModels.FileModel", b =>
modelBuilder.Entity("MP.FileData.DbModels.FileModel", b =>
{
b.Property<int>("FileId")
.ValueGeneratedOnAdd()
@@ -87,7 +87,7 @@ namespace MP.FileData.Migrations
b.ToTable("Files");
});
modelBuilder.Entity("MP.FileData.DatabaseModels.MacchinaModel", b =>
modelBuilder.Entity("MP.FileData.DbModels.MacchinaModel", b =>
{
b.Property<string>("IdxMacchina")
.HasColumnType("nvarchar(450)");
@@ -131,7 +131,7 @@ namespace MP.FileData.Migrations
});
});
modelBuilder.Entity("MP.FileData.DatabaseModels.TagModel", b =>
modelBuilder.Entity("MP.FileData.DbModels.TagModel", b =>
{
b.Property<string>("TagId")
.HasColumnType("nvarchar(450)");
@@ -143,22 +143,22 @@ namespace MP.FileData.Migrations
modelBuilder.Entity("FileModelTagModel", b =>
{
b.HasOne("MP.FileData.DatabaseModels.FileModel", null)
b.HasOne("MP.FileData.DbModels.FileModel", null)
.WithMany()
.HasForeignKey("FilesFileId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("MP.FileData.DatabaseModels.TagModel", null)
b.HasOne("MP.FileData.DbModels.TagModel", null)
.WithMany()
.HasForeignKey("TagsTagId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("MP.FileData.DatabaseModels.FileModel", b =>
modelBuilder.Entity("MP.FileData.DbModels.FileModel", b =>
{
b.HasOne("MP.FileData.DatabaseModels.MacchinaModel", "Macchina")
b.HasOne("MP.FileData.DbModels.MacchinaModel", "Macchina")
.WithMany()
.HasForeignKey("IdxMacchina");
@@ -40,7 +40,7 @@ namespace MP.FileData.Migrations
b.ToTable("FileModelTagModel");
});
modelBuilder.Entity("MP.FileData.DatabaseModels.ArchMaccModel", b =>
modelBuilder.Entity("MP.FileData.DbModels.ArchMaccModel", b =>
{
b.Property<string>("IdxMacchina")
.HasColumnType("nvarchar(450)");
@@ -84,7 +84,7 @@ namespace MP.FileData.Migrations
});
});
modelBuilder.Entity("MP.FileData.DatabaseModels.FileModel", b =>
modelBuilder.Entity("MP.FileData.DbModels.FileModel", b =>
{
b.Property<int>("FileId")
.ValueGeneratedOnAdd()
@@ -142,7 +142,7 @@ namespace MP.FileData.Migrations
b.ToTable("Files");
});
modelBuilder.Entity("MP.FileData.DatabaseModels.TagModel", b =>
modelBuilder.Entity("MP.FileData.DbModels.TagModel", b =>
{
b.Property<string>("TagId")
.HasColumnType("nvarchar(450)");
@@ -154,22 +154,22 @@ namespace MP.FileData.Migrations
modelBuilder.Entity("FileModelTagModel", b =>
{
b.HasOne("MP.FileData.DatabaseModels.FileModel", null)
b.HasOne("MP.FileData.DbModels.FileModel", null)
.WithMany()
.HasForeignKey("FilesFileId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("MP.FileData.DatabaseModels.TagModel", null)
b.HasOne("MP.FileData.DbModels.TagModel", null)
.WithMany()
.HasForeignKey("TagsTagId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("MP.FileData.DatabaseModels.FileModel", b =>
modelBuilder.Entity("MP.FileData.DbModels.FileModel", b =>
{
b.HasOne("MP.FileData.DatabaseModels.ArchMaccModel", "Macchina")
b.HasOne("MP.FileData.DbModels.ArchMaccModel", "Macchina")
.WithMany()
.HasForeignKey("IdxMacchina");
@@ -38,7 +38,7 @@ namespace MP.FileData.Migrations
b.ToTable("FileModelTagModel");
});
modelBuilder.Entity("MP.FileData.DatabaseModels.ArchMaccModel", b =>
modelBuilder.Entity("MP.FileData.DbModels.ArchMaccModel", b =>
{
b.Property<string>("IdxMacchina")
.HasColumnType("nvarchar(450)");
@@ -82,7 +82,7 @@ namespace MP.FileData.Migrations
});
});
modelBuilder.Entity("MP.FileData.DatabaseModels.FileModel", b =>
modelBuilder.Entity("MP.FileData.DbModels.FileModel", b =>
{
b.Property<int>("FileId")
.ValueGeneratedOnAdd()
@@ -140,7 +140,7 @@ namespace MP.FileData.Migrations
b.ToTable("Files");
});
modelBuilder.Entity("MP.FileData.DatabaseModels.TagModel", b =>
modelBuilder.Entity("MP.FileData.DbModels.TagModel", b =>
{
b.Property<string>("TagId")
.HasColumnType("nvarchar(450)");
@@ -152,22 +152,22 @@ namespace MP.FileData.Migrations
modelBuilder.Entity("FileModelTagModel", b =>
{
b.HasOne("MP.FileData.DatabaseModels.FileModel", null)
b.HasOne("MP.FileData.DbModels.FileModel", null)
.WithMany()
.HasForeignKey("FilesFileId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("MP.FileData.DatabaseModels.TagModel", null)
b.HasOne("MP.FileData.DbModels.TagModel", null)
.WithMany()
.HasForeignKey("TagsTagId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("MP.FileData.DatabaseModels.FileModel", b =>
modelBuilder.Entity("MP.FileData.DbModels.FileModel", b =>
{
b.HasOne("MP.FileData.DatabaseModels.ArchMaccModel", "Macchina")
b.HasOne("MP.FileData.DbModels.ArchMaccModel", "Macchina")
.WithMany()
.HasForeignKey("IdxMacchina");