Egalware/MoonPro.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update con fix x speedup vari

Browse Source
This commit is contained in:
Samuele E. Locatelli
2019-03-26 12:04:27 +01:00
parent 44d2d4b3e9
commit 02b41b4314
11 changed files with 119 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -18,7 +18,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=1176']) {
withEnv(['NEXT_BUILD_NUMBER=1179']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
MP-TAB/Controlli.aspx
+15 -1
View File
@@ -13,8 +13,22 @@
<div class="col-12 col-md-8 col-lg-9 col-xl-10">
<div class="my-2">
<uc1:mod_dettMacchina ID="mod_dettMacchina1" runat="server" />
</div>
</div>
<uc1:mod_controlliProd runat="server" ID="mod_controlliProd" />
<asp:UpdateProgress ID="updtRicerca" runat="server" DisplayAfter="10" DynamicLayout="true">
<ProgressTemplate>
<div id="progress_back">
</div>
<div id="progress_top" class="text-center text-warning align-middle">
<i class="fa fa-spinner fa-pulse"></i>&nbsp;
<b>ELABORAZIONE IN CORSO</b>
<i class="fa fa-spinner fa-pulse"></i>&nbsp;
<div class="progress">
<div class="progress-bar progress-bar-striped bg-success progress-bar-animated" role="progressbar" aria-valuenow="75" aria-valuemin="0" aria-valuemax="100" style="width: 75%"></div>
</div>
</div>
</ProgressTemplate>
</asp:UpdateProgress>
<uc1:mod_elencoControlli runat="server" ID="mod_elencoControlli" />
</div>
<div class="col-12 col-md-4 col-lg-3 col-xl-2">
MP-TAB/Controlli.aspx.designer.cs
Generated
+9
View File
@@ -30,6 +30,15 @@ namespace MoonProTablet {
/// </remarks>
protected global::MoonProTablet.WebUserControls.mod_controlliProd mod_controlliProd;
/// <summary>
/// Controllo updtRicerca.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.UpdateProgress updtRicerca;
/// <summary>
/// Controllo mod_elencoControlli.
/// </summary>
MP-TAB/DettaglioMacchina.aspx.cs
-8
View File
@@ -24,14 +24,6 @@ namespace MoonProTablet
* --exec dbo.stp_RC_getLast @IdxMacchina=N'SIMUL_03'
* --exec dbo.stp_LMJ_getByTipo @TipoLink=N'DetMacc'
* --exec dbo.stp_LMJ_getByTipo @TipoLink=N'DetMacc'
*
*
*
*
*
*
*
*
*
* */
MP-TAB/Scarti.aspx
+16 -2
View File
@@ -14,8 +14,22 @@
<div class="col-12 col-md-8 col-lg-9 col-xl-10">
<div class="my-2">
<uc6:mod_dettMacchina ID="mod_dettMacchina1" runat="server" />
</div>
<uc3:mod_regScarti runat="server" ID="mod_regScarti1" />
</div>
<uc3:mod_regScarti runat="server" ID="mod_regScarti1" />
<asp:UpdateProgress ID="updtRicerca" runat="server" DisplayAfter="10" DynamicLayout="true">
<ProgressTemplate>
<div id="progress_back">
</div>
<div id="progress_top" class="text-center text-warning align-middle">
<i class="fa fa-spinner fa-pulse"></i>&nbsp;
<b>ELABORAZIONE IN CORSO</b>
<i class="fa fa-spinner fa-pulse"></i>&nbsp;
<div class="progress">
<div class="progress-bar progress-bar-striped bg-success progress-bar-animated" role="progressbar" aria-valuenow="75" aria-valuemin="0" aria-valuemax="100" style="width: 75%"></div>
</div>
</div>
</ProgressTemplate>
</asp:UpdateProgress>
<uc1:mod_elencoScarti runat="server" ID="mod_elencoScarti" />
</div>
<div class="col-12 col-md-4 col-lg-3 col-xl-2">
MP-TAB/Scarti.aspx.designer.cs
Generated
+9
View File
@@ -30,6 +30,15 @@ namespace MoonProTablet {
/// </remarks>
protected global::MoonProTablet.WebUserControls.mod_regScarti mod_regScarti1;
/// <summary>
/// Controllo updtRicerca.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.UpdateProgress updtRicerca;
/// <summary>
/// Controllo mod_elencoScarti.
/// </summary>
MP-TAB/Web.config
+1 -1
View File
@@ -54,7 +54,7 @@
<add key="MoonProConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
<add key="PermessiConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
<add key="UtenteCdcConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
<add key="VocabolarioConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro_Vocabolario;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
<add key="VocabolarioConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
<add key="DevicesConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
<add key="DevicesAuthConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
</appSettings>
MP-TAB/WebUserControls/mod_ODL.ascx
+1 -1
View File
@@ -42,7 +42,7 @@
<label class="sr-only" for="inlineFormInputGroup">Username</label>
<div class="input-group mb-2">
<div class="input-group-prepend">
<asp:TextBox runat="server" ID="txtSearchODL" CssClass="form form-control bg-warning textCondens px-1" AutoPostBack="True" placeholder="cerca" Width="3em" OnTextChanged="txtSearchODL_TextChanged" />
<asp:TextBox runat="server" ID="txtSearchODL" CssClass="form form-control bg-warning text-dark textCondens pl-2 pr-1" AutoPostBack="True" placeholder="cerca" Width="3em" OnTextChanged="txtSearchODL_TextChanged" />
</div>
<asp:DropDownList runat="server" ID="ddlODL" DataSourceID="odsODL" DataTextField="label" DataValueField="value" CssClass="form-control btn-default textCondens" OnSelectedIndexChanged="ddlODL_SelectedIndexChanged" AutoPostBack="True">
</asp:DropDownList>
MP-TAB/WebUserControls/mod_confProd.ascx
+15 -13
View File
@@ -56,23 +56,25 @@
<div class="col-6 col-sm-3 pl-1 align-self-end font-weight-bold">
<asp:LinkButton runat="server" ID="lbtSalva" Visible="false" CssClass="btn btn-success text-light btn-lg btn-block" OnClick="lbtSalva_Click"><i class="fa fa-floppy-o"></i> CONFERMA</asp:LinkButton>
</div>
<div class="col-12">
<asp:UpdateProgress ID="updtRicerca" runat="server" DisplayAfter="10" DynamicLayout="true">
<ProgressTemplate>
<div id="progress_back">
</div>
<div id="progress_top" class="text-center text-warning align-middle">
<i class="fa fa-spinner fa-pulse"></i>&nbsp;
</div>
</div>
</div>
<div class="row textCondens">
<div class="col-12">
<asp:UpdateProgress ID="updtRicerca" runat="server" DisplayAfter="10" DynamicLayout="true">
<ProgressTemplate>
<div id="progress_back">
</div>
<div id="progress_top" class="text-center text-warning align-middle">
<i class="fa fa-spinner fa-pulse"></i>&nbsp;
<b>ELABORAZIONE IN CORSO</b>
<i class="fa fa-spinner fa-pulse"></i>&nbsp;
<i class="fa fa-spinner fa-pulse"></i>&nbsp;
<div class="progress">
<div class="progress-bar progress-bar-striped bg-success progress-bar-animated" role="progressbar" aria-valuenow="75" aria-valuemin="0" aria-valuemax="100" style="width: 75%"></div>
</div>
</div>
</ProgressTemplate>
</asp:UpdateProgress>
</div>
</div>
</div>
</ProgressTemplate>
</asp:UpdateProgress>
</div>
</div>
<div class="row textCondens">
MP-TAB/WebUserControls/mod_confProd.ascx.cs
+37 -15
View File
@@ -1,7 +1,6 @@
using MapoDb;
using SteamWare;
using System;
using System.Threading;
using System.Web.UI;
namespace MoonProTablet.WebUserControls
@@ -270,21 +269,48 @@ namespace MoonProTablet.WebUserControls
get
{
bool answ = true;
// carico i dati preliminari: ODL
int idxOdl = 0; // userò ODL del turno
try
{
idxOdl = DataLayer.obj.taODL.getByMacchinaAperto(idxMacchina)[0].IdxODL;
}
catch
{
logger.lg.scriviLog(string.Format("Errore a recuperare ODL per la macchina {0}", idxMacchina), tipoLog.ERROR);
}
// se ODL > 0 è ok!!!
answ = (idxOdl > 0);
return answ;
}
}
/// <summary>
/// ODL correntemente sulla macchina
/// - cerca in Redis (TTL 5 sec)
/// - altrimenti recupera da DB...
/// </summary>
protected int idxOdl
{
get
{
// userò ODL del turno
int answ = 0;
// cerco da redis...
int.TryParse(DataLayer.currODL(idxMacchina, true), out answ);
#if false
string redKey = memLayer.ML.redHash($"ODL:{idxMacchina}");
string _idxOdl = memLayer.ML.getRSV(redKey);
if (_idxOdl != null && _idxOdl != "")
{
int.TryParse(_idxOdl, out answ);
}
else
{
try
{
answ = DataLayer.obj.taODL.getByMacchinaAperto(idxMacchina)[0].IdxODL;
memLayer.ML.setRSV(redKey, answ.ToString(), 5);
}
catch
{
logger.lg.scriviLog(string.Format("Errore a recuperare ODL per la macchina {0}", idxMacchina), tipoLog.ERROR);
}
}
#endif
return answ;
}
}
/// <summary>
/// idx macchina selezionata
/// </summary>
@@ -498,9 +524,5 @@ namespace MoonProTablet.WebUserControls
}
}
protected void lbtTest_Click(object sender, EventArgs e)
{
Thread.Sleep(3000);
}
}
}
MapoDb/DataLayer.cs
+15 -4
View File
@@ -1389,7 +1389,7 @@ namespace MapoDb
try
{
rCall = memLayer.ML.getRSV(currODLHash(idxMacchina));
if (rCall != "" && rCall != null)
if (rCall != null && rCall != "")
{
answ = rCall;
}
@@ -1414,11 +1414,22 @@ namespace MapoDb
public static string currODL(string idxMacchina, bool forceDb)
{
string answ = "";
// faccio comunque verifica se sia stato letto da poco il valore... x cui anceh a fronte di richeista lettura da DB per 3 sec tengo buono valore in cache redis...
string rKey = memLayer.ML.redHash($"ODL:{idxMacchina}");
string _idxOdl = memLayer.ML.getRSV(rKey);
if (forceDb)
{
answ = MapoDb.obj.currODL(idxMacchina);
// salvo in redis...
saveCurrODL(idxMacchina, answ);
if (_idxOdl != null && _idxOdl != "")
{
answ = _idxOdl;
}
else
{
answ = MapoDb.obj.currODL(idxMacchina);
// salvo in redis...
saveCurrODL(idxMacchina, answ);
memLayer.ML.setRSV(rKey, answ, 3);
}
}
else
{