Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ba01a4851d | |||
| f7ed3c8b59 | |||
| c56cd613d9 | |||
| f221b3ea19 | |||
| 575af20c54 | |||
| f2a91e09c0 | |||
| 15c3bf012f | |||
| d3e4c65b1c |
@@ -227,13 +227,17 @@ namespace GWMS.Data.Controllers
|
|||||||
|
|
||||||
public List<PlantDTO> GetPlantsDTO(int maxRecords)
|
public List<PlantDTO> GetPlantsDTO(int maxRecords)
|
||||||
{
|
{
|
||||||
var plantList = dbCtx
|
List<PlantDTO> dbResult = new List<PlantDTO>();
|
||||||
.DbSetPlant
|
using (GWMSContext dbCtxMult = new GWMSContext(_configuration))
|
||||||
.ToList();
|
{
|
||||||
|
var plantList = dbCtxMult
|
||||||
|
.DbSetPlant
|
||||||
|
.ToList();
|
||||||
|
|
||||||
var dbResult = plantList
|
dbResult = plantList
|
||||||
.Select(x => PlantDTO(x.PlantId, maxRecords))
|
.Select(x => PlantDTO(x.PlantId, maxRecords))
|
||||||
.ToList();
|
.ToList();
|
||||||
|
}
|
||||||
|
|
||||||
return dbResult;
|
return dbResult;
|
||||||
}
|
}
|
||||||
@@ -353,7 +357,7 @@ namespace GWMS.Data.Controllers
|
|||||||
public PlantDTO PlantDTO(int PlantId, int maxRecords)
|
public PlantDTO PlantDTO(int PlantId, int maxRecords)
|
||||||
{
|
{
|
||||||
var currPlant = GetPlant(PlantId);
|
var currPlant = GetPlant(PlantId);
|
||||||
|
PlantDTO answ = new PlantDTO();
|
||||||
List<TSData> LevelTS = new List<TSData>();
|
List<TSData> LevelTS = new List<TSData>();
|
||||||
Dictionary<string, double> PressAct = new Dictionary<string, double>();
|
Dictionary<string, double> PressAct = new Dictionary<string, double>();
|
||||||
Dictionary<string, List<TSData>> PressTS = new Dictionary<string, List<TSData>>();
|
Dictionary<string, List<TSData>> PressTS = new Dictionary<string, List<TSData>>();
|
||||||
@@ -361,82 +365,87 @@ namespace GWMS.Data.Controllers
|
|||||||
List<TSData> PressBHTS = new List<TSData>();
|
List<TSData> PressBHTS = new List<TSData>();
|
||||||
List<TSData> PressBLTS = new List<TSData>();
|
List<TSData> PressBLTS = new List<TSData>();
|
||||||
List<TSData> OrderTS = new List<TSData>();
|
List<TSData> OrderTS = new List<TSData>();
|
||||||
// recupero dal DB
|
|
||||||
var rawLevelData = dbCtx
|
using (GWMSContext dbCtxMult = new GWMSContext(_configuration))
|
||||||
|
{
|
||||||
|
// recupero dal DB
|
||||||
|
var rawLevelData = dbCtxMult
|
||||||
.DbSetPlantLog
|
.DbSetPlantLog
|
||||||
.Where(x => x.FluxType == "Level" && x.PlantId == PlantId)
|
.Where(x => x.FluxType == "Level" && x.PlantId == PlantId)
|
||||||
.OrderBy(x => x.DtEvent)
|
.OrderBy(x => x.DtEvent)
|
||||||
.Take(maxRecords)
|
.Take(maxRecords)
|
||||||
.ToList();
|
.ToList();
|
||||||
|
|
||||||
var rawMainPressData = dbCtx
|
var rawMainPressData = dbCtxMult
|
||||||
.DbSetPlantLog
|
.DbSetPlantLog
|
||||||
.Where(x => x.FluxType == "MainPress" && x.PlantId == PlantId)
|
.Where(x => x.FluxType == "MainPress" && x.PlantId == PlantId)
|
||||||
.OrderBy(x => x.DtEvent)
|
.OrderBy(x => x.DtEvent)
|
||||||
.Take(maxRecords)
|
.Take(maxRecords)
|
||||||
.ToList();
|
.ToList();
|
||||||
|
|
||||||
var rawBHPressData = dbCtx
|
var rawBHPressData = dbCtxMult
|
||||||
.DbSetPlantLog
|
.DbSetPlantLog
|
||||||
.Where(x => x.FluxType == "PressBH" && x.PlantId == PlantId)
|
.Where(x => x.FluxType == "PressBH" && x.PlantId == PlantId)
|
||||||
.OrderBy(x => x.DtEvent)
|
.OrderBy(x => x.DtEvent)
|
||||||
.Take(maxRecords)
|
.Take(maxRecords)
|
||||||
.ToList();
|
.ToList();
|
||||||
|
|
||||||
var rawBLPressData = dbCtx
|
var rawBLPressData = dbCtxMult
|
||||||
.DbSetPlantLog
|
.DbSetPlantLog
|
||||||
.Where(x => x.FluxType == "PressBL" && x.PlantId == PlantId)
|
.Where(x => x.FluxType == "PressBL" && x.PlantId == PlantId)
|
||||||
.OrderBy(x => x.DtEvent)
|
.OrderBy(x => x.DtEvent)
|
||||||
.Take(maxRecords)
|
.Take(maxRecords)
|
||||||
.ToList();
|
.ToList();
|
||||||
|
|
||||||
var rawOrderData = dbCtx
|
var rawOrderData = dbCtxMult
|
||||||
.DbSetOrders
|
.DbSetOrders
|
||||||
.Where(x => x.PlantId == PlantId)
|
.Where(x => x.PlantId == PlantId)
|
||||||
.OrderBy(x => x.DtOrder)
|
.OrderBy(x => x.DtOrder)
|
||||||
.Take(maxRecords)
|
.Take(maxRecords)
|
||||||
.ToList();
|
.ToList();
|
||||||
|
|
||||||
LevelTS = rawLevelData
|
LevelTS = rawLevelData
|
||||||
.Select(x => new TSData() { DtEvent = x.DtEvent, ValDouble = x.ValNumber }).ToList();
|
.Select(x => new TSData() { DtEvent = x.DtEvent, ValDouble = x.ValNumber }).ToList();
|
||||||
|
|
||||||
OrderTS = rawOrderData
|
OrderTS = rawOrderData
|
||||||
.Select(x => new TSData() { DtEvent = x.DtOrder, ValDouble = x.OrderQty }).ToList();
|
.Select(x => new TSData() { DtEvent = x.DtOrder, ValDouble = x.OrderQty }).ToList();
|
||||||
|
|
||||||
PressMainTS = rawMainPressData
|
PressMainTS = rawMainPressData
|
||||||
.Select(x => new TSData() { DtEvent = x.DtEvent, ValDouble = x.ValNumber }).ToList();
|
.Select(x => new TSData() { DtEvent = x.DtEvent, ValDouble = x.ValNumber }).ToList();
|
||||||
|
|
||||||
PressBHTS = rawBHPressData
|
PressBHTS = rawBHPressData
|
||||||
.Select(x => new TSData() { DtEvent = x.DtEvent, ValDouble = x.ValNumber }).ToList();
|
.Select(x => new TSData() { DtEvent = x.DtEvent, ValDouble = x.ValNumber }).ToList();
|
||||||
|
|
||||||
PressBLTS = rawBLPressData
|
PressBLTS = rawBLPressData
|
||||||
.Select(x => new TSData() { DtEvent = x.DtEvent, ValDouble = x.ValNumber }).ToList();
|
.Select(x => new TSData() { DtEvent = x.DtEvent, ValDouble = x.ValNumber }).ToList();
|
||||||
|
|
||||||
PressTS.Add("Main", PressMainTS);
|
PressTS.Add("Main", PressMainTS);
|
||||||
PressTS.Add("BH", PressBHTS);
|
PressTS.Add("BH", PressBHTS);
|
||||||
PressTS.Add("BL", PressBLTS);
|
PressTS.Add("BL", PressBLTS);
|
||||||
|
|
||||||
double actLevel = LevelTS.Count > 0 ? LevelTS.OrderByDescending(x => x.DtEvent).Take(1).FirstOrDefault().ValDouble : 0;
|
double actLevel = LevelTS.Count > 0 ? LevelTS.OrderByDescending(x => x.DtEvent).Take(1).FirstOrDefault().ValDouble : 0;
|
||||||
double valMain = PressMainTS.Count > 0 ? PressMainTS.OrderByDescending(x => x.DtEvent).Take(1).FirstOrDefault().ValDouble : 0;
|
double valMain = PressMainTS.Count > 0 ? PressMainTS.OrderByDescending(x => x.DtEvent).Take(1).FirstOrDefault().ValDouble : 0;
|
||||||
double valBH = PressBHTS.Count > 0 ? PressBHTS.OrderByDescending(x => x.DtEvent).Take(1).FirstOrDefault().ValDouble : 0;
|
double valBH = PressBHTS.Count > 0 ? PressBHTS.OrderByDescending(x => x.DtEvent).Take(1).FirstOrDefault().ValDouble : 0;
|
||||||
double valBL = PressBLTS.Count > 0 ? PressBLTS.OrderByDescending(x => x.DtEvent).Take(1).FirstOrDefault().ValDouble : 0;
|
double valBL = PressBLTS.Count > 0 ? PressBLTS.OrderByDescending(x => x.DtEvent).Take(1).FirstOrDefault().ValDouble : 0;
|
||||||
|
|
||||||
PressAct.Add("Main", valMain);
|
PressAct.Add("Main", valMain);
|
||||||
PressAct.Add("BH", valBH);
|
PressAct.Add("BH", valBH);
|
||||||
PressAct.Add("BL", valBL);
|
PressAct.Add("BL", valBL);
|
||||||
|
|
||||||
PlantDTO answ = new PlantDTO()
|
// popolo valolri
|
||||||
{
|
answ = new PlantDTO()
|
||||||
PlantId = PlantId,
|
{
|
||||||
PlantCode = currPlant.PlantCode,
|
PlantId = PlantId,
|
||||||
PlantDesc = currPlant.PlantDesc,
|
PlantCode = currPlant.PlantCode,
|
||||||
LevelAct = actLevel,
|
PlantDesc = currPlant.PlantDesc,
|
||||||
LevelMax = currPlant.LevelMax,
|
LevelAct = actLevel,
|
||||||
PressAct = PressAct,
|
LevelMax = currPlant.LevelMax,
|
||||||
LevelTS = LevelTS,
|
PressAct = PressAct,
|
||||||
PressTS = PressTS,
|
LevelTS = LevelTS,
|
||||||
OrderTS = OrderTS
|
PressTS = PressTS,
|
||||||
};
|
OrderTS = OrderTS
|
||||||
|
};
|
||||||
|
}
|
||||||
return answ;
|
return answ;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -473,26 +482,6 @@ namespace GWMS.Data.Controllers
|
|||||||
.AddRange(newItems);
|
.AddRange(newItems);
|
||||||
dbCtx.SaveChanges();
|
dbCtx.SaveChanges();
|
||||||
fatto = true;
|
fatto = true;
|
||||||
|
|
||||||
#if false
|
|
||||||
// ogni 10 insert faccio chiamata x pulizia per le ultime 3h... FARE!!!!
|
|
||||||
Dictionary<string, int> flux2prox = new Dictionary<string, int>();
|
|
||||||
foreach (var item in newItems)
|
|
||||||
{
|
|
||||||
if (!flux2prox.ContainsKey(item.FluxType))
|
|
||||||
{
|
|
||||||
flux2prox.Add(item.FluxType, item.PlantId);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// ciclo x ogni flusso
|
|
||||||
foreach (var item in flux2prox)
|
|
||||||
{
|
|
||||||
DateTime adesso = DateTime.Now;
|
|
||||||
DateTime startTime = DateTime.Today.AddHours(adesso.Hour - 2);
|
|
||||||
string sqlQuery = $"CALL DecimateLog('{startTime}', {item.Value}, 15, '{item.Key}')";
|
|
||||||
var table = dbCtx.DbSetPlantLog.FromSqlRaw(sqlQuery);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
catch (Exception exc)
|
catch (Exception exc)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -37,10 +37,10 @@ namespace GWMS.Data
|
|||||||
|
|
||||||
// inizializzazione dei valori di default x Plant
|
// inizializzazione dei valori di default x Plant
|
||||||
modelBuilder.Entity<PlantDetailModel>().HasData(
|
modelBuilder.Entity<PlantDetailModel>().HasData(
|
||||||
new PlantDetailModel { PlantId = 1, PlantCode = "PIZ03", PlantDesc = "Collecchio", LevelMax = 28000, PressMax = 19, PressBHMax = 270, PressBLMax = 270 },
|
new PlantDetailModel { PlantId = 1, PlantCode = "PIZ03", PlantDesc = "Collecchio", LevelMax = 26000, PressMax = 19, PressBHMax = 270, PressBLMax = 270 },
|
||||||
new PlantDetailModel { PlantId = 2, PlantCode = "PIZ04", PlantDesc = "Noceto", LevelMax = 28000, PressMax = 19, PressBHMax = 270, PressBLMax = 270 },
|
new PlantDetailModel { PlantId = 2, PlantCode = "PIZ04", PlantDesc = "Noceto", LevelMax = 28000, PressMax = 19, PressBHMax = 270, PressBLMax = 270 },
|
||||||
new PlantDetailModel { PlantId = 3, PlantCode = "PIZ05", PlantDesc = "Baganzola", LevelMax = 24000, PressMax = 19, PressBHMax = 270, PressBLMax = 270 },
|
new PlantDetailModel { PlantId = 3, PlantCode = "PIZ05", PlantDesc = "Baganzola", LevelMax = 24000, PressMax = 19, PressBHMax = 270, PressBLMax = 270 },
|
||||||
new PlantDetailModel { PlantId = 4, PlantCode = "PIZ08", PlantDesc = "Pilastrello", LevelMax = 25500, PressMax = 19, PressBHMax = 270, PressBLMax = 270 }
|
new PlantDetailModel { PlantId = 4, PlantCode = "PIZ08", PlantDesc = "Pilastrello", LevelMax = 26000, PressMax = 19, PressBHMax = 270, PressBLMax = 270 }
|
||||||
);
|
);
|
||||||
|
|
||||||
// inizializzazione dei valori di default x Fornitori
|
// inizializzazione dei valori di default x Fornitori
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="card-body p-1">
|
<div class="card-body p-1">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-5 pr-0">
|
<div class="col-4 pr-0">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-12">
|
<div class="col-12">
|
||||||
<ul class="list-group">
|
<ul class="list-group">
|
||||||
@@ -26,23 +26,23 @@
|
|||||||
</li>
|
</li>
|
||||||
<li class="list-group-item active d-flex justify-content-between align-items-center py-1">PB Alta</li>
|
<li class="list-group-item active d-flex justify-content-between align-items-center py-1">PB Alta</li>
|
||||||
<li class="list-group-item d-flex justify-content-between align-items-center small">
|
<li class="list-group-item d-flex justify-content-between align-items-center small">
|
||||||
<span><i class="fas fa-compress-arrows-alt"></i> Stoccaggio</span> <span><b>@currItem.PressAct["BH"].ToString("N1")</b>bar</span>
|
<span><i class="fas fa-compress-arrows-alt"></i> Stoccaggio</span> <span><b>@getPressData("BH", "N1")</b> <sub>bar</sub></span>
|
||||||
</li>
|
</li>
|
||||||
<li class="list-group-item d-flex justify-content-between align-items-center small">
|
<li class="list-group-item d-flex justify-content-between align-items-center small">
|
||||||
<span><i class="fas fa-compress-arrows-alt"></i> Alimentazione</span> <span><b>@currItem.PressAct["BH"].ToString("N1")</b>bar</span>
|
<span><i class="fas fa-compress-arrows-alt"></i> Alimentazione</span> <span><b>@getPressData("BHA", "N1")</b> <sub>bar</sub></span>
|
||||||
</li>
|
</li>
|
||||||
<li class="list-group-item active d-flex justify-content-between align-items-center py-1">PB Bassa</li>
|
<li class="list-group-item active d-flex justify-content-between align-items-center py-1">PB Bassa</li>
|
||||||
<li class="list-group-item d-flex justify-content-between align-items-center small">
|
<li class="list-group-item d-flex justify-content-between align-items-center small">
|
||||||
<span><i class="fas fa-compress-arrows-alt"></i> Stoccaggio</span> <span><b>@currItem.PressAct["BL"].ToString("N1")</b>bar</span>
|
<span><i class="fas fa-compress-arrows-alt"></i> Stoccaggio</span> <span><b>@getPressData("BL", "N1")</b> <sub>bar</sub></span>
|
||||||
</li>
|
</li>
|
||||||
<li class="list-group-item d-flex justify-content-between align-items-center small">
|
<li class="list-group-item d-flex justify-content-between align-items-center small">
|
||||||
<span><i class="fas fa-compress-arrows-alt"></i> Alimentazione</span> <span><b>@currItem.PressAct["BL"].ToString("N1")</b>bar</span>
|
<span><i class="fas fa-compress-arrows-alt"></i> Alimentazione</span> <span><b>@getPressData("BLA", "N1")</b> <sub>bar</sub></span>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-7">
|
<div class="col-8">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-12">
|
<div class="col-12">
|
||||||
<ul class="list-group">
|
<ul class="list-group">
|
||||||
@@ -66,10 +66,10 @@
|
|||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
<li class="list-group-item d-flex justify-content-between align-items-center">
|
<li class="list-group-item d-flex justify-content-between align-items-center">
|
||||||
<span><i class="fas fa-database"></i> Livello</span> <span style="font-size:1.2em;"><b>@currItem.LevelRatio</b>%</span>
|
<span><i class="fas fa-database"></i> Livello</span> <span style="font-size:1.2em;"><b>@currItem.LevelRatio</b> <sub>%</sub></span>
|
||||||
</li>
|
</li>
|
||||||
<li class="list-group-item d-flex justify-content-between align-items-center">
|
<li class="list-group-item d-flex justify-content-between align-items-center">
|
||||||
<span><i class="fas fa-compress-arrows-alt"></i> Pressione</span> <span style="font-size:1.2em;"><b>@currItem.PressAct["Main"].ToString("N1")</b> <span class="small">bar</span></span>
|
<span><i class="fas fa-compress-arrows-alt"></i> Pressione</span> <span style="font-size:1.2em;"><b>@currItem.PressAct["Main"].ToString("N1")</b> <span class="small"> <sub>bar</sub></span></span>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -54,6 +54,11 @@ namespace GWMS.UI.Components
|
|||||||
AspectRatio = 2
|
AspectRatio = 2
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// fattore di riduzione x visualizzare meno punti (in base alla numerosità...
|
||||||
|
/// </summary>
|
||||||
|
protected int redFact = 1;
|
||||||
|
|
||||||
#endregion Protected Fields
|
#endregion Protected Fields
|
||||||
|
|
||||||
#region Private Properties
|
#region Private Properties
|
||||||
@@ -121,12 +126,26 @@ namespace GWMS.UI.Components
|
|||||||
|
|
||||||
#region Private Methods
|
#region Private Methods
|
||||||
|
|
||||||
|
private void fixRedFactor()
|
||||||
|
{
|
||||||
|
int answ = 1;
|
||||||
|
int numCount = _currItem.LevelTS.Count;
|
||||||
|
if (numCount > 200)
|
||||||
|
answ = 4;
|
||||||
|
else if (numCount > 150)
|
||||||
|
answ = 3;
|
||||||
|
else if (numCount >= 50)
|
||||||
|
answ = 2;
|
||||||
|
redFact = answ;
|
||||||
|
}
|
||||||
|
|
||||||
private LineChartDataset<double> GetLineChartDataset()
|
private LineChartDataset<double> GetLineChartDataset()
|
||||||
{
|
{
|
||||||
|
fixRedFactor();
|
||||||
var answ = new LineChartDataset<double>
|
var answ = new LineChartDataset<double>
|
||||||
{
|
{
|
||||||
//Label = "Livello",
|
//Label = "Livello",
|
||||||
Data = _currItem.LevelTS.Select(x => x.ValDouble).ToList(),
|
Data = _currItem.LevelTS.Where((cat, index) => index % redFact == 0).Select(x => x.ValDouble).ToList(),
|
||||||
BorderColor = getLineColors(1f),
|
BorderColor = getLineColors(1f),
|
||||||
Fill = true,
|
Fill = true,
|
||||||
PointRadius = 3,
|
PointRadius = 3,
|
||||||
@@ -139,7 +158,8 @@ namespace GWMS.UI.Components
|
|||||||
|
|
||||||
private List<string> GetLineChartLabels()
|
private List<string> GetLineChartLabels()
|
||||||
{
|
{
|
||||||
var answ = _currItem.LevelTS.Select(x => x.DtEvent.ToString("dd.MM HH")).ToList();
|
fixRedFactor();
|
||||||
|
var answ = _currItem.LevelTS.Where((cat, index) => index % redFact == 0).Select(x => x.DtEvent.ToString("dd.MM HH")).ToList();
|
||||||
return answ;
|
return answ;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -176,5 +196,19 @@ namespace GWMS.UI.Components
|
|||||||
}
|
}
|
||||||
|
|
||||||
#endregion Protected Methods
|
#endregion Protected Methods
|
||||||
|
|
||||||
|
#region Public Methods
|
||||||
|
|
||||||
|
public string getPressData(string valore, string formato)
|
||||||
|
{
|
||||||
|
string answ = "";
|
||||||
|
if (currItem.PressAct.ContainsKey(valore))
|
||||||
|
{
|
||||||
|
answ = currItem.PressAct[valore].ToString(formato);
|
||||||
|
}
|
||||||
|
return answ;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion Public Methods
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -179,7 +179,7 @@ namespace GWMS.UI.Controllers
|
|||||||
/// <param name="cnt"></param>
|
/// <param name="cnt"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
[HttpGet("flog/{id}")]
|
[HttpGet("flog/{id}")]
|
||||||
public string flog(string id, string flux, string valore, string dtEve, string dtCurr, string cnt)
|
public async Task<string> flog(string id, string flux, string valore, string dtEve, string dtCurr, string cnt)
|
||||||
{
|
{
|
||||||
bool fatto = false;
|
bool fatto = false;
|
||||||
// formato yyyymmddHHMMSSnnn ovvero da anno a millisecondi
|
// formato yyyymmddHHMMSSnnn ovvero da anno a millisecondi
|
||||||
@@ -247,7 +247,7 @@ namespace GWMS.UI.Controllers
|
|||||||
List<PlantLogModel> newData = new List<PlantLogModel>();
|
List<PlantLogModel> newData = new List<PlantLogModel>();
|
||||||
newData.Add(newItem);
|
newData.Add(newItem);
|
||||||
// insert!
|
// insert!
|
||||||
fatto = _DataService.PlantLogInsert(newData).Result;
|
fatto = await _DataService.PlantLogInsert(newData);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception exc)
|
catch (Exception exc)
|
||||||
@@ -272,7 +272,7 @@ namespace GWMS.UI.Controllers
|
|||||||
/// <param name="id">ID dell'IOB</param>
|
/// <param name="id">ID dell'IOB</param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
[HttpPost("flogJson/{id}")]
|
[HttpPost("flogJson/{id}")]
|
||||||
public string flogJson(string id, [FromBody] flogJsonPayload rawData)
|
public async Task<string> flogJson(string id, [FromBody] flogJsonPayload rawData)
|
||||||
{
|
{
|
||||||
bool fatto = false;
|
bool fatto = false;
|
||||||
// verifico ci sia valore
|
// verifico ci sia valore
|
||||||
@@ -285,7 +285,7 @@ namespace GWMS.UI.Controllers
|
|||||||
// conversione dati
|
// conversione dati
|
||||||
List<PlantLogModel> plData = rawData.fluxData.Select(jpl => _DataService.convertFluxToPL(currPlant.PlantId, jpl)).ToList();
|
List<PlantLogModel> plData = rawData.fluxData.Select(jpl => _DataService.convertFluxToPL(currPlant.PlantId, jpl)).ToList();
|
||||||
//insert!
|
//insert!
|
||||||
fatto = _DataService.PlantLogInsert(plData).Result;
|
fatto = await _DataService.PlantLogInsert(plData);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (fatto)
|
if (fatto)
|
||||||
|
|||||||
@@ -70,13 +70,13 @@ namespace GWMS.UI.Controllers
|
|||||||
|
|
||||||
// POST api/PlantLog
|
// POST api/PlantLog
|
||||||
[HttpPost]
|
[HttpPost]
|
||||||
public ActionResult Post([FromBody] List<PlantLogModel> newItems)
|
public async Task<ActionResult> Post([FromBody] List<PlantLogModel> newItems)
|
||||||
{
|
{
|
||||||
bool fatto = false;
|
bool fatto = false;
|
||||||
// verifico ci sia valore
|
// verifico ci sia valore
|
||||||
if (newItems != null)
|
if (newItems != null)
|
||||||
{
|
{
|
||||||
fatto = _DataService.PlantLogInsert(newItems).Result;
|
fatto = await _DataService.PlantLogInsert(newItems);
|
||||||
}
|
}
|
||||||
if (fatto)
|
if (fatto)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -394,6 +394,7 @@ namespace GWMS.UI.Data
|
|||||||
|
|
||||||
public async Task<bool> PlantLogInsert(List<PlantLogModel> newItems)
|
public async Task<bool> PlantLogInsert(List<PlantLogModel> newItems)
|
||||||
{
|
{
|
||||||
|
bool fatto = false;
|
||||||
// init valori
|
// init valori
|
||||||
int IntervalMin = 60;
|
int IntervalMin = 60;
|
||||||
int.TryParse(_configuration["IntervalMin"], out IntervalMin);
|
int.TryParse(_configuration["IntervalMin"], out IntervalMin);
|
||||||
@@ -403,7 +404,7 @@ namespace GWMS.UI.Data
|
|||||||
await updateCurrDTO(newItems);
|
await updateCurrDTO(newItems);
|
||||||
|
|
||||||
// recupero ultimi inseriti
|
// recupero ultimi inseriti
|
||||||
List<PlantLogModel> lastValues = await PlantLogGetLastByFlux(PlantId);
|
List<PlantLogModel> lastValues = PlantLogGetLastByFlux(PlantId).Result;
|
||||||
// verifico i flussi presenti tra quelli ricevuti
|
// verifico i flussi presenti tra quelli ricevuti
|
||||||
List<string> fluxList = newItems
|
List<string> fluxList = newItems
|
||||||
.GroupBy(g => g.FluxType)
|
.GroupBy(g => g.FluxType)
|
||||||
@@ -435,8 +436,19 @@ namespace GWMS.UI.Data
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// faccio vero insert
|
// se ho record da inserire...
|
||||||
return await Task.FromResult(dbController.PlantLogInsertNew(item2insert));
|
if (item2insert.Count > 0)
|
||||||
|
{
|
||||||
|
// faccio vero insert
|
||||||
|
fatto = dbController.PlantLogInsertNew(item2insert);
|
||||||
|
|
||||||
|
// invalido i vari valori in cache
|
||||||
|
await distributedCache.RemoveAsync($"DATA:PLANTS:LastFlux:{PlantId}");
|
||||||
|
await distributedCache.RemoveAsync($"DATA:PLANTS:ListDTO");
|
||||||
|
}
|
||||||
|
|
||||||
|
// restituisco
|
||||||
|
return await Task.FromResult(fatto);
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<List<PlantDTO>> PlantsGetAll()
|
public async Task<List<PlantDTO>> PlantsGetAll()
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ namespace GWMS.UI.Data
|
|||||||
{
|
{
|
||||||
#region Private Fields
|
#region Private Fields
|
||||||
|
|
||||||
private SelectData _detailFilter = SelectData.Init(5, 7);
|
private SelectData _detailFilter = SelectData.Init(5, 15);
|
||||||
private string _pageIcon;
|
private string _pageIcon;
|
||||||
private string _pageName;
|
private string _pageName;
|
||||||
private string _searchVal;
|
private string _searchVal;
|
||||||
@@ -33,8 +33,6 @@ namespace GWMS.UI.Data
|
|||||||
|
|
||||||
#region Public Properties
|
#region Public Properties
|
||||||
|
|
||||||
public SelectData DDB_Filter { get; set; } = SelectData.Init(5, 3);
|
|
||||||
|
|
||||||
public SelectData DetailFilter
|
public SelectData DetailFilter
|
||||||
{
|
{
|
||||||
get => _detailFilter;
|
get => _detailFilter;
|
||||||
@@ -52,10 +50,7 @@ namespace GWMS.UI.Data
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public SelectData KRE_Filter { get; set; } = SelectData.Init(5, 7);
|
public SelectOrderData Order_Filter { get; set; } = SelectOrderData.Init(5, 30);
|
||||||
public SelectData ODL_Filter { get; set; } = SelectData.Init(5, 7);
|
|
||||||
public SelectData OEE_Filter { get; set; } = SelectData.Init(5, 7);
|
|
||||||
public SelectOrderData Order_Filter { get; set; } = SelectOrderData.Init(5, 7);
|
|
||||||
|
|
||||||
public string PageIcon
|
public string PageIcon
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net5.0</TargetFramework>
|
<TargetFramework>net5.0</TargetFramework>
|
||||||
<Version>1.0.2108.0515</Version>
|
<Version>1.0.2108.0612</Version>
|
||||||
<UserSecretsId>95c9f021-52d1-4390-a670-5810b7b777b0</UserSecretsId>
|
<UserSecretsId>95c9f021-52d1-4390-a670-5810b7b777b0</UserSecretsId>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
|||||||
@@ -20,41 +20,7 @@
|
|||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
<div class="col-12">
|
<div class="col-12">
|
||||||
@*<div class="d-flex justify-content-between">
|
@*<SetupSim />*@
|
||||||
<div class="p-2">
|
|
||||||
<h4>Simulazione</h4>
|
|
||||||
</div>
|
|
||||||
<div class="p-2">
|
|
||||||
<div class="input-group">
|
|
||||||
<div class="input-group-prepend">
|
|
||||||
<span class="input-group-text">giorni</span>
|
|
||||||
</div>
|
|
||||||
<input @bind-value="@numDays" @bind-value:event="oninput" type="number" class="form-control" title="Giorni" />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="p-2">
|
|
||||||
<div class="input-group">
|
|
||||||
<div class="input-group-prepend">
|
|
||||||
<span class="input-group-text">step</span>
|
|
||||||
</div>
|
|
||||||
<input @bind-value="@stepMin" @bind-value:event="oninput" type="number" class="form-control" title="Step sim (minuti)" />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="p-2">
|
|
||||||
<div class="input-group">
|
|
||||||
<div class="input-group-prepend">
|
|
||||||
<span class="input-group-text">cons orario max</span>
|
|
||||||
</div>
|
|
||||||
<input @bind-value="@maxHourRate" @bind-value:event="oninput" type="number" class="form-control" title="Consumo massimo orario" />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="p-2">
|
|
||||||
<Button id="btnReset" class="btn btn-danger btn-block" Clicked="resetDB">
|
|
||||||
<span class="oi oi-reload"></span> Regen DB Data
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
</div>*@
|
|
||||||
<SetupSim />
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -268,7 +268,7 @@ namespace GWMS.UI.Pages
|
|||||||
|
|
||||||
protected List<WeekPlanModel> SlotList(DayOfWeek Giorno, int Ora)
|
protected List<WeekPlanModel> SlotList(DayOfWeek Giorno, int Ora)
|
||||||
{
|
{
|
||||||
List<WeekPlanModel> result = new();
|
List<WeekPlanModel> result = new List<WeekPlanModel>();
|
||||||
|
|
||||||
if (ListRecords != null && ListRecords.Count > 0)
|
if (ListRecords != null && ListRecords.Count > 0)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<body>
|
<body>
|
||||||
<i>GWMS - Gas Warehouse Management System</i>
|
<i>GWMS - Gas Warehouse Management System</i>
|
||||||
<h4>Versione: 1.0.2108.0515</h4>
|
<h4>Versione: 1.0.2108.0612</h4>
|
||||||
<br /> Note di rilascio:
|
<br /> Note di rilascio:
|
||||||
<ul>
|
<ul>
|
||||||
<li>
|
<li>
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
1.0.2108.0515
|
1.0.2108.0612
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<item>
|
<item>
|
||||||
<version>1.0.2108.0515</version>
|
<version>1.0.2108.0612</version>
|
||||||
<url>http://nexus.steamware.net/repository/SWS/GWMS/stable/0/GWMS.UI.zip</url>
|
<url>http://nexus.steamware.net/repository/SWS/GWMS/stable/0/GWMS.UI.zip</url>
|
||||||
<changelog>http://nexus.steamware.net/repository/SWS/GWMS/stable/0/ChangeLog.html</changelog>
|
<changelog>http://nexus.steamware.net/repository/SWS/GWMS/stable/0/ChangeLog.html</changelog>
|
||||||
<mandatory>false</mandatory>
|
<mandatory>false</mandatory>
|
||||||
|
|||||||
Reference in New Issue
Block a user