Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 9f6a74a63d | |||
| 1fa27f72ba |
@@ -125,11 +125,11 @@
|
|||||||
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
|
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\StackExchange.Redis.2.8.0\lib\net461\StackExchange.Redis.dll</HintPath>
|
<HintPath>..\packages\StackExchange.Redis.2.8.0\lib\net461\StackExchange.Redis.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="SteamWare, Version=5.4.2509.1715, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="SteamWare, Version=5.3.2311.2908, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\SteamWare.5.4.2509.1715\lib\net462\SteamWare.dll</HintPath>
|
<HintPath>..\packages\SteamWare.5.3.2311.2908\lib\net462\SteamWare.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="SteamWare.Logger, Version=5.4.2509.1715, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="SteamWare.Logger, Version=5.3.2311.2908, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\SteamWare.Logger.5.4.2509.1715\lib\net462\SteamWare.Logger.dll</HintPath>
|
<HintPath>..\packages\SteamWare.Logger.5.3.2311.2908\lib\net462\SteamWare.Logger.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
|
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
|
||||||
@@ -538,6 +538,8 @@
|
|||||||
<Content Include="Core\Compression\Zstandard\lib\linux\libzstd.so" />
|
<Content Include="Core\Compression\Zstandard\lib\linux\libzstd.so" />
|
||||||
<Content Include="Core\Compression\Snappy\lib\osx\libsnappy64.dylib" />
|
<Content Include="Core\Compression\Snappy\lib\osx\libsnappy64.dylib" />
|
||||||
<Content Include="Core\Compression\Snappy\lib\linux\libsnappy64.so" />
|
<Content Include="Core\Compression\Snappy\lib\linux\libsnappy64.so" />
|
||||||
|
<Content Include="App_Readme\SteamWare_demo\example-NLog.config" />
|
||||||
|
<Content Include="App_Readme\SteamWare_demo\example-app.config" />
|
||||||
<Content Include="Scripts\bootstrap.min.js.map" />
|
<Content Include="Scripts\bootstrap.min.js.map" />
|
||||||
<Content Include="Scripts\bootstrap.js.map" />
|
<Content Include="Scripts\bootstrap.js.map" />
|
||||||
<Content Include="Scripts\bootstrap.esm.min.js.map" />
|
<Content Include="Scripts\bootstrap.esm.min.js.map" />
|
||||||
@@ -560,8 +562,6 @@
|
|||||||
<Content Include="Content\bootstrap-grid.rtl.css.map" />
|
<Content Include="Content\bootstrap-grid.rtl.css.map" />
|
||||||
<Content Include="Content\bootstrap-grid.min.css.map" />
|
<Content Include="Content\bootstrap-grid.min.css.map" />
|
||||||
<Content Include="Content\bootstrap-grid.css.map" />
|
<Content Include="Content\bootstrap-grid.css.map" />
|
||||||
<Content Include="App_Readme\SteamWare_demo\example-NLog.config" />
|
|
||||||
<Content Include="App_Readme\SteamWare_demo\example-app.config" />
|
|
||||||
<None Include="Scripts\jquery-3.4.1.intellisense.js" />
|
<None Include="Scripts\jquery-3.4.1.intellisense.js" />
|
||||||
<Content Include="Scripts\jquery-3.4.1.js" />
|
<Content Include="Scripts\jquery-3.4.1.js" />
|
||||||
<Content Include="Scripts\jquery-3.4.1.slim.js" />
|
<Content Include="Scripts\jquery-3.4.1.slim.js" />
|
||||||
|
|||||||
@@ -34,11 +34,6 @@
|
|||||||
<asp:Label ID="Label2" runat="server" Text='<%# Eval("NumPezzi","{0:N0}") %>' CssClass="fontMedio" />
|
<asp:Label ID="Label2" runat="server" Text='<%# Eval("NumPezzi","{0:N0}") %>' CssClass="fontMedio" />
|
||||||
</ItemTemplate>
|
</ItemTemplate>
|
||||||
</asp:TemplateField>
|
</asp:TemplateField>
|
||||||
<asp:TemplateField HeaderText="PzPallet" SortExpression="PzPallet">
|
|
||||||
<ItemTemplate>
|
|
||||||
<asp:Label ID="lblPzPallet" runat="server" Text='<%# Eval("PzPallet","{0:N0}") %>' CssClass="fontMedio" />
|
|
||||||
</ItemTemplate>
|
|
||||||
</asp:TemplateField>
|
|
||||||
<asp:TemplateField HeaderText="TC Attrezzato" SortExpression="TCRichAttr">
|
<asp:TemplateField HeaderText="TC Attrezzato" SortExpression="TCRichAttr">
|
||||||
<ItemTemplate>
|
<ItemTemplate>
|
||||||
<div class='<%# "font-weight-bold fontMedio " + cssFromTempi(Eval("TCAssegnato"), Eval("TCRichAttr")) %>'>
|
<div class='<%# "font-weight-bold fontMedio " + cssFromTempi(Eval("TCAssegnato"), Eval("TCRichAttr")) %>'>
|
||||||
|
|||||||
+21
-23
@@ -1,43 +1,41 @@
|
|||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
// <auto-generated>
|
// <generato automaticamente>
|
||||||
// This code was generated by a tool.
|
// Codice generato da uno strumento.
|
||||||
//
|
//
|
||||||
// Changes to this file may cause incorrect behavior and will be lost if
|
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
|
||||||
// the code is regenerated.
|
// il codice viene rigenerato.
|
||||||
// </auto-generated>
|
// </generato automaticamente>
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
|
|
||||||
namespace MP_ADM.WebUserControls
|
namespace MP_ADM.WebUserControls {
|
||||||
{
|
|
||||||
|
|
||||||
|
public partial class mod_approvazioneODL {
|
||||||
public partial class mod_approvazioneODL
|
|
||||||
{
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// grView control.
|
/// Controllo grView.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <remarks>
|
/// <remarks>
|
||||||
/// Auto-generated field.
|
/// Campo generato automaticamente.
|
||||||
/// To modify move field declaration from designer file to code-behind file.
|
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
protected global::System.Web.UI.WebControls.GridView grView;
|
protected global::System.Web.UI.WebControls.GridView grView;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// odsTempi control.
|
/// Controllo odsTempi.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <remarks>
|
/// <remarks>
|
||||||
/// Auto-generated field.
|
/// Campo generato automaticamente.
|
||||||
/// To modify move field declaration from designer file to code-behind file.
|
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
protected global::System.Web.UI.WebControls.ObjectDataSource odsTempi;
|
protected global::System.Web.UI.WebControls.ObjectDataSource odsTempi;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// txtPageSize control.
|
/// Controllo txtPageSize.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <remarks>
|
/// <remarks>
|
||||||
/// Auto-generated field.
|
/// Campo generato automaticamente.
|
||||||
/// To modify move field declaration from designer file to code-behind file.
|
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
protected global::System.Web.UI.WebControls.TextBox txtPageSize;
|
protected global::System.Web.UI.WebControls.TextBox txtPageSize;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -46,8 +46,8 @@
|
|||||||
<package id="SharpCompress" version="0.38.0" targetFramework="net462" />
|
<package id="SharpCompress" version="0.38.0" targetFramework="net462" />
|
||||||
<package id="SharpZipLib" version="1.4.2" targetFramework="net462" />
|
<package id="SharpZipLib" version="1.4.2" targetFramework="net462" />
|
||||||
<package id="StackExchange.Redis" version="2.8.0" targetFramework="net462" />
|
<package id="StackExchange.Redis" version="2.8.0" targetFramework="net462" />
|
||||||
<package id="SteamWare" version="5.4.2509.1715" targetFramework="net462" />
|
<package id="SteamWare" version="5.3.2311.2908" targetFramework="net462" />
|
||||||
<package id="SteamWare.Logger" version="5.4.2509.1715" targetFramework="net462" />
|
<package id="SteamWare.Logger" version="5.3.2311.2908" targetFramework="net462" />
|
||||||
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
|
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
|
||||||
<package id="System.Configuration.ConfigurationManager" version="8.0.0" targetFramework="net462" />
|
<package id="System.Configuration.ConfigurationManager" version="8.0.0" targetFramework="net462" />
|
||||||
<package id="System.Diagnostics.PerformanceCounter" version="8.0.0" targetFramework="net462" />
|
<package id="System.Diagnostics.PerformanceCounter" version="8.0.0" targetFramework="net462" />
|
||||||
|
|||||||
+293
-309
@@ -4,318 +4,302 @@ using System;
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
using System.Web.Mvc;
|
using System.Web.Mvc;
|
||||||
using MP_IO.Interfaces;
|
|
||||||
|
|
||||||
namespace MP_IO.Controllers
|
namespace MP_IO.Controllers
|
||||||
{
|
{
|
||||||
public class BENCHController : Controller, IBENCHService
|
public class BENCHController : Controller
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Oggetto datalayer specifico
|
||||||
|
/// </summary>
|
||||||
|
DataLayer DataLayerObj = new DataLayer();
|
||||||
|
|
||||||
|
// GET: IOB (è un check alive)
|
||||||
|
public string Index()
|
||||||
{
|
{
|
||||||
#region Public Methods
|
return "OK";
|
||||||
|
|
||||||
// GET BENCH/CNTKEY/test
|
|
||||||
public string CNTKEY(string id)
|
|
||||||
{
|
|
||||||
string answ = "ND";
|
|
||||||
if (id == null) id = "";
|
|
||||||
Stopwatch stopWatch = new Stopwatch();
|
|
||||||
stopWatch.Start();
|
|
||||||
// conto quanti oggetti ho in memoria REDIS...
|
|
||||||
string groupHash = ""; // DataLayer.mHash("");
|
|
||||||
if (id.Length > 0)
|
|
||||||
{
|
|
||||||
groupHash += id + ":";
|
|
||||||
}
|
|
||||||
groupHash += "*";
|
|
||||||
answ = string.Format("Trovate {0} Hash per {1}", memLayer.ML.redCountKey(groupHash), groupHash);
|
|
||||||
stopWatch.Stop();
|
|
||||||
// Get the elapsed time as a TimeSpan value.
|
|
||||||
TimeSpan ts = stopWatch.Elapsed;
|
|
||||||
// accodo tempo!
|
|
||||||
answ += string.Format("<hr/>Elapsed: {0}ms", ts.TotalMilliseconds);
|
|
||||||
// ritorno
|
|
||||||
return answ;
|
|
||||||
}
|
|
||||||
|
|
||||||
// GET BENCH/DTMAC/SIMUL_01
|
|
||||||
public string DTMAC(string id)
|
|
||||||
{
|
|
||||||
string answ = "ND";
|
|
||||||
Stopwatch stopWatch = new Stopwatch();
|
|
||||||
stopWatch.Start();
|
|
||||||
// se id nullo --> KO!
|
|
||||||
if (id == null)
|
|
||||||
{
|
|
||||||
answ = "KO";
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
answ = "";
|
|
||||||
try
|
|
||||||
{
|
|
||||||
Dictionary<string, string> valori = DataLayerObj.mDatiMacchine(id);
|
|
||||||
foreach (var item in valori)
|
|
||||||
{
|
|
||||||
answ += string.Format("{0}|{1}<br/>", item.Key, item.Value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch
|
|
||||||
{ }
|
|
||||||
}
|
|
||||||
stopWatch.Stop();
|
|
||||||
// Get the elapsed time as a TimeSpan value.
|
|
||||||
TimeSpan ts = stopWatch.Elapsed;
|
|
||||||
// accodo tempo!
|
|
||||||
answ += string.Format("<hr/>Elapsed: {0}ms", ts.TotalMilliseconds);
|
|
||||||
// ritorno
|
|
||||||
return answ;
|
|
||||||
}
|
|
||||||
|
|
||||||
// GET BENCH/fSMI/18?idxMS=1&valore=1
|
|
||||||
public string fSMI(int? id, int? idxMS, int? valore)
|
|
||||||
{
|
|
||||||
string answ = "ND";
|
|
||||||
Stopwatch stopWatch = new Stopwatch();
|
|
||||||
stopWatch.Start();
|
|
||||||
// se id nullo --> KO!
|
|
||||||
if (id == null)
|
|
||||||
{
|
|
||||||
answ = "KO";
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// recupero dati x sapere quale famiglia SMI è necessaria e quale stato / segnale si sia ricevuto
|
|
||||||
int idxFamIn = Convert.ToInt32(id);
|
|
||||||
int idxMicroStato = Convert.ToInt32(idxMS);
|
|
||||||
int valIOB = Convert.ToInt32(valore);
|
|
||||||
// recupero microstato macchina da chiave relativa
|
|
||||||
answ = "";
|
|
||||||
try
|
|
||||||
{
|
|
||||||
// verifico se ci sia in memoria tab della fam macchina relativa (sennò carico)
|
|
||||||
string fiHASH = DataLayer.hSMI(idxFamIn);
|
|
||||||
string outVal = "";
|
|
||||||
bool trovato = memLayer.ML.redHashPresentSz(fiHASH);
|
|
||||||
if (!trovato)
|
|
||||||
{
|
|
||||||
// ricarico tabella!
|
|
||||||
KeyValuePair<string, string>[] valori = DataLayerObj.mTabSMI(idxFamIn);
|
|
||||||
answ = string.Format("Ricaricata SMI per famiglia {0}<br/>", fiHASH);
|
|
||||||
}
|
|
||||||
answ += string.Format("Trovata {0} Hash per {1}<br />", memLayer.ML.redCountKey(fiHASH), fiHASH);
|
|
||||||
// recupero singolo valore (stringa) x chiave
|
|
||||||
outVal = DataLayerObj.valoreSMI(idxFamIn, idxMicroStato, valIOB);
|
|
||||||
// mostro output
|
|
||||||
answ += string.Format("idxFamIN: {0} | idxMS: {1} | valIOB: {2} | out: {3} <br/>", idxFamIn, idxMicroStato, valIOB, outVal);
|
|
||||||
}
|
|
||||||
catch
|
|
||||||
{ }
|
|
||||||
}
|
|
||||||
stopWatch.Stop();
|
|
||||||
// Get the elapsed time as a TimeSpan value.
|
|
||||||
TimeSpan ts = stopWatch.Elapsed;
|
|
||||||
// accodo tempo!
|
|
||||||
answ += string.Format("<hr/>Total Time Elapsed: {0}ms", ts.TotalMilliseconds);
|
|
||||||
// ritorno
|
|
||||||
return answ;
|
|
||||||
}
|
|
||||||
|
|
||||||
// GET: IOB (è un check alive)
|
|
||||||
public string Index()
|
|
||||||
{
|
|
||||||
return "OK";
|
|
||||||
}
|
|
||||||
|
|
||||||
// GET BENCH/INSEN/2004
|
|
||||||
public string INSEN(string id)
|
|
||||||
{
|
|
||||||
string answ = "ND";
|
|
||||||
Stopwatch stopWatch = new Stopwatch();
|
|
||||||
stopWatch.Start();
|
|
||||||
// se id nullo --> KO!
|
|
||||||
if (id == null)
|
|
||||||
{
|
|
||||||
answ = "KO";
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// recupero microstato macchina da chiave relativa
|
|
||||||
answ = "";
|
|
||||||
try
|
|
||||||
{
|
|
||||||
answ += string.Format("Macchina {0}, insEnabled {1}<br />", id, DataLayerObj.insEnab(id));
|
|
||||||
}
|
|
||||||
catch
|
|
||||||
{ }
|
|
||||||
}
|
|
||||||
stopWatch.Stop();
|
|
||||||
// Get the elapsed time as a TimeSpan value.
|
|
||||||
TimeSpan ts = stopWatch.Elapsed;
|
|
||||||
// accodo tempo!
|
|
||||||
answ += string.Format("<hr/>Total Time Elapsed: {0}ms", ts.TotalMilliseconds);
|
|
||||||
// ritorno
|
|
||||||
return answ;
|
|
||||||
}
|
|
||||||
|
|
||||||
// GET BENCH/RCLEAN/100
|
|
||||||
public string RCLEAN(int? id)
|
|
||||||
{
|
|
||||||
string answ = "ND";
|
|
||||||
Stopwatch stopWatch = new Stopwatch();
|
|
||||||
stopWatch.Start();
|
|
||||||
// se id nullo --> KO!
|
|
||||||
if (id == null)
|
|
||||||
{
|
|
||||||
answ = "KO";
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
string chiave;
|
|
||||||
KeyValuePair<string, string>[] valori = new KeyValuePair<string, string>[2];
|
|
||||||
try
|
|
||||||
{
|
|
||||||
// svuoto i precedenti hash... CICLO!
|
|
||||||
for (int i = 0; i < id; i++)
|
|
||||||
{
|
|
||||||
chiave = string.Format("test:{0}", i);
|
|
||||||
memLayer.ML.redDelKey(chiave);
|
|
||||||
}
|
|
||||||
answ = "OK";
|
|
||||||
}
|
|
||||||
catch
|
|
||||||
{ }
|
|
||||||
}
|
|
||||||
stopWatch.Stop();
|
|
||||||
// Get the elapsed time as a TimeSpan value.
|
|
||||||
TimeSpan ts = stopWatch.Elapsed;
|
|
||||||
// accodo tempo!
|
|
||||||
answ += string.Format("<hr/>Elapsed: {0}ms", ts.TotalMilliseconds);
|
|
||||||
// ritorno
|
|
||||||
return answ;
|
|
||||||
}
|
|
||||||
|
|
||||||
// GET BENCH/RSETUP/100
|
|
||||||
public string RSETUP(int? id)
|
|
||||||
{
|
|
||||||
string answ = "ND";
|
|
||||||
Stopwatch stopWatch = new Stopwatch();
|
|
||||||
stopWatch.Start();
|
|
||||||
// se id nullo --> KO!
|
|
||||||
if (id == null)
|
|
||||||
{
|
|
||||||
answ = "KO";
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
string chiave;
|
|
||||||
KeyValuePair<string, string>[] valori = new KeyValuePair<string, string>[2];
|
|
||||||
try
|
|
||||||
{
|
|
||||||
// salvo il datasetet come insieme di hash in redis...
|
|
||||||
for (int i = 0; i < id; i++)
|
|
||||||
{
|
|
||||||
chiave = string.Format("test:{0}", i);
|
|
||||||
valori[0] = new KeyValuePair<string, string>("numero", i.ToString());
|
|
||||||
valori[1] = new KeyValuePair<string, string>("doppio", (i * 2).ToString());
|
|
||||||
memLayer.ML.redSaveHash(chiave, valori);
|
|
||||||
}
|
|
||||||
answ = "OK";
|
|
||||||
}
|
|
||||||
catch
|
|
||||||
{ }
|
|
||||||
}
|
|
||||||
stopWatch.Stop();
|
|
||||||
// Get the elapsed time as a TimeSpan value.
|
|
||||||
TimeSpan ts = stopWatch.Elapsed;
|
|
||||||
// accodo tempo!
|
|
||||||
answ += string.Format("<hr/>Elapsed: {0}ms", ts.TotalMilliseconds);
|
|
||||||
// ritorno
|
|
||||||
return answ;
|
|
||||||
}
|
|
||||||
|
|
||||||
// GET BENCH/RSH/100
|
|
||||||
public string RSH(int? id)
|
|
||||||
{
|
|
||||||
string answ = "ND";
|
|
||||||
Stopwatch stopWatch = new Stopwatch();
|
|
||||||
stopWatch.Start();
|
|
||||||
// se id nullo --> KO!
|
|
||||||
if (id == null)
|
|
||||||
{
|
|
||||||
answ = "KO";
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
answ = "";
|
|
||||||
string chiave;
|
|
||||||
KeyValuePair<string, string>[] valori = new KeyValuePair<string, string>[2];
|
|
||||||
try
|
|
||||||
{
|
|
||||||
// ora restituisco record completo dell'hash con ID indicato
|
|
||||||
chiave = string.Format("test:{0}", id);
|
|
||||||
valori = memLayer.ML.redGetHash(chiave);
|
|
||||||
foreach (var item in valori)
|
|
||||||
{
|
|
||||||
answ += string.Format("{0}|{1}<br/>", item.Key, item.Value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch
|
|
||||||
{ }
|
|
||||||
}
|
|
||||||
stopWatch.Stop();
|
|
||||||
// Get the elapsed time as a TimeSpan value.
|
|
||||||
TimeSpan ts = stopWatch.Elapsed;
|
|
||||||
// accodo tempo!
|
|
||||||
answ += string.Format("<hr/>Elapsed: {0}ms", ts.TotalMilliseconds);
|
|
||||||
// ritorno
|
|
||||||
return answ;
|
|
||||||
}
|
|
||||||
|
|
||||||
// GET BENCH/tSMI/60
|
|
||||||
public string tSMI(int? id)
|
|
||||||
{
|
|
||||||
string answ = "ND";
|
|
||||||
long splitTime = 0;
|
|
||||||
Stopwatch stopWatch = new Stopwatch();
|
|
||||||
stopWatch.Start();
|
|
||||||
// se id nullo --> KO!
|
|
||||||
if (id == null)
|
|
||||||
{
|
|
||||||
answ = "KO";
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
int idxFamIn = Convert.ToInt32(id);
|
|
||||||
answ = "";
|
|
||||||
try
|
|
||||||
{
|
|
||||||
KeyValuePair<string, string>[] valori = DataLayerObj.mTabSMI(idxFamIn);
|
|
||||||
splitTime = stopWatch.ElapsedMilliseconds;
|
|
||||||
foreach (var item in valori)
|
|
||||||
{
|
|
||||||
answ += string.Format("{0}|{1}<br/>", item.Key, item.Value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch
|
|
||||||
{ }
|
|
||||||
}
|
|
||||||
stopWatch.Stop();
|
|
||||||
// Get the elapsed time as a TimeSpan value.
|
|
||||||
TimeSpan ts = stopWatch.Elapsed;
|
|
||||||
// accodo tempo!
|
|
||||||
answ += string.Format("<hr/>ReadTime: {0}ms<br>Total Time Elapsed: {1}ms", splitTime, ts.TotalMilliseconds);
|
|
||||||
// ritorno
|
|
||||||
return answ;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion Public Methods
|
|
||||||
|
|
||||||
#region Private Fields
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Oggetto datalayer specifico
|
|
||||||
/// </summary>
|
|
||||||
private DataLayer DataLayerObj = new DataLayer();
|
|
||||||
|
|
||||||
#endregion Private Fields
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GET BENCH/RCLEAN/100
|
||||||
|
public string RCLEAN(int? id)
|
||||||
|
{
|
||||||
|
string answ = "ND";
|
||||||
|
Stopwatch stopWatch = new Stopwatch();
|
||||||
|
stopWatch.Start();
|
||||||
|
// se id nullo --> KO!
|
||||||
|
if (id == null)
|
||||||
|
{
|
||||||
|
answ = "KO";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
string chiave;
|
||||||
|
KeyValuePair<string, string>[] valori = new KeyValuePair<string, string>[2];
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// svuoto i precedenti hash... CICLO!
|
||||||
|
for (int i = 0; i < id; i++)
|
||||||
|
{
|
||||||
|
chiave = string.Format("test:{0}", i);
|
||||||
|
memLayer.ML.redDelKey(chiave);
|
||||||
|
}
|
||||||
|
answ = "OK";
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{ }
|
||||||
|
}
|
||||||
|
stopWatch.Stop();
|
||||||
|
// Get the elapsed time as a TimeSpan value.
|
||||||
|
TimeSpan ts = stopWatch.Elapsed;
|
||||||
|
// accodo tempo!
|
||||||
|
answ += string.Format("<hr/>Elapsed: {0}ms", ts.TotalMilliseconds);
|
||||||
|
// ritorno
|
||||||
|
return answ;
|
||||||
|
}
|
||||||
|
// GET BENCH/RSETUP/100
|
||||||
|
public string RSETUP(int? id)
|
||||||
|
{
|
||||||
|
string answ = "ND";
|
||||||
|
Stopwatch stopWatch = new Stopwatch();
|
||||||
|
stopWatch.Start();
|
||||||
|
// se id nullo --> KO!
|
||||||
|
if (id == null)
|
||||||
|
{
|
||||||
|
answ = "KO";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
string chiave;
|
||||||
|
KeyValuePair<string, string>[] valori = new KeyValuePair<string, string>[2];
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// salvo il datasetet come insieme di hash in redis...
|
||||||
|
for (int i = 0; i < id; i++)
|
||||||
|
{
|
||||||
|
chiave = string.Format("test:{0}", i);
|
||||||
|
valori[0] = new KeyValuePair<string, string>("numero", i.ToString());
|
||||||
|
valori[1] = new KeyValuePair<string, string>("doppio", (i * 2).ToString());
|
||||||
|
memLayer.ML.redSaveHash(chiave, valori);
|
||||||
|
}
|
||||||
|
answ = "OK";
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{ }
|
||||||
|
}
|
||||||
|
stopWatch.Stop();
|
||||||
|
// Get the elapsed time as a TimeSpan value.
|
||||||
|
TimeSpan ts = stopWatch.Elapsed;
|
||||||
|
// accodo tempo!
|
||||||
|
answ += string.Format("<hr/>Elapsed: {0}ms", ts.TotalMilliseconds);
|
||||||
|
// ritorno
|
||||||
|
return answ;
|
||||||
|
}
|
||||||
|
// GET BENCH/RSH/100
|
||||||
|
public string RSH(int? id)
|
||||||
|
{
|
||||||
|
string answ = "ND";
|
||||||
|
Stopwatch stopWatch = new Stopwatch();
|
||||||
|
stopWatch.Start();
|
||||||
|
// se id nullo --> KO!
|
||||||
|
if (id == null)
|
||||||
|
{
|
||||||
|
answ = "KO";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
answ = "";
|
||||||
|
string chiave;
|
||||||
|
KeyValuePair<string, string>[] valori = new KeyValuePair<string, string>[2];
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// ora restituisco record completo dell'hash con ID indicato
|
||||||
|
chiave = string.Format("test:{0}", id);
|
||||||
|
valori = memLayer.ML.redGetHash(chiave);
|
||||||
|
foreach (var item in valori)
|
||||||
|
{
|
||||||
|
answ += string.Format("{0}|{1}<br/>", item.Key, item.Value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{ }
|
||||||
|
}
|
||||||
|
stopWatch.Stop();
|
||||||
|
// Get the elapsed time as a TimeSpan value.
|
||||||
|
TimeSpan ts = stopWatch.Elapsed;
|
||||||
|
// accodo tempo!
|
||||||
|
answ += string.Format("<hr/>Elapsed: {0}ms", ts.TotalMilliseconds);
|
||||||
|
// ritorno
|
||||||
|
return answ;
|
||||||
|
}
|
||||||
|
// GET BENCH/DTMAC/SIMUL_01
|
||||||
|
public string DTMAC(string id)
|
||||||
|
{
|
||||||
|
string answ = "ND";
|
||||||
|
Stopwatch stopWatch = new Stopwatch();
|
||||||
|
stopWatch.Start();
|
||||||
|
// se id nullo --> KO!
|
||||||
|
if (id == null)
|
||||||
|
{
|
||||||
|
answ = "KO";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
answ = "";
|
||||||
|
try
|
||||||
|
{
|
||||||
|
Dictionary<string, string> valori = DataLayerObj.mDatiMacchine(id);
|
||||||
|
foreach (var item in valori)
|
||||||
|
{
|
||||||
|
answ += string.Format("{0}|{1}<br/>", item.Key, item.Value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{ }
|
||||||
|
}
|
||||||
|
stopWatch.Stop();
|
||||||
|
// Get the elapsed time as a TimeSpan value.
|
||||||
|
TimeSpan ts = stopWatch.Elapsed;
|
||||||
|
// accodo tempo!
|
||||||
|
answ += string.Format("<hr/>Elapsed: {0}ms", ts.TotalMilliseconds);
|
||||||
|
// ritorno
|
||||||
|
return answ;
|
||||||
|
}
|
||||||
|
// GET BENCH/CNTKEY/test
|
||||||
|
public string CNTKEY(string id)
|
||||||
|
{
|
||||||
|
string answ = "ND";
|
||||||
|
if (id == null) id = "";
|
||||||
|
Stopwatch stopWatch = new Stopwatch();
|
||||||
|
stopWatch.Start();
|
||||||
|
// conto quanti oggetti ho in memoria REDIS...
|
||||||
|
string groupHash = ""; // DataLayer.mHash("");
|
||||||
|
if (id.Length > 0)
|
||||||
|
{
|
||||||
|
groupHash += id + ":";
|
||||||
|
}
|
||||||
|
groupHash += "*";
|
||||||
|
answ = string.Format("Trovate {0} Hash per {1}", memLayer.ML.redCountKey(groupHash), groupHash);
|
||||||
|
stopWatch.Stop();
|
||||||
|
// Get the elapsed time as a TimeSpan value.
|
||||||
|
TimeSpan ts = stopWatch.Elapsed;
|
||||||
|
// accodo tempo!
|
||||||
|
answ += string.Format("<hr/>Elapsed: {0}ms", ts.TotalMilliseconds);
|
||||||
|
// ritorno
|
||||||
|
return answ;
|
||||||
|
}
|
||||||
|
// GET BENCH/tSMI/60
|
||||||
|
public string tSMI(int? id)
|
||||||
|
{
|
||||||
|
string answ = "ND";
|
||||||
|
long splitTime = 0;
|
||||||
|
Stopwatch stopWatch = new Stopwatch();
|
||||||
|
stopWatch.Start();
|
||||||
|
// se id nullo --> KO!
|
||||||
|
if (id == null)
|
||||||
|
{
|
||||||
|
answ = "KO";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
int idxFamIn = Convert.ToInt32(id);
|
||||||
|
answ = "";
|
||||||
|
try
|
||||||
|
{
|
||||||
|
KeyValuePair<string, string>[] valori = DataLayerObj.mTabSMI(idxFamIn);
|
||||||
|
splitTime = stopWatch.ElapsedMilliseconds;
|
||||||
|
foreach (var item in valori)
|
||||||
|
{
|
||||||
|
answ += string.Format("{0}|{1}<br/>", item.Key, item.Value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{ }
|
||||||
|
}
|
||||||
|
stopWatch.Stop();
|
||||||
|
// Get the elapsed time as a TimeSpan value.
|
||||||
|
TimeSpan ts = stopWatch.Elapsed;
|
||||||
|
// accodo tempo!
|
||||||
|
answ += string.Format("<hr/>ReadTime: {0}ms<br>Total Time Elapsed: {1}ms", splitTime, ts.TotalMilliseconds);
|
||||||
|
// ritorno
|
||||||
|
return answ;
|
||||||
|
}
|
||||||
|
// GET BENCH/fSMI/18?idxMS=1&valore=1
|
||||||
|
public string fSMI(int? id, int? idxMS, int? valore)
|
||||||
|
{
|
||||||
|
string answ = "ND";
|
||||||
|
Stopwatch stopWatch = new Stopwatch();
|
||||||
|
stopWatch.Start();
|
||||||
|
// se id nullo --> KO!
|
||||||
|
if (id == null)
|
||||||
|
{
|
||||||
|
answ = "KO";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// recupero dati x sapere quale famiglia SMI è necessaria e quale stato / segnale si sia ricevuto
|
||||||
|
int idxFamIn = Convert.ToInt32(id);
|
||||||
|
int idxMicroStato = Convert.ToInt32(idxMS);
|
||||||
|
int valIOB = Convert.ToInt32(valore);
|
||||||
|
// recupero microstato macchina da chiave relativa
|
||||||
|
answ = "";
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// verifico se ci sia in memoria tab della fam macchina relativa (sennò carico)
|
||||||
|
string fiHASH = DataLayer.hSMI(idxFamIn);
|
||||||
|
string outVal = "";
|
||||||
|
bool trovato = memLayer.ML.redHashPresentSz(fiHASH);
|
||||||
|
if (!trovato)
|
||||||
|
{
|
||||||
|
// ricarico tabella!
|
||||||
|
KeyValuePair<string, string>[] valori = DataLayerObj.mTabSMI(idxFamIn);
|
||||||
|
answ = string.Format("Ricaricata SMI per famiglia {0}<br/>", fiHASH);
|
||||||
|
}
|
||||||
|
answ += string.Format("Trovata {0} Hash per {1}<br />", memLayer.ML.redCountKey(fiHASH), fiHASH);
|
||||||
|
// recupero singolo valore (stringa) x chiave
|
||||||
|
outVal = DataLayerObj.valoreSMI(idxFamIn, idxMicroStato, valIOB);
|
||||||
|
// mostro output
|
||||||
|
answ += string.Format("idxFamIN: {0} | idxMS: {1} | valIOB: {2} | out: {3} <br/>", idxFamIn, idxMicroStato, valIOB, outVal);
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{ }
|
||||||
|
}
|
||||||
|
stopWatch.Stop();
|
||||||
|
// Get the elapsed time as a TimeSpan value.
|
||||||
|
TimeSpan ts = stopWatch.Elapsed;
|
||||||
|
// accodo tempo!
|
||||||
|
answ += string.Format("<hr/>Total Time Elapsed: {0}ms", ts.TotalMilliseconds);
|
||||||
|
// ritorno
|
||||||
|
return answ;
|
||||||
|
}
|
||||||
|
// GET BENCH/INSEN/2004
|
||||||
|
public string INSEN(string id)
|
||||||
|
{
|
||||||
|
string answ = "ND";
|
||||||
|
Stopwatch stopWatch = new Stopwatch();
|
||||||
|
stopWatch.Start();
|
||||||
|
// se id nullo --> KO!
|
||||||
|
if (id == null)
|
||||||
|
{
|
||||||
|
answ = "KO";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// recupero microstato macchina da chiave relativa
|
||||||
|
answ = "";
|
||||||
|
try
|
||||||
|
{
|
||||||
|
answ += string.Format("Macchina {0}, insEnabled {1}<br />", id, DataLayerObj.insEnab(id));
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{ }
|
||||||
|
}
|
||||||
|
stopWatch.Stop();
|
||||||
|
// Get the elapsed time as a TimeSpan value.
|
||||||
|
TimeSpan ts = stopWatch.Elapsed;
|
||||||
|
// accodo tempo!
|
||||||
|
answ += string.Format("<hr/>Total Time Elapsed: {0}ms", ts.TotalMilliseconds);
|
||||||
|
// ritorno
|
||||||
|
return answ;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,4 @@
|
|||||||
using MP_IO.Interfaces;
|
using System;
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Web;
|
using System.Web;
|
||||||
@@ -7,7 +6,7 @@ using System.Web.Mvc;
|
|||||||
|
|
||||||
namespace MP_IO.Controllers
|
namespace MP_IO.Controllers
|
||||||
{
|
{
|
||||||
public class HomeController : Controller, IHomeService
|
public class HomeController : Controller
|
||||||
{
|
{
|
||||||
#region Public Methods
|
#region Public Methods
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
using MagData;
|
using MagData;
|
||||||
using MapoDb;
|
using MapoDb;
|
||||||
using MapoSDK;
|
using MapoSDK;
|
||||||
using MP_IO.Interfaces;
|
|
||||||
using Newtonsoft.Json;
|
using Newtonsoft.Json;
|
||||||
using StackExchange.Redis;
|
using StackExchange.Redis;
|
||||||
using SteamWare;
|
using SteamWare;
|
||||||
@@ -14,7 +13,7 @@ using System.Web.Mvc;
|
|||||||
|
|
||||||
namespace MP_IO.Controllers
|
namespace MP_IO.Controllers
|
||||||
{
|
{
|
||||||
public class IOBController : Controller, IIOBService
|
public class IOBController : Controller
|
||||||
{
|
{
|
||||||
#region Public Methods
|
#region Public Methods
|
||||||
|
|
||||||
@@ -208,7 +207,9 @@ namespace MP_IO.Controllers
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
answ = DataLayerMan.insEnab(id) ? "OK" : "NO";
|
DataLayer DataLayerObj = new DataLayer();
|
||||||
|
// salvo risposta!
|
||||||
|
answ = DataLayerObj.insEnab(id) ? "OK" : "NO";
|
||||||
// 2025.03.04 aggiunto keepalive x evitare C101
|
// 2025.03.04 aggiunto keepalive x evitare C101
|
||||||
MapoDb.MapoDb connDb = new MapoDb.MapoDb();
|
MapoDb.MapoDb connDb = new MapoDb.MapoDb();
|
||||||
connDb.scriviKeepAlive(id, DateTime.Now);
|
connDb.scriviKeepAlive(id, DateTime.Now);
|
||||||
@@ -454,6 +455,24 @@ namespace MP_IO.Controllers
|
|||||||
return answ;
|
return answ;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if false
|
||||||
|
/// <summary>
|
||||||
|
/// Invio record flog secco
|
||||||
|
/// GET: IOB/flog/SIMUL_03?flux=PROG&valore=P0001&dtEve=20161223180600000&dtCurr=20161223180600000&cnt=999
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="id">IdxMacchina</param>
|
||||||
|
/// <param name="flux">CodFlux</param>
|
||||||
|
/// <param name="valore">Valore da registrare</param>
|
||||||
|
/// <param name="dtEve">DataOra evento (IOB time)</param>
|
||||||
|
/// <param name="dtCurr">DataOra corrente (IOB time)</param>
|
||||||
|
/// <param name="cnt">Contatore eventi (IOB)</param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public string flog(string id, string flux, string valore, string dtEve, string dtCurr, string cnt)
|
||||||
|
{
|
||||||
|
return flog(id, flux, valore, dtEve, dtCurr, cnt, "false");
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Invio record flog secco
|
/// Invio record flog secco
|
||||||
/// GET: IOB/flog/SIMUL_03?flux=PROG&valore=P0001&dtEve=20161223180600000&dtCurr=20161223180600000&cnt=999&disabKA=false
|
/// GET: IOB/flog/SIMUL_03?flux=PROG&valore=P0001&dtEve=20161223180600000&dtCurr=20161223180600000&cnt=999&disabKA=false
|
||||||
@@ -497,6 +516,37 @@ namespace MP_IO.Controllers
|
|||||||
return answ;
|
return answ;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if false
|
||||||
|
/// <summary>
|
||||||
|
/// Processa una chiamata POST per l'invio di un array Json di oggetti fluxLog
|
||||||
|
/// PUT: IOB/flogJson/SIMUL_03
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="id">ID dell'IOB</param>
|
||||||
|
/// <returns></returns>
|
||||||
|
[HttpPost]
|
||||||
|
public string flogJson(string id)
|
||||||
|
{
|
||||||
|
int insDone = 0;
|
||||||
|
string answ = "-";
|
||||||
|
// questa classe è derivata da Controller.Response... x cui recupero lo stream in altro modo...
|
||||||
|
string content = "";
|
||||||
|
System.Web.HttpContext.Current.Request.InputStream.Position = 0;
|
||||||
|
using (var reader = new StreamReader(
|
||||||
|
Request.InputStream, System.Text.Encoding.UTF8, true, 4096, true))
|
||||||
|
{
|
||||||
|
content = reader.ReadToEnd();
|
||||||
|
}
|
||||||
|
//Rest
|
||||||
|
System.Web.HttpContext.Current.Request.InputStream.Position = 0;
|
||||||
|
// se ho dati...
|
||||||
|
if (content != "")
|
||||||
|
{
|
||||||
|
answ = processFLogJson(id, false, insDone, answ, content);
|
||||||
|
}
|
||||||
|
return answ;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Processa una chiamata POST per l'invio di un array Json di oggetti fluxLog
|
/// Processa una chiamata POST per l'invio di un array Json di oggetti fluxLog
|
||||||
/// PUT: IOB/flogJson/SIMUL_03
|
/// PUT: IOB/flogJson/SIMUL_03
|
||||||
@@ -2596,12 +2646,6 @@ namespace MP_IO.Controllers
|
|||||||
|
|
||||||
#endregion Public Methods
|
#endregion Public Methods
|
||||||
|
|
||||||
#region Protected Fields
|
|
||||||
|
|
||||||
protected static DataLayer DataLayerMan = new DataLayer();
|
|
||||||
|
|
||||||
#endregion Protected Fields
|
|
||||||
|
|
||||||
#region Private Methods
|
#region Private Methods
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -2680,7 +2724,6 @@ namespace MP_IO.Controllers
|
|||||||
answ = "NO";
|
answ = "NO";
|
||||||
}
|
}
|
||||||
// leggo parametri correnti...
|
// leggo parametri correnti...
|
||||||
DateTime adesso = DateTime.Now;
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
List<objItem> currParams = DataLayerObj.getCurrObjItems(id);
|
List<objItem> currParams = DataLayerObj.getCurrObjItems(id);
|
||||||
@@ -2696,23 +2739,14 @@ namespace MP_IO.Controllers
|
|||||||
{
|
{
|
||||||
// aggiorno valore e data
|
// aggiorno valore e data
|
||||||
trovato.value = item.valore;
|
trovato.value = item.valore;
|
||||||
trovato.lastRead = adesso;
|
trovato.lastRead = DateTime.Now;
|
||||||
trovato.lastMessage = item.valore;
|
// se fosse un valore WRITE e mi ha dato un valore vuoto --> mando
|
||||||
// se fosse un valore WRITE
|
// un fix x riscrittura
|
||||||
if (trovato.writable)
|
if (trovato.writable && string.IsNullOrEmpty(item.valore))
|
||||||
{
|
{
|
||||||
// ...e mi ha dato un valore vuoto --> mando un fix x riscrittura
|
logger.lg.scriviLog($"flogJson | verifica parametri | {trovato.uid} | reqVal: {trovato.reqValue}");
|
||||||
if (string.IsNullOrEmpty(item.valore))
|
taskType currTask = (taskType)Enum.Parse(typeof(taskType), trovato.uid);
|
||||||
{
|
DataLayerObj.addCheckTask4Machine(id, currTask, item.valore);
|
||||||
logger.lg.scriviLog($"flogJson | verifica parametri | {trovato.uid} | reqVal: {trovato.reqValue}");
|
|
||||||
taskType currTask = (taskType)Enum.Parse(typeof(taskType), trovato.uid);
|
|
||||||
DataLayerObj.addCheckTask4Machine(id, currTask, item.valore);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// richiesto 10 sec prima...
|
|
||||||
trovato.lastRequest = adesso.AddSeconds(-10);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// altrimenti AGGIUNGO (READ ONLY)...
|
// altrimenti AGGIUNGO (READ ONLY)...
|
||||||
@@ -2723,8 +2757,7 @@ namespace MP_IO.Controllers
|
|||||||
uid = item.flux,
|
uid = item.flux,
|
||||||
name = item.flux,
|
name = item.flux,
|
||||||
value = item.valore,
|
value = item.valore,
|
||||||
lastRead = adesso,
|
lastRead = DateTime.Now,
|
||||||
lastRequest = adesso.AddSeconds(-10),
|
|
||||||
writable = false
|
writable = false
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -2733,11 +2766,10 @@ namespace MP_IO.Controllers
|
|||||||
}
|
}
|
||||||
// faccio upsert innovations!
|
// faccio upsert innovations!
|
||||||
DataLayerObj.upsertCurrObjItems(id, innovazioni);
|
DataLayerObj.upsertCurrObjItems(id, innovazioni);
|
||||||
logger.lg.scriviLog($"processFLogJson | {id} | Updated {innovazioni.Count} par");
|
|
||||||
}
|
}
|
||||||
catch (Exception exc)
|
catch (Exception exc)
|
||||||
{
|
{
|
||||||
logger.lg.scriviLog($"Errore in fase salvataggio innovazioni parametri correnti da flogJson{Environment.NewLine}{exc}", tipoLog.EXCEPTION);
|
logger.lg.scriviLog($"Errore in fase salvataggio innovazioni parametri correnti da flogJson{Environment.NewLine}{exc}");
|
||||||
answ = "NO";
|
answ = "NO";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,28 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Net.Http.Headers;
|
||||||
|
using System.Web;
|
||||||
|
using System.Web.Http.Filters;
|
||||||
|
|
||||||
|
namespace MP_IO.Controllers.WebAPI
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Gestione cache x chaimate WebAPI
|
||||||
|
///
|
||||||
|
/// rif: https://www.c-sharpcorner.com/article/implementing-caching-in-web-api/
|
||||||
|
/// </summary>
|
||||||
|
public class CacheFilter : ActionFilterAttribute
|
||||||
|
{
|
||||||
|
public int TimeDuration { get; set; }
|
||||||
|
public override void OnActionExecuted(HttpActionExecutedContext actionExecutedContext)
|
||||||
|
{
|
||||||
|
actionExecutedContext.Response.Headers.CacheControl = new CacheControlHeaderValue
|
||||||
|
{
|
||||||
|
MaxAge = TimeSpan.FromSeconds(TimeDuration),
|
||||||
|
MustRevalidate = true,
|
||||||
|
Public = true
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,88 @@
|
|||||||
|
using MapoDb;
|
||||||
|
using SteamWare;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Net;
|
||||||
|
using System.Net.Http;
|
||||||
|
using System.Web.Http;
|
||||||
|
|
||||||
|
namespace MP_IO.Controllers.WebAPI
|
||||||
|
{
|
||||||
|
public class IOBController : ApiController
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// GET api/IOB
|
||||||
|
/// è un check alive del server
|
||||||
|
/// </summary>
|
||||||
|
/// <returns></returns>
|
||||||
|
[CacheFilter(TimeDuration = 10)]
|
||||||
|
[HttpGet]
|
||||||
|
public string Get()
|
||||||
|
{
|
||||||
|
if (memLayer.ML.CRB("IOB_RedEnab"))
|
||||||
|
{
|
||||||
|
// conto la richiesta nel contatore REDIS
|
||||||
|
long nCall = memLayer.ML.setRCntI(DataLayer.mHash("COUNT:pCall:IOB_INDEX"));
|
||||||
|
//... se == nCall2Log scrivo su log e resetto
|
||||||
|
long nCall2Log = memLayer.ML.cdvi("nCall2Log");
|
||||||
|
if (nCall >= nCall2Log)
|
||||||
|
{
|
||||||
|
// loggo
|
||||||
|
logger.lg.scriviLog(string.Format("IOB_INDEX: effettuate {0} call", nCall), tipoLog.INFO);
|
||||||
|
// resetto!
|
||||||
|
memLayer.ML.resetRCnt(DataLayer.mHash("COUNT:pCall:IOB_INDEX"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return "OK";
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// GET api/IOB/SIMUL_03
|
||||||
|
/// Verifica stato enabled di un determinato IOB
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="id"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
[CacheFilter(TimeDuration = 5)]
|
||||||
|
[HttpGet]
|
||||||
|
public string Get(string id)
|
||||||
|
{
|
||||||
|
string answ = "ND";
|
||||||
|
// se id nullo --> KO!
|
||||||
|
if (id == null)
|
||||||
|
{
|
||||||
|
answ = "KO";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
DataLayer DataLayerObj = new DataLayer();
|
||||||
|
// salvo risposta!
|
||||||
|
answ = DataLayerObj.insEnab(id) ? "OK" : "NO";
|
||||||
|
}
|
||||||
|
catch (Exception exc)
|
||||||
|
{
|
||||||
|
logger.lg.scriviLog(string.Format("Errore in enabled{0}{1}", Environment.NewLine, exc));
|
||||||
|
answ = "NO";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return answ;
|
||||||
|
}
|
||||||
|
|
||||||
|
// POST api/<controller>
|
||||||
|
public void Post([FromBody]string value)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
// PUT api/<controller>/5
|
||||||
|
public void Put(int id, [FromBody]string value)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
// DELETE api/<controller>/5
|
||||||
|
public void Delete(int id)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,54 +0,0 @@
|
|||||||
namespace MP_IO.Interfaces
|
|
||||||
{
|
|
||||||
public interface IBENCHService
|
|
||||||
{
|
|
||||||
#region Public Methods
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// GET BENCH/CNTKEY/test
|
|
||||||
/// </summary>
|
|
||||||
string CNTKEY(string id);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// GET BENCH/DTMAC/SIMUL_01
|
|
||||||
/// </summary>
|
|
||||||
string DTMAC(string id);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// GET BENCH/fSMI/18?idxMS=1&valore=1
|
|
||||||
/// </summary>
|
|
||||||
string fSMI(int? id, int? idxMS, int? valore);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// GET: IOB (è un check alive)
|
|
||||||
/// </summary>
|
|
||||||
string Index();
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// GET BENCH/INSEN/2004
|
|
||||||
/// </summary>
|
|
||||||
string INSEN(string id);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// GET BENCH/RCLEAN/100
|
|
||||||
/// </summary>
|
|
||||||
string RCLEAN(int? id);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// GET BENCH/RSETUP/100
|
|
||||||
/// </summary>
|
|
||||||
string RSETUP(int? id);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// GET BENCH/RSH/100
|
|
||||||
/// </summary>
|
|
||||||
string RSH(int? id);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// GET BENCH/tSMI/60
|
|
||||||
/// </summary>
|
|
||||||
string tSMI(int? id);
|
|
||||||
|
|
||||||
#endregion Public Methods
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
using System.Web.Mvc;
|
|
||||||
|
|
||||||
namespace MP_IO.Interfaces
|
|
||||||
{
|
|
||||||
public interface IHomeService
|
|
||||||
{
|
|
||||||
#region Public Methods
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// GET: Home
|
|
||||||
/// </summary>
|
|
||||||
RedirectResult Index();
|
|
||||||
|
|
||||||
#endregion Public Methods
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,445 +0,0 @@
|
|||||||
namespace MP_IO.Interfaces
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// SALVA x macchina KVP parametro/valore:
|
|
||||||
/// GET: IOB/addOptPar/SIMUL_03?pName=PZREQ&pValue=1000
|
|
||||||
/// </summary>
|
|
||||||
public interface IIOBService
|
|
||||||
{
|
|
||||||
#region Public Methods
|
|
||||||
|
|
||||||
/// <param name="id"></param>
|
|
||||||
/// <param name="pName"></param>
|
|
||||||
/// <param name="pValue"></param>
|
|
||||||
string addOptPar(string id, string pName, string pValue);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// AGGIUNGE TASK richiesto x macchina:
|
|
||||||
/// GET: IOB/addTask2Exe/3010?taskName=startSetup&taskVal=T190406101512
|
|
||||||
/// GET: IOB/addTask2Exe/3010?taskName=stopSetup&taskVal=T190406101512
|
|
||||||
/// GET: IOB/addTask2Exe/SIMUL_03?taskName=setProg&taskVal=P00000001
|
|
||||||
/// GET: IOB/addTask2Exe/SIMUL_03?taskName=setComm&taskVal=ODL_0000123
|
|
||||||
/// GET: IOB/addTask2Exe/SIMUL_03?taskName=setArt&taskVal=ART_0000321
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="id"></param>
|
|
||||||
/// <param name="taskName"></param>
|
|
||||||
/// <param name="taskVal"></param>
|
|
||||||
string addTask2Exe(string id, string taskName, string taskVal);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Richiesta chiusura manuale ODL x macchina (popup utente):
|
|
||||||
/// GET: IOB/askCloseODL/SIMUL_03?idxOdl=123
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="id">id macchina</param>
|
|
||||||
/// <param name="idxOdl">idx dell'ODL da chiudere</param>
|
|
||||||
/// <returns>bool esecuzione</returns>
|
|
||||||
bool askCloseODL(string id, int idxOdl);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Chiude ODL x macchina:
|
|
||||||
/// GET: IOB/closeODL/SIMUL_03?idxOdl=123&dtEve=20230323151100000&dtCurr=20230323221100000
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="id">id macchina</param>
|
|
||||||
/// <param name="idxOdl">idx dell'ODL da chiudere</param>
|
|
||||||
/// <param name="dtEve">DataOra evento</param>
|
|
||||||
/// <param name="dtCurr">DataOra corrente x fix</param>
|
|
||||||
/// <returns>bool esecuzione</returns>
|
|
||||||
bool closeODL(string id, int idxOdl, string dtEve = "", string dtCurr = "");
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Chiude PODL --> ODL x macchina:
|
|
||||||
/// GET: IOB/closePODL/SIMUL_03?idxPOdl=123&dtEve=20230323151100000&dtCurr=20230323221100000
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="id">id macchina</param>
|
|
||||||
/// <param name="idxPOdl">idx del POdl da chiudere</param>
|
|
||||||
/// <param name="dtEve">DataOra evento</param>
|
|
||||||
/// <param name="dtCurr">DataOra corrente x fix</param>
|
|
||||||
/// <returns>bool esecuzione</returns>
|
|
||||||
bool closePODL(string id, int idxPOdl, string dtEve = "", string dtCurr = "");
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// GET: IOB/enabled/SIMUL_03
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="id"></param>
|
|
||||||
/// <returns></returns>
|
|
||||||
string enabled(string id);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Processa una chiamata POST per l'invio di un array Json di oggetti input (EVENTI)
|
|
||||||
/// POST: IOB/evListJson/SIMUL_03
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="id">ID dell'IOB</param>
|
|
||||||
/// <returns></returns>
|
|
||||||
string evListJson(string id);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Sistema Dossier/Snapshot giornalieri x impianto indicato, andando a generare 1 Dossier
|
|
||||||
/// giornaliero x ogni giornata dall'ultimo registrato alla data corrente
|
|
||||||
/// es: http://url_site/MP/IO/IOB/fixDailyDossier/SIMUL_03
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="id"></param>
|
|
||||||
/// <returns></returns>
|
|
||||||
string fixDailyDossier(string id);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Sistema ODL giornalieri x impianto indicato, andando a generare 1 ODL giornaliero x ogni
|
|
||||||
/// giornata dall'ultimo ODL aperto alla data corrente
|
|
||||||
/// es: http://url_site/MP/IO/IOB/fixDailyOdl/SIMUL_03
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="id"></param>
|
|
||||||
/// <returns></returns>
|
|
||||||
string fixDailyOdl(string id);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Sistema ODL giornalieri x impianto indicato, andando a generare 1 ODL giornaliero x ogni
|
|
||||||
/// giornata dall'ultimo ODL aperto alla data corrente + conferma pezzi (es TFT x ODL
|
|
||||||
/// giornalieri energia)
|
|
||||||
/// es: http://url_site/MP/IO/IOB/fixDailyOdlConfPzCount/SIMUL_03
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="id"></param>
|
|
||||||
/// <returns></returns>
|
|
||||||
string fixDailyOdlConfPzCount(string id);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Invio record flog secco
|
|
||||||
/// GET: IOB/flog/SIMUL_03?flux=PROG&valore=P0001&dtEve=20161223180600000&dtCurr=20161223180600000&cnt=999&disabKA=false
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="id">IdxMacchina</param>
|
|
||||||
/// <param name="flux">CodFlux</param>
|
|
||||||
/// <param name="valore">Valore da registrare</param>
|
|
||||||
/// <param name="dtEve">DataOra evento (IOB time)</param>
|
|
||||||
/// <param name="dtCurr">DataOra corrente (IOB time)</param>
|
|
||||||
/// <param name="cnt">Contatore eventi (IOB)</param>
|
|
||||||
/// <param name="disabKA">Disabilitazione scrittura record KeepAlive</param>
|
|
||||||
/// <returns></returns>
|
|
||||||
string flog(string id, string flux, string valore, string dtEve, string dtCurr, string cnt, string disabKA = "false");
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Processa una chiamata POST per l'invio di un array Json di oggetti fluxLog
|
|
||||||
/// PUT: IOB/flogJson/SIMUL_03
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="id">ID dell'IOB</param>
|
|
||||||
/// <param name="disabKA">Disabilitazione della scrittura del record KeepAlive</param>
|
|
||||||
/// <returns></returns>
|
|
||||||
string flogJson(string id, string disabKA = "false");
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Creazione nuovo ODL dato CodXdl + numPz
|
|
||||||
/// GET: IOB/forceCreatePOdl/SIMUL_03?CodXdl=ABCD_1234&numPz=5
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="id"></param>
|
|
||||||
/// <param name="CodArt"></param>
|
|
||||||
/// <param name="CodGruppo"></param>
|
|
||||||
/// <param name="numPz"></param>
|
|
||||||
/// <returns>IdxODL creato</returns>
|
|
||||||
int forceCreatePOdl(string id, string CodArt, string CodGruppo, int numPz);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Chiude ODL precedente ed avvia uno nuovo (duplicandolo e sitemando quantità RIMANENTE),
|
|
||||||
/// e CONFERMA produzione...
|
|
||||||
/// GET: IOB/forceSplitOdl/SIMUL_03
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="id"></param>
|
|
||||||
/// <returns>Esito chiamata (OK/vuoto)</returns>
|
|
||||||
string forceSplitOdl(string id);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Chiude ODL precedente ed avvia uno nuovo (duplicandolo e sitemando quantità
|
|
||||||
/// RIMANENTE), e CONFERMA produzione...
|
|
||||||
/// GET: IOB/forceSplitOdl/SIMUL_03?doConfirm=true&qtyFromLast=true&roundStep=150&extOrderCode=ABCDE1234
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="id">id impianto</param>
|
|
||||||
/// <param name="doConfirm"></param>
|
|
||||||
/// <param name="qtyFromLast"></param>
|
|
||||||
/// <param name="roundStep"></param>
|
|
||||||
/// <param name="keyRichiesta">Cod esterno da legare all'ODL x tracciare lotti prod</param>
|
|
||||||
/// <param name="matrOpr">matricola operatore che effettua la fuzione (default = 0)</param>
|
|
||||||
/// <returns>Esito chiamata (OK/vuoto)</returns>
|
|
||||||
string forceSplitOdlFull(string id, bool doConfirm, bool qtyFromLast, int? roundStep, string keyRichiesta = "", int matrOpr = 0);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Avvia PODL indicato
|
|
||||||
/// - se esistesse un ODL da altro PODL --> chiude
|
|
||||||
/// - se fosse già in essere ODL collegato --> lascia aperto
|
|
||||||
/// - se fosse chiuso ODL collegato --> duplica PODL e poi avvia nuovo ODL.
|
|
||||||
/// GET: IOB/forceStartPOdl/SIMUL_03?idxPODL=123&dtEve=20230323151100000&dtCurr=20230323221100000
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="id"></param>
|
|
||||||
/// <param name="idxPODL">idx del PDL da avviare</param>
|
|
||||||
/// <param name="dtEve">data-ora di avvio (opzionale)</param>
|
|
||||||
/// <param name="dtCurr">data-ora attuale (opzionale)</param>
|
|
||||||
/// <param name="matrOpr">matricola operatore (default 0)</param>
|
|
||||||
/// <returns>Esito chiamata (OK/vuoto)</returns>
|
|
||||||
string forceStartPOdl(string id, int idxPODL, string dtEve = "", string dtCurr = "", int matrOpr = 0);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Recupera elenco articoli dei PODL correnti:
|
|
||||||
/// GET: IOB/getArtCurrPODL
|
|
||||||
/// </summary>
|
|
||||||
/// <returns>Json contenente lista oggetti ARTICOLI serializzati</returns>
|
|
||||||
string getArtCurrPODL();
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Recupera ArtNum dato CodXdl (per impianti che accettano solo INT in scrittura):
|
|
||||||
/// GET: IOB/getArtNum/SIMUL_03?CodXdl=ABC123
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="id">IdxMacchina (NON considerato)</param>
|
|
||||||
/// <param name="CodArt">CodXdl richiesto, se vuoto restituisce TUTTI i valori in tabella di decodifica</param>
|
|
||||||
/// <returns>Json contenente le righe delle codifiche attive Articolo/Numero</returns>
|
|
||||||
string getArtNum(string id, string CodArt = "");
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Recupera elenco articoli USATI:
|
|
||||||
/// GET: IOB/getArtUsed
|
|
||||||
/// </summary>
|
|
||||||
/// <returns>Json contenente lista oggetti ARTICOLI serializzati</returns>
|
|
||||||
string getArtUsed();
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Recupera COUNTER x macchina:
|
|
||||||
/// GET: IOB/getCounter/5
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="id"></param>
|
|
||||||
/// <returns></returns>
|
|
||||||
string getCounter(string id);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Recupera COUNTER x macchina dal CONTEGGIO dei TCRecorded:
|
|
||||||
/// GET: IOB/getCounterTCRec/5
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="id"></param>
|
|
||||||
/// <returns></returns>
|
|
||||||
string getCounterTCRec(string id);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Recupera DATI correnti x macchina:
|
|
||||||
/// GET: IOB/getCurrData/SIMUL_03
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="id"></param>
|
|
||||||
/// <returns>Json contenente la riga di stato macchina</returns>
|
|
||||||
string getCurrData(string id);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Recupera ODL corrente x macchina:
|
|
||||||
/// GET: IOB/getCurrODL/SIMUL_03
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="id"></param>
|
|
||||||
/// <returns></returns>
|
|
||||||
string getCurrODL(string id);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Restituisce la quantità pezzi dell'odl correntemente in lavorazione sulla macchina...
|
|
||||||
/// GET: IOB/getCurrOdlQtaReq/SIMUL_01
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="id"></param>
|
|
||||||
/// <returns></returns>
|
|
||||||
int getCurrOdlQtaReq(string id);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Restituisce intera riga dell'odl correntemente in lavorazione sulla macchina...
|
|
||||||
/// GET: IOB/getCurrOdlRow/SIMUL_01
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="id"></param>
|
|
||||||
/// <returns></returns>
|
|
||||||
string getCurrOdlRow(string id);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Restituisce data-ora inizio dell'odl correntemente in lavorazione sulla macchina...
|
|
||||||
/// es: http://url_site/MP/IO/IOB/getCurrOdlStart/SIMUL_03
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="id"></param>
|
|
||||||
/// <returns></returns>
|
|
||||||
string getCurrOdlStart(string id);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Recupera DATI PODL correnti (=NON AVVIATI) x macchina:
|
|
||||||
/// GET: IOB/getCurrPODL/SIMUL_03
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="id">id macchina, se "" mostra tutto</param>
|
|
||||||
/// <returns>Json contenente lista oggetti PODL serializzati</returns>
|
|
||||||
string getCurrPODL(string id);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Restituisce intera riga dello stato di macchina...
|
|
||||||
/// GET: IOB/getCurrStatoRow/SIMUL_01
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="id"></param>
|
|
||||||
/// <returns></returns>
|
|
||||||
string getCurrStatoRow(string id);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Restituisce un array JSon di files di una IOB
|
|
||||||
/// PUT: IOB/getFiles/SIMUL_03
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="id">ID dell'IOB</param>
|
|
||||||
/// <returns>Oggetto Json in formato MapoSDK.fileEmbed</returns>
|
|
||||||
string getFiles(string id);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Restituisce il valore dello stato di IDLE della macchina, quindi SOLO SE NON é in lavoro
|
|
||||||
/// e già convertito in minuti...
|
|
||||||
/// GET: IOB/getIdlePeriod/SIMUL_01
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="id"></param>
|
|
||||||
/// <returns></returns>
|
|
||||||
int getIdlePeriod(string id);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Restituisce il (primo) codice IOB da dover gestire (se un IOBMAN chiede di gestirne uno
|
|
||||||
/// in +...)
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="GWIP">IP del Gateway</param>
|
|
||||||
/// <returns></returns>
|
|
||||||
string getIob2call(string GWIP);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Recupera elenco articoli USATI per ultimi:
|
|
||||||
/// - quelli dei PODL correnti
|
|
||||||
/// - quelli degli ultimi n (DOSS_LastArt in config) ODL lavorati
|
|
||||||
/// GET: IOB/getArtByMacc
|
|
||||||
/// </summary>
|
|
||||||
/// <returns>Json contenente lista oggetti ARTICOLI serializzati</returns>
|
|
||||||
string getLastArtByMacc(string id);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Recupera DATI dell'ultimo dossier dato articolo:
|
|
||||||
/// GET: IOB/getLastDossArt/cod_articolo
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="id">codice articolo, se vuoto --> non fa nulla</param>
|
|
||||||
/// <returns>Json contenente lista oggetti DOSSIER serializzati</returns>
|
|
||||||
string getLastDossArt(string id);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Recupera DATI dell'ultimo dossier dato macchina:
|
|
||||||
/// GET: IOB/getLastDossByMacc/cod_articolo
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="id">codice articolo, se vuoto --> non fa nulla</param>
|
|
||||||
/// <returns>Json contenente lista oggetti DOSSIER serializzati</returns>
|
|
||||||
string getLastDossByMacc(string id);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Recupera DATI dell'ultimo dossier dato PODL correnti:
|
|
||||||
/// GET: IOB/getLastDossPODL
|
|
||||||
/// </summary>
|
|
||||||
/// <returns>Json contenente lista oggetti DOSSIER serializzati</returns>
|
|
||||||
string getLastDossPODL();
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Recupera elenco ListValues data tabella:
|
|
||||||
/// GET: IOB/getListValByTable
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="id">nome tabella x cui filtrare risultati, se "" mostra tutto</param>
|
|
||||||
/// <returns>Json contenente lista oggetti ListValue serializzati</returns>
|
|
||||||
string getListValByTable(string id);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Restituisce dati di associazione tra macchina, device IOB chiamante e sue info
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="id">Id della macchina</param>
|
|
||||||
/// <returns></returns>
|
|
||||||
string getM2IOB(string id);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// restituisce elenco parametri correnti come una List Json di oggetti objItem
|
|
||||||
/// GET: IOB/getObjItems/SIMUL_03
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="id">ID dell'IOB</param>
|
|
||||||
/// <returns></returns>
|
|
||||||
string getObjItems(string id);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// restituisce elenco parametri CHE RICHIEDONO scrittura su PLC come una List Json di
|
|
||||||
/// oggetti objItem
|
|
||||||
/// GET: IOB/getObjItems2Write/SIMUL_03
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="id">ID dell'IOB</param>
|
|
||||||
/// <returns></returns>
|
|
||||||
string getObjItems2Write(string id);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// GET: IOB/getOptPar/SIMUL_03
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="id"></param>
|
|
||||||
/// <returns></returns>
|
|
||||||
string getOdlAtDate(string id, string dateRif);
|
|
||||||
|
|
||||||
string getOptPar(string id);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Recupera PODL prossimo da avviare x macchina:
|
|
||||||
/// GET: IOB/getPOdlNext/SIMUL_03
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="id"></param>
|
|
||||||
/// <returns></returns>
|
|
||||||
string getPODL(string id, int idxPODL);
|
|
||||||
|
|
||||||
string getPOdlAct(string id);
|
|
||||||
|
|
||||||
string getPOdlNext(string id);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// GET: IOB/getTask2Exe/SIMUL_03
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="id"></param>
|
|
||||||
/// <returns></returns>
|
|
||||||
string getTask2Exe(string id);
|
|
||||||
|
|
||||||
string getXdlNum(string id, string CodXdl = "");
|
|
||||||
|
|
||||||
string Index();
|
|
||||||
|
|
||||||
string input(string id, string valore, string dtEve, string dtCurr, string cnt);
|
|
||||||
|
|
||||||
string liveJson(string id);
|
|
||||||
|
|
||||||
string liveRec(string id, string liveData);
|
|
||||||
|
|
||||||
string rawTransfJson(string id);
|
|
||||||
|
|
||||||
string remOptPar(string id, string pName);
|
|
||||||
|
|
||||||
string remTask2Exe(string id, string taskName);
|
|
||||||
|
|
||||||
string resetCurrODL(string id);
|
|
||||||
|
|
||||||
string saveConf(string id);
|
|
||||||
|
|
||||||
string saveConfYaml(string id);
|
|
||||||
|
|
||||||
string saveDataItems(string id);
|
|
||||||
|
|
||||||
string saveMachineIobConf(string id);
|
|
||||||
|
|
||||||
string savePzCountInc(string id, string qty);
|
|
||||||
|
|
||||||
string savePzCountIncAtDate(string id, string qty, string dtEve = "", string dtCurr = "");
|
|
||||||
|
|
||||||
string sendAlarmBankUpdate(string id, string memAddr, int index, int currStatus);
|
|
||||||
|
|
||||||
string sendReboot(string id, string mac);
|
|
||||||
|
|
||||||
string sendRebootGateway(string GWIP);
|
|
||||||
|
|
||||||
string setCounter(string id, string counter);
|
|
||||||
|
|
||||||
string setM2IOB(string id, string IOB_name);
|
|
||||||
|
|
||||||
string setObjItems(string id);
|
|
||||||
|
|
||||||
string setRedisHashDict(string id);
|
|
||||||
|
|
||||||
string slog(string id);
|
|
||||||
|
|
||||||
string takeFlogSnapshot(string id);
|
|
||||||
|
|
||||||
string ulog(string id, string flux, string valore, string dtEve, string dtCurr, string cnt, string matrOpr, string label, string valNum);
|
|
||||||
|
|
||||||
string ulogJson(string id);
|
|
||||||
|
|
||||||
string uploadFile(string id);
|
|
||||||
|
|
||||||
string upsertObjItems(string id);
|
|
||||||
|
|
||||||
#endregion Public Methods
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+6
-7
@@ -124,11 +124,11 @@
|
|||||||
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
|
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\StackExchange.Redis.2.8.0\lib\net461\StackExchange.Redis.dll</HintPath>
|
<HintPath>..\packages\StackExchange.Redis.2.8.0\lib\net461\StackExchange.Redis.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="SteamWare, Version=5.4.2509.1715, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="SteamWare, Version=5.3.2311.2908, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\SteamWare.5.4.2509.1715\lib\net462\SteamWare.dll</HintPath>
|
<HintPath>..\packages\SteamWare.5.3.2311.2908\lib\net462\SteamWare.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="SteamWare.Logger, Version=5.4.2509.1715, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="SteamWare.Logger, Version=5.3.2311.2908, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\SteamWare.Logger.5.4.2509.1715\lib\net462\SteamWare.Logger.dll</HintPath>
|
<HintPath>..\packages\SteamWare.Logger.5.3.2311.2908\lib\net462\SteamWare.Logger.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
|
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
|
||||||
@@ -331,6 +331,8 @@
|
|||||||
<Compile Include="Controllers\BENCH.cs" />
|
<Compile Include="Controllers\BENCH.cs" />
|
||||||
<Compile Include="Controllers\HomeController.cs" />
|
<Compile Include="Controllers\HomeController.cs" />
|
||||||
<Compile Include="Controllers\IOBController.cs" />
|
<Compile Include="Controllers\IOBController.cs" />
|
||||||
|
<Compile Include="Controllers\WebAPI\CacheFilter.cs" />
|
||||||
|
<Compile Include="Controllers\WebAPI\IOBController.cs" />
|
||||||
<Compile Include="enabled.aspx.cs">
|
<Compile Include="enabled.aspx.cs">
|
||||||
<DependentUpon>enabled.aspx</DependentUpon>
|
<DependentUpon>enabled.aspx</DependentUpon>
|
||||||
<SubType>ASPXCodeBehind</SubType>
|
<SubType>ASPXCodeBehind</SubType>
|
||||||
@@ -348,9 +350,6 @@
|
|||||||
<Compile Include="inputIOB.aspx.designer.cs">
|
<Compile Include="inputIOB.aspx.designer.cs">
|
||||||
<DependentUpon>inputIOB.aspx</DependentUpon>
|
<DependentUpon>inputIOB.aspx</DependentUpon>
|
||||||
</Compile>
|
</Compile>
|
||||||
<Compile Include="Interfaces\IBENCHService.cs" />
|
|
||||||
<Compile Include="Interfaces\IHomeService.cs" />
|
|
||||||
<Compile Include="Interfaces\IIOBService.cs" />
|
|
||||||
<Compile Include="lastUpdate.aspx.cs">
|
<Compile Include="lastUpdate.aspx.cs">
|
||||||
<DependentUpon>lastUpdate.aspx</DependentUpon>
|
<DependentUpon>lastUpdate.aspx</DependentUpon>
|
||||||
<SubType>ASPXCodeBehind</SubType>
|
<SubType>ASPXCodeBehind</SubType>
|
||||||
|
|||||||
+3
-1
@@ -51,7 +51,9 @@
|
|||||||
<add name="MoonProConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
|
<add name="MoonProConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
|
||||||
<add name="MapoDb.Properties.Settings.MoonProConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
|
<add name="MapoDb.Properties.Settings.MoonProConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
|
||||||
<add name="ErrorLog" connectionString="Data Source=SQL2016DEV;Initial Catalog=Elmah;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
|
<add name="ErrorLog" connectionString="Data Source=SQL2016DEV;Initial Catalog=Elmah;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
|
||||||
<add name="MapoDb.Properties.Settings.MoonPro_FluxDataConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_FluxData;Persist Security Info=True;User ID=sa;Password=keyhammer16;TrustServerCertificate=True" providerName="System.Data.SqlClient" />
|
<add name="MapoDb.Properties.Settings.MoonPro_FluxDataConnectionString"
|
||||||
|
connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_FluxData;Persist Security Info=True;User ID=sa;Password=keyhammer16;TrustServerCertificate=True"
|
||||||
|
providerName="System.Data.SqlClient" />
|
||||||
</connectionStrings>
|
</connectionStrings>
|
||||||
<system.web>
|
<system.web>
|
||||||
<customErrors mode="Off" />
|
<customErrors mode="Off" />
|
||||||
|
|||||||
@@ -45,8 +45,8 @@
|
|||||||
<package id="SharpCompress" version="0.38.0" targetFramework="net462" />
|
<package id="SharpCompress" version="0.38.0" targetFramework="net462" />
|
||||||
<package id="SharpZipLib" version="1.4.2" targetFramework="net462" />
|
<package id="SharpZipLib" version="1.4.2" targetFramework="net462" />
|
||||||
<package id="StackExchange.Redis" version="2.8.0" targetFramework="net462" />
|
<package id="StackExchange.Redis" version="2.8.0" targetFramework="net462" />
|
||||||
<package id="SteamWare" version="5.4.2509.1715" targetFramework="net462" />
|
<package id="SteamWare" version="5.3.2311.2908" targetFramework="net462" />
|
||||||
<package id="SteamWare.Logger" version="5.4.2509.1715" targetFramework="net462" />
|
<package id="SteamWare.Logger" version="5.3.2311.2908" targetFramework="net462" />
|
||||||
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
|
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
|
||||||
<package id="System.Configuration.ConfigurationManager" version="8.0.0" targetFramework="net462" />
|
<package id="System.Configuration.ConfigurationManager" version="8.0.0" targetFramework="net462" />
|
||||||
<package id="System.Diagnostics.PerformanceCounter" version="8.0.0" targetFramework="net462" />
|
<package id="System.Diagnostics.PerformanceCounter" version="8.0.0" targetFramework="net462" />
|
||||||
|
|||||||
@@ -131,14 +131,14 @@
|
|||||||
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
|
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\StackExchange.Redis.2.8.0\lib\net461\StackExchange.Redis.dll</HintPath>
|
<HintPath>..\packages\StackExchange.Redis.2.8.0\lib\net461\StackExchange.Redis.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="SteamWare, Version=5.4.2509.1715, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="SteamWare, Version=5.3.2311.2908, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\SteamWare.5.4.2509.1715\lib\net462\SteamWare.dll</HintPath>
|
<HintPath>..\packages\SteamWare.5.3.2311.2908\lib\net462\SteamWare.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="SteamWare.Logger, Version=5.4.2509.1715, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="SteamWare.Logger, Version=5.3.2311.2908, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\SteamWare.Logger.5.4.2509.1715\lib\net462\SteamWare.Logger.dll</HintPath>
|
<HintPath>..\packages\SteamWare.Logger.5.3.2311.2908\lib\net462\SteamWare.Logger.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="SteamWare.Reports, Version=5.4.2509.1715, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="SteamWare.Reports, Version=5.3.2311.2908, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\SteamWare.Reports.5.4.2509.1715\lib\net462\SteamWare.Reports.dll</HintPath>
|
<HintPath>..\packages\SteamWare.Reports.5.3.2311.2908\lib\net462\SteamWare.Reports.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||||
@@ -881,6 +881,8 @@
|
|||||||
<Content Include="Core\Compression\Zstandard\lib\linux\libzstd.so" />
|
<Content Include="Core\Compression\Zstandard\lib\linux\libzstd.so" />
|
||||||
<Content Include="Core\Compression\Snappy\lib\osx\libsnappy64.dylib" />
|
<Content Include="Core\Compression\Snappy\lib\osx\libsnappy64.dylib" />
|
||||||
<Content Include="Core\Compression\Snappy\lib\linux\libsnappy64.so" />
|
<Content Include="Core\Compression\Snappy\lib\linux\libsnappy64.so" />
|
||||||
|
<Content Include="App_Readme\SteamWare_demo\example-NLog.config" />
|
||||||
|
<Content Include="App_Readme\SteamWare_demo\example-app.config" />
|
||||||
<Content Include="Areas\HelpPage\Views\_ViewStart.cshtml" />
|
<Content Include="Areas\HelpPage\Views\_ViewStart.cshtml" />
|
||||||
<Content Include="Areas\HelpPage\Views\Web.config" />
|
<Content Include="Areas\HelpPage\Views\Web.config" />
|
||||||
<Content Include="Areas\HelpPage\Views\Shared\_Layout.cshtml" />
|
<Content Include="Areas\HelpPage\Views\Shared\_Layout.cshtml" />
|
||||||
@@ -923,8 +925,6 @@
|
|||||||
<Content Include="Content\bootstrap-grid.rtl.css.map" />
|
<Content Include="Content\bootstrap-grid.rtl.css.map" />
|
||||||
<Content Include="Content\bootstrap-grid.min.css.map" />
|
<Content Include="Content\bootstrap-grid.min.css.map" />
|
||||||
<Content Include="Content\bootstrap-grid.css.map" />
|
<Content Include="Content\bootstrap-grid.css.map" />
|
||||||
<Content Include="App_Readme\SteamWare_demo\example-NLog.config" />
|
|
||||||
<Content Include="App_Readme\SteamWare_demo\example-app.config" />
|
|
||||||
<None Include="Scripts\jquery-3.7.1.intellisense.js" />
|
<None Include="Scripts\jquery-3.7.1.intellisense.js" />
|
||||||
<Content Include="Scripts\jquery-3.7.1.js" />
|
<Content Include="Scripts\jquery-3.7.1.js" />
|
||||||
<Content Include="Scripts\jquery-3.7.1.min.js" />
|
<Content Include="Scripts\jquery-3.7.1.min.js" />
|
||||||
|
|||||||
@@ -55,9 +55,9 @@
|
|||||||
<package id="SharpCompress" version="0.38.0" targetFramework="net462" />
|
<package id="SharpCompress" version="0.38.0" targetFramework="net462" />
|
||||||
<package id="SharpZipLib" version="1.4.2" targetFramework="net462" />
|
<package id="SharpZipLib" version="1.4.2" targetFramework="net462" />
|
||||||
<package id="StackExchange.Redis" version="2.8.0" targetFramework="net462" />
|
<package id="StackExchange.Redis" version="2.8.0" targetFramework="net462" />
|
||||||
<package id="SteamWare" version="5.4.2509.1715" targetFramework="net462" />
|
<package id="SteamWare" version="5.3.2311.2908" targetFramework="net462" />
|
||||||
<package id="SteamWare.Logger" version="5.4.2509.1715" targetFramework="net462" />
|
<package id="SteamWare.Logger" version="5.3.2311.2908" targetFramework="net462" />
|
||||||
<package id="SteamWare.Reports" version="5.4.2509.1715" targetFramework="net462" />
|
<package id="SteamWare.Reports" version="5.3.2311.2908" targetFramework="net462" />
|
||||||
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
|
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
|
||||||
<package id="System.Configuration.ConfigurationManager" version="8.0.0" targetFramework="net462" />
|
<package id="System.Configuration.ConfigurationManager" version="8.0.0" targetFramework="net462" />
|
||||||
<package id="System.Diagnostics.PerformanceCounter" version="8.0.0" targetFramework="net462" />
|
<package id="System.Diagnostics.PerformanceCounter" version="8.0.0" targetFramework="net462" />
|
||||||
|
|||||||
@@ -121,11 +121,11 @@
|
|||||||
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
|
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\StackExchange.Redis.2.8.0\lib\net461\StackExchange.Redis.dll</HintPath>
|
<HintPath>..\packages\StackExchange.Redis.2.8.0\lib\net461\StackExchange.Redis.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="SteamWare, Version=5.4.2509.1715, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="SteamWare, Version=5.3.2311.2908, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\SteamWare.5.4.2509.1715\lib\net462\SteamWare.dll</HintPath>
|
<HintPath>..\packages\SteamWare.5.3.2311.2908\lib\net462\SteamWare.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="SteamWare.Logger, Version=5.4.2509.1715, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="SteamWare.Logger, Version=5.3.2311.2908, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\SteamWare.Logger.5.4.2509.1715\lib\net462\SteamWare.Logger.dll</HintPath>
|
<HintPath>..\packages\SteamWare.Logger.5.3.2311.2908\lib\net462\SteamWare.Logger.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
|
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
|
||||||
@@ -376,6 +376,8 @@
|
|||||||
<Content Include="Core\Compression\Zstandard\lib\linux\libzstd.so" />
|
<Content Include="Core\Compression\Zstandard\lib\linux\libzstd.so" />
|
||||||
<Content Include="Core\Compression\Snappy\lib\osx\libsnappy64.dylib" />
|
<Content Include="Core\Compression\Snappy\lib\osx\libsnappy64.dylib" />
|
||||||
<Content Include="Core\Compression\Snappy\lib\linux\libsnappy64.so" />
|
<Content Include="Core\Compression\Snappy\lib\linux\libsnappy64.so" />
|
||||||
|
<Content Include="App_Readme\SteamWare_demo\example-NLog.config" />
|
||||||
|
<Content Include="App_Readme\SteamWare_demo\example-app.config" />
|
||||||
<Content Include="Scripts\bootstrap.min.js.map" />
|
<Content Include="Scripts\bootstrap.min.js.map" />
|
||||||
<Content Include="Scripts\bootstrap.js.map" />
|
<Content Include="Scripts\bootstrap.js.map" />
|
||||||
<Content Include="Scripts\bootstrap.esm.min.js.map" />
|
<Content Include="Scripts\bootstrap.esm.min.js.map" />
|
||||||
@@ -398,8 +400,6 @@
|
|||||||
<Content Include="Content\bootstrap-grid.rtl.css.map" />
|
<Content Include="Content\bootstrap-grid.rtl.css.map" />
|
||||||
<Content Include="Content\bootstrap-grid.min.css.map" />
|
<Content Include="Content\bootstrap-grid.min.css.map" />
|
||||||
<Content Include="Content\bootstrap-grid.css.map" />
|
<Content Include="Content\bootstrap-grid.css.map" />
|
||||||
<Content Include="App_Readme\SteamWare_demo\example-NLog.config" />
|
|
||||||
<Content Include="App_Readme\SteamWare_demo\example-app.config" />
|
|
||||||
<None Include="Scripts\jquery-3.4.1.intellisense.js" />
|
<None Include="Scripts\jquery-3.4.1.intellisense.js" />
|
||||||
<Content Include="Scripts\jquery-3.4.1.js" />
|
<Content Include="Scripts\jquery-3.4.1.js" />
|
||||||
<Content Include="Scripts\jquery-3.4.1.min.js" />
|
<Content Include="Scripts\jquery-3.4.1.min.js" />
|
||||||
|
|||||||
+3
-1
@@ -43,7 +43,9 @@
|
|||||||
<add name="MoonProConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
|
<add name="MoonProConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
|
||||||
<add name="MapoDb.Properties.Settings.MoonProConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
|
<add name="MapoDb.Properties.Settings.MoonProConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
|
||||||
<add name="ErrorLog" connectionString="Data Source=SQL2016DEV;Initial Catalog=Elmah;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
|
<add name="ErrorLog" connectionString="Data Source=SQL2016DEV;Initial Catalog=Elmah;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
|
||||||
<add name="MapoDb.Properties.Settings.MoonPro_FluxDataConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_FluxData;Persist Security Info=True;User ID=sa;Password=keyhammer16;TrustServerCertificate=True" providerName="System.Data.SqlClient" />
|
<add name="MapoDb.Properties.Settings.MoonPro_FluxDataConnectionString"
|
||||||
|
connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_FluxData;Persist Security Info=True;User ID=sa;Password=keyhammer16;TrustServerCertificate=True"
|
||||||
|
providerName="System.Data.SqlClient" />
|
||||||
</connectionStrings>
|
</connectionStrings>
|
||||||
<system.web>
|
<system.web>
|
||||||
<httpHandlers>
|
<httpHandlers>
|
||||||
|
|||||||
@@ -44,8 +44,8 @@
|
|||||||
<package id="SharpCompress" version="0.38.0" targetFramework="net462" />
|
<package id="SharpCompress" version="0.38.0" targetFramework="net462" />
|
||||||
<package id="SharpZipLib" version="1.4.2" targetFramework="net462" />
|
<package id="SharpZipLib" version="1.4.2" targetFramework="net462" />
|
||||||
<package id="StackExchange.Redis" version="2.8.0" targetFramework="net462" />
|
<package id="StackExchange.Redis" version="2.8.0" targetFramework="net462" />
|
||||||
<package id="SteamWare" version="5.4.2509.1715" targetFramework="net462" />
|
<package id="SteamWare" version="5.3.2311.2908" targetFramework="net462" />
|
||||||
<package id="SteamWare.Logger" version="5.4.2509.1715" targetFramework="net462" />
|
<package id="SteamWare.Logger" version="5.3.2311.2908" targetFramework="net462" />
|
||||||
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
|
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
|
||||||
<package id="System.Configuration.ConfigurationManager" version="8.0.0" targetFramework="net462" />
|
<package id="System.Configuration.ConfigurationManager" version="8.0.0" targetFramework="net462" />
|
||||||
<package id="System.Diagnostics.PerformanceCounter" version="8.0.0" targetFramework="net462" />
|
<package id="System.Diagnostics.PerformanceCounter" version="8.0.0" targetFramework="net462" />
|
||||||
|
|||||||
@@ -158,11 +158,11 @@
|
|||||||
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
|
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\StackExchange.Redis.2.8.0\lib\net461\StackExchange.Redis.dll</HintPath>
|
<HintPath>..\packages\StackExchange.Redis.2.8.0\lib\net461\StackExchange.Redis.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="SteamWare, Version=5.4.2509.1715, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="SteamWare, Version=5.3.2311.2908, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\SteamWare.5.4.2509.1715\lib\net462\SteamWare.dll</HintPath>
|
<HintPath>..\packages\SteamWare.5.3.2311.2908\lib\net462\SteamWare.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="SteamWare.Logger, Version=5.4.2509.1715, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="SteamWare.Logger, Version=5.3.2311.2908, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\SteamWare.Logger.5.4.2509.1715\lib\net462\SteamWare.Logger.dll</HintPath>
|
<HintPath>..\packages\SteamWare.Logger.5.3.2311.2908\lib\net462\SteamWare.Logger.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
|
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
|
||||||
@@ -341,6 +341,8 @@
|
|||||||
<Content Include="Content\bootstrap\mixins\_nav-divider.scss" />
|
<Content Include="Content\bootstrap\mixins\_nav-divider.scss" />
|
||||||
<Content Include="Content\bootstrap\mixins\_hover.scss" />
|
<Content Include="Content\bootstrap\mixins\_hover.scss" />
|
||||||
<Content Include="Content\bootstrap\mixins\_grid-framework.scss" />
|
<Content Include="Content\bootstrap\mixins\_grid-framework.scss" />
|
||||||
|
<Content Include="App_Readme\SteamWare_demo\example-NLog.config" />
|
||||||
|
<Content Include="App_Readme\SteamWare_demo\example-app.config" />
|
||||||
<Content Include="Content\bootstrap.rtl.min.css.map" />
|
<Content Include="Content\bootstrap.rtl.min.css.map" />
|
||||||
<Content Include="Content\bootstrap.rtl.css.map" />
|
<Content Include="Content\bootstrap.rtl.css.map" />
|
||||||
<Content Include="Content\bootstrap.min.css.map" />
|
<Content Include="Content\bootstrap.min.css.map" />
|
||||||
@@ -357,8 +359,6 @@
|
|||||||
<Content Include="Content\bootstrap-grid.rtl.css.map" />
|
<Content Include="Content\bootstrap-grid.rtl.css.map" />
|
||||||
<Content Include="Content\bootstrap-grid.min.css.map" />
|
<Content Include="Content\bootstrap-grid.min.css.map" />
|
||||||
<Content Include="Content\bootstrap-grid.css.map" />
|
<Content Include="Content\bootstrap-grid.css.map" />
|
||||||
<Content Include="App_Readme\SteamWare_demo\example-NLog.config" />
|
|
||||||
<Content Include="App_Readme\SteamWare_demo\example-app.config" />
|
|
||||||
<None Include="Content\typeahead.less" />
|
<None Include="Content\typeahead.less" />
|
||||||
<Content Include="Content\typeahead.css">
|
<Content Include="Content\typeahead.css">
|
||||||
<DependentUpon>typeahead.less</DependentUpon>
|
<DependentUpon>typeahead.less</DependentUpon>
|
||||||
|
|||||||
+3
-1
@@ -75,7 +75,9 @@
|
|||||||
<add name="MapoDb.Properties.Settings.MoonProConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
|
<add name="MapoDb.Properties.Settings.MoonProConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
|
||||||
<add name="SteamWare.Properties.Settings.DbConfConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
|
<add name="SteamWare.Properties.Settings.DbConfConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
|
||||||
<add name="ErrorLog" connectionString="Data Source=SQL2016DEV;Initial Catalog=Elmah;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
|
<add name="ErrorLog" connectionString="Data Source=SQL2016DEV;Initial Catalog=Elmah;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
|
||||||
<add name="MapoDb.Properties.Settings.MoonPro_FluxDataConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_FluxData;Persist Security Info=True;User ID=sa;Password=keyhammer16;TrustServerCertificate=True" providerName="System.Data.SqlClient" />
|
<add name="MapoDb.Properties.Settings.MoonPro_FluxDataConnectionString"
|
||||||
|
connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_FluxData;Persist Security Info=True;User ID=sa;Password=keyhammer16;TrustServerCertificate=True"
|
||||||
|
providerName="System.Data.SqlClient" />
|
||||||
</connectionStrings>
|
</connectionStrings>
|
||||||
<runtime>
|
<runtime>
|
||||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||||
|
|||||||
@@ -36,8 +36,8 @@
|
|||||||
<package id="SharpCompress" version="0.38.0" targetFramework="net462" />
|
<package id="SharpCompress" version="0.38.0" targetFramework="net462" />
|
||||||
<package id="SharpZipLib" version="1.4.2" targetFramework="net462" />
|
<package id="SharpZipLib" version="1.4.2" targetFramework="net462" />
|
||||||
<package id="StackExchange.Redis" version="2.8.0" targetFramework="net462" />
|
<package id="StackExchange.Redis" version="2.8.0" targetFramework="net462" />
|
||||||
<package id="SteamWare" version="5.4.2509.1715" targetFramework="net462" />
|
<package id="SteamWare" version="5.3.2311.2908" targetFramework="net462" />
|
||||||
<package id="SteamWare.Logger" version="5.4.2509.1715" targetFramework="net462" />
|
<package id="SteamWare.Logger" version="5.3.2311.2908" targetFramework="net462" />
|
||||||
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
|
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
|
||||||
<package id="System.Configuration.ConfigurationManager" version="8.0.0" targetFramework="net462" />
|
<package id="System.Configuration.ConfigurationManager" version="8.0.0" targetFramework="net462" />
|
||||||
<package id="System.Diagnostics.PerformanceCounter" version="8.0.0" targetFramework="net462" />
|
<package id="System.Diagnostics.PerformanceCounter" version="8.0.0" targetFramework="net462" />
|
||||||
|
|||||||
@@ -97,14 +97,14 @@
|
|||||||
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
|
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\StackExchange.Redis.2.8.0\lib\net461\StackExchange.Redis.dll</HintPath>
|
<HintPath>..\packages\StackExchange.Redis.2.8.0\lib\net461\StackExchange.Redis.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="SteamWare.IO, Version=5.4.2509.1715, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="SteamWare.IO, Version=5.3.2311.2908, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\SteamWare.IO.5.4.2509.1715\lib\net462\SteamWare.IO.dll</HintPath>
|
<HintPath>..\packages\SteamWare.IO.5.3.2311.2908\lib\net462\SteamWare.IO.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="SteamWare.Logger, Version=5.4.2509.1715, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="SteamWare.Logger, Version=5.3.2311.2908, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\SteamWare.Logger.5.4.2509.1715\lib\net462\SteamWare.Logger.dll</HintPath>
|
<HintPath>..\packages\SteamWare.Logger.5.3.2311.2908\lib\net462\SteamWare.Logger.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="SteamWare.Reports, Version=5.4.2509.1715, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="SteamWare.Reports, Version=5.3.2311.2908, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\SteamWare.Reports.5.4.2509.1715\lib\net462\SteamWare.Reports.dll</HintPath>
|
<HintPath>..\packages\SteamWare.Reports.5.3.2311.2908\lib\net462\SteamWare.Reports.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System">
|
<Reference Include="System">
|
||||||
<HintPath>..\..\..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.2\System.dll</HintPath>
|
<HintPath>..\..\..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.2\System.dll</HintPath>
|
||||||
|
|||||||
@@ -19,9 +19,9 @@
|
|||||||
<package id="SharpCompress" version="0.38.0" targetFramework="net462" />
|
<package id="SharpCompress" version="0.38.0" targetFramework="net462" />
|
||||||
<package id="SharpZipLib" version="1.4.2" targetFramework="net462" />
|
<package id="SharpZipLib" version="1.4.2" targetFramework="net462" />
|
||||||
<package id="StackExchange.Redis" version="2.8.0" targetFramework="net462" />
|
<package id="StackExchange.Redis" version="2.8.0" targetFramework="net462" />
|
||||||
<package id="SteamWare.IO" version="5.4.2509.1715" targetFramework="net462" />
|
<package id="SteamWare.IO" version="5.3.2311.2908" targetFramework="net462" />
|
||||||
<package id="SteamWare.Logger" version="5.4.2509.1715" targetFramework="net462" />
|
<package id="SteamWare.Logger" version="5.3.2311.2908" targetFramework="net462" />
|
||||||
<package id="SteamWare.Reports" version="5.4.2509.1715" targetFramework="net462" />
|
<package id="SteamWare.Reports" version="5.3.2311.2908" targetFramework="net462" />
|
||||||
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
|
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
|
||||||
<package id="System.Diagnostics.PerformanceCounter" version="8.0.0" targetFramework="net462" />
|
<package id="System.Diagnostics.PerformanceCounter" version="8.0.0" targetFramework="net462" />
|
||||||
<package id="System.IO.Compression" version="4.3.0" targetFramework="net462" />
|
<package id="System.IO.Compression" version="4.3.0" targetFramework="net462" />
|
||||||
|
|||||||
+180
-195
File diff suppressed because it is too large
Load Diff
@@ -136,11 +136,11 @@
|
|||||||
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
|
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\StackExchange.Redis.2.8.0\lib\net461\StackExchange.Redis.dll</HintPath>
|
<HintPath>..\packages\StackExchange.Redis.2.8.0\lib\net461\StackExchange.Redis.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="SteamWare, Version=5.4.2509.1715, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="SteamWare, Version=5.3.2311.2908, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\SteamWare.5.4.2509.1715\lib\net462\SteamWare.dll</HintPath>
|
<HintPath>..\packages\SteamWare.5.3.2311.2908\lib\net462\SteamWare.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="SteamWare.Logger, Version=5.4.2509.1715, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="SteamWare.Logger, Version=5.3.2311.2908, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\SteamWare.Logger.5.4.2509.1715\lib\net462\SteamWare.Logger.dll</HintPath>
|
<HintPath>..\packages\SteamWare.Logger.5.3.2311.2908\lib\net462\SteamWare.Logger.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||||
|
|||||||
+23
-8
@@ -5,14 +5,29 @@
|
|||||||
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
|
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
|
||||||
</configSections>
|
</configSections>
|
||||||
<connectionStrings>
|
<connectionStrings>
|
||||||
<add name="MapoDb.Properties.Settings.MoonProConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16; TrustServerCertificate=True;" providerName="System.Data.SqlClient" />
|
<add name="MapoDb.Properties.Settings.MoonProConnectionString"
|
||||||
<add name="MapoDb.Properties.Settings.MoonPro_IS_ConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_IS_Donati;Persist Security Info=True;User ID=sa;Password=keyhammer16; TrustServerCertificate=True;" providerName="System.Data.SqlClient" />
|
connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16; TrustServerCertificate=True;"
|
||||||
<add name="MapoDb.Properties.Settings.C_TRACKConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=C_TRACK;Persist Security Info=True;User ID=sa;Password=keyhammer16; TrustServerCertificate=True;" providerName="System.Data.SqlClient" />
|
providerName="System.Data.SqlClient" />
|
||||||
<add name="MapoDb.Properties.Settings.MoonPro_ES3ConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_ES3;Persist Security Info=True;User ID=sa;Password=keyhammer16; TrustServerCertificate=True;" providerName="System.Data.SqlClient" />
|
<add name="MapoDb.Properties.Settings.MoonPro_IS_ConnectionString"
|
||||||
<add name="MapoModel" connectionString="data source=SQL2016DEV;initial catalog=MoonPro;persist security info=True;user id=sa; password=keyhammer16; MultipleActiveResultSets=True; App=EntityFramework; TrustServerCertificate=True;" providerName="System.Data.SqlClient" />
|
connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_IS_Donati;Persist Security Info=True;User ID=sa;Password=keyhammer16; TrustServerCertificate=True;"
|
||||||
<add name="MapoDb.Properties.Settings.MoonPro_IS_ArcaConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_IS_EdilChim;Persist Security Info=True;User ID=sa;Password=keyhammer16; TrustServerCertificate=True;" providerName="System.Data.SqlClient" />
|
providerName="System.Data.SqlClient" />
|
||||||
<add name="MapoDb.Properties.Settings.MoonPro_MAGConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_MAG;Persist Security Info=True;User ID=sa;Password=keyhammer16; TrustServerCertificate=True;" providerName="System.Data.SqlClient" />
|
<add name="MapoDb.Properties.Settings.C_TRACKConnectionString"
|
||||||
<add name="MapoDb.Properties.Settings.MoonPro_FluxDataConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_FluxData;Persist Security Info=True;User ID=sa;Password=keyhammer16;TrustServerCertificate=True;" providerName="System.Data.SqlClient" />
|
connectionString="Data Source=SQL2016DEV;Initial Catalog=C_TRACK;Persist Security Info=True;User ID=sa;Password=keyhammer16; TrustServerCertificate=True;"
|
||||||
|
providerName="System.Data.SqlClient" />
|
||||||
|
<add name="MapoDb.Properties.Settings.MoonPro_ES3ConnectionString"
|
||||||
|
connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_ES3;Persist Security Info=True;User ID=sa;Password=keyhammer16; TrustServerCertificate=True;"
|
||||||
|
providerName="System.Data.SqlClient" />
|
||||||
|
<add name="MapoModel" connectionString="data source=SQL2016DEV;initial catalog=MoonPro;persist security info=True;user id=sa; password=keyhammer16; MultipleActiveResultSets=True; App=EntityFramework; TrustServerCertificate=True;"
|
||||||
|
providerName="System.Data.SqlClient" />
|
||||||
|
<add name="MapoDb.Properties.Settings.MoonPro_IS_ArcaConnectionString"
|
||||||
|
connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_IS_EdilChim;Persist Security Info=True;User ID=sa;Password=keyhammer16; TrustServerCertificate=True;"
|
||||||
|
providerName="System.Data.SqlClient" />
|
||||||
|
<add name="MapoDb.Properties.Settings.MoonPro_MAGConnectionString"
|
||||||
|
connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_MAG;Persist Security Info=True;User ID=sa;Password=keyhammer16; TrustServerCertificate=True;"
|
||||||
|
providerName="System.Data.SqlClient" />
|
||||||
|
<add name="MapoDb.Properties.Settings.MoonPro_FluxDataConnectionString"
|
||||||
|
connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_FluxData;Persist Security Info=True;User ID=sa;Password=keyhammer16;TrustServerCertificate=True;"
|
||||||
|
providerName="System.Data.SqlClient" />
|
||||||
</connectionStrings>
|
</connectionStrings>
|
||||||
<startup>
|
<startup>
|
||||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
|
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
|
||||||
|
|||||||
@@ -24,8 +24,8 @@
|
|||||||
<package id="SharpCompress" version="0.38.0" targetFramework="net462" />
|
<package id="SharpCompress" version="0.38.0" targetFramework="net462" />
|
||||||
<package id="SharpZipLib" version="1.4.2" targetFramework="net462" />
|
<package id="SharpZipLib" version="1.4.2" targetFramework="net462" />
|
||||||
<package id="StackExchange.Redis" version="2.8.0" targetFramework="net462" />
|
<package id="StackExchange.Redis" version="2.8.0" targetFramework="net462" />
|
||||||
<package id="SteamWare" version="5.4.2509.1715" targetFramework="net462" />
|
<package id="SteamWare" version="5.3.2311.2908" targetFramework="net462" />
|
||||||
<package id="SteamWare.Logger" version="5.4.2509.1715" targetFramework="net462" />
|
<package id="SteamWare.Logger" version="5.3.2311.2908" targetFramework="net462" />
|
||||||
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
|
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
|
||||||
<package id="System.Collections" version="4.3.0" targetFramework="net462" />
|
<package id="System.Collections" version="4.3.0" targetFramework="net462" />
|
||||||
<package id="System.Diagnostics.PerformanceCounter" version="8.0.0" targetFramework="net462" />
|
<package id="System.Diagnostics.PerformanceCounter" version="8.0.0" targetFramework="net462" />
|
||||||
|
|||||||
+2
-2
@@ -389,12 +389,12 @@ namespace MapoSDK
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// DataOra ultima lettura
|
/// DataOra ultima lettura
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public DateTime lastRead { get; set; } = DateTime.Now.AddMinutes(-5);
|
public DateTime lastRead { get; set; } = DateTime.Now.AddHours(-1);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// DataOra ultima richiesta scrittura
|
/// DataOra ultima richiesta scrittura
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public DateTime lastRequest { get; set; } = DateTime.Now.AddMinutes(-5);
|
public DateTime lastRequest { get; set; } = DateTime.Now.AddDays(-1);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// NOME item
|
/// NOME item
|
||||||
|
|||||||
Reference in New Issue
Block a user