Egalware/mapo-mono
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Data

Browse Source 
- Fix creazione stored + migration
- refresh appsettings.json
This commit is contained in:
Samuele Locatelli
2023-03-29 18:20:21 +02:00
parent 115a9c3cc3
commit 70dd210bb4
21 changed files with 43 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj
+1 -1
View File
@@ -6,7 +6,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Platforms>AnyCPU;x86;x64</Platforms>
<Version>1.2.2303.2917</Version>
<Version>1.2.2303.2918</Version>
</PropertyGroup>
<ItemGroup>
MP.MONO.ANALYZER/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>MAPO-MONO</i>
<h4>Version: 1.2.2303.2917</h4>
<h4>Version: 1.2.2303.2918</h4>
<br /> Release Note:
<ul>
<li>
MP.MONO.ANALYZER/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.2.2303.2917
1.2.2303.2918
MP.MONO.ANALYZER/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.2.2303.2917</version>
<version>1.2.2303.2918</version>
<url>http://nexus.steamware.net/repository/SWS/MP.MONO.ANALYZER/stable/LAST/MP.Mon.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/MP.MONO.ANALYZER/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
MP.MONO.DECODER/MP.MONO.DECODER.csproj
+1 -1
View File
@@ -6,7 +6,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Platforms>AnyCPU;x86;x64</Platforms>
<Version>1.2.2303.2917</Version>
<Version>1.2.2303.2918</Version>
</PropertyGroup>
<ItemGroup>
MP.MONO.DECODER/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>MAPO-MONO</i>
<h4>Version: 1.2.2303.2917</h4>
<h4>Version: 1.2.2303.2918</h4>
<br /> Release Note:
<ul>
<li>
MP.MONO.DECODER/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.2.2303.2917
1.2.2303.2918
MP.MONO.DECODER/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.2.2303.2917</version>
<version>1.2.2303.2918</version>
<url>http://nexus.steamware.net/repository/SWS/MP.MONO.DECODER/stable/LAST/MP.Mon.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/MP.MONO.DECODER/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
MP.MONO.DECODER/appsettings.json
+1 -1
View File
@@ -43,6 +43,6 @@
"BlinkCount": 3,
"DbSampleInt": 60,
"BlinkPeriodMSec": 2000,
"NumDay2Keep": 366
"NumDay2Keep": 365
}
}
MP.MONO.DECODER/appsettings.multiax.json
+4 -1
View File
@@ -39,6 +39,9 @@
"AlarmMode": "RawList",
"AlarmRegexp": "^{[\\d\\w\\:\\ \\.\\/\\(\\)]*}",
"BlinkCount": 10,
"DbSampleInt": 60
"DbSampleInt": 60,
//"AlarmLogActive": false,
"BlinkPeriodMSec": 2000,
"NumDay2Keep": 365
}
}
MP.MONO.DECODER/appsettings.office.json
+11 -1
View File
@@ -33,6 +33,16 @@
}
},
"OptPar": {
"AlarmMode": "RawList"
"AlarmLogActive": false,
"AlarmCleanPre": "",
"AlarmCleanPost": "",
"AlarmIgnoreEmpty": true,
"AlarmMode": "RawList",
"AlarmRegexp": "^{[\\d\\w\\:\\ \\.\\/\\(\\)]*}",
//"AlarmRegexp": "^{.*}",
"BlinkCount": 3,
"DbSampleInt": 60,
"BlinkPeriodMSec": 2000,
"NumDay2Keep": 365
}
}
MP.MONO.Data/SqlScripts/Stored/stp_paretoStatus.sql
+1 -10
View File
@@ -1,7 +1,3 @@
---- stored
--DELIMITER //
--GO
CREATE OR REPLACE PROCEDURE stp_paretoStatus(
IN machine_id INT,
IN dt_from DATETIME,
@@ -15,9 +11,4 @@ BEGIN
AND DtRif >= dt_from
AND DtRif <= dt_to
GROUP BY CodStatus;
END;
--//
--GO
--DELIMITER ;
--GO
END;
MP.MONO.Data/SqlScripts/Stored/stp_removeOldData.sql
+10 -16
View File
@@ -1,14 +1,11 @@
---- stored
--DELIMITER //
CREATE OR REPLACE PROCEDURE stp_removeOldData(
IN day_keep INT
)
READS SQL DATA
BEGIN
SET @adesso = ADDDATE(CURRENT_DATE(), INTERVAL -1 SECOND);
SET @dt_min = ADDDATE(CURRENT_DATE(), INTERVAL -day_keep DAY);
SET @adesso = ADDDATE(CURRENT_TIMESTAMP, INTERVAL -1 SECOND);
SET @dt_min = ADDDATE(CURRENT_TIMESTAMP, INTERVAL -day_keep DAY);
START TRANSACTION;
@@ -17,36 +14,36 @@ BEGIN
FROM AlarmLog
WHERE DtRif <= @dt_min;
INSERT INTO TaskExec(DtRif, CodTask, Result)
SELECT CURRENT_DATE() AS DtRif
SELECT CURRENT_TIMESTAMP AS DtRif
,'Cleanup AlarmLog' AS CodTask
,'Deleted' + ROW_COUNT() +' rows' AS Result;
,CONCAT('Deleted ', CAST(ROW_COUNT() AS NCHAR), ' rows') AS Result;
-- AlarmRec
DELETE
FROM AlarmRec
WHERE DtStart <= @dt_min;
INSERT INTO TaskExec(DtRif, CodTask, Result)
SELECT CURRENT_DATE() AS DtRif
SELECT CURRENT_TIMESTAMP AS DtRif
,'Cleanup AlarmRec' AS CodTask
,'Deleted' + ROW_COUNT() +' rows' AS Result;
,CONCAT('Deleted ', CAST(ROW_COUNT() AS NCHAR), ' rows') AS Result;
-- DataLog
DELETE
FROM DataLog
WHERE DtRif <= @dt_min;
INSERT INTO TaskExec(DtRif, CodTask, Result)
SELECT CURRENT_DATE() AS DtRif
SELECT CURRENT_TIMESTAMP AS DtRif
,'Cleanup DataLog' AS CodTask
,'Deleted' + ROW_COUNT() +' rows' AS Result;
,CONCAT('Deleted ', CAST(ROW_COUNT() AS NCHAR), ' rows') AS Result;
-- StatusLog
DELETE
FROM StatusLog
WHERE DtRif <= @dt_min;
INSERT INTO TaskExec(DtRif, CodTask, Result)
SELECT CURRENT_DATE() AS DtRif
SELECT CURRENT_TIMESTAMP AS DtRif
,'Cleanup StatusLog' AS CodTask
,'Deleted' + ROW_COUNT() +' rows' AS Result;
,CONCAT('Deleted ', CAST(ROW_COUNT() AS NCHAR), ' rows') AS Result;
COMMIT;
@@ -57,6 +54,3 @@ BEGIN
WHERE DtRif > @adesso;
END
--//
--DELIMITER ;
MP.MONO.SIM/MP.MONO.SIM.csproj
+1 -1
View File
@@ -6,7 +6,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Platforms>AnyCPU;x86;x64</Platforms>
<Version>1.2.2303.2917</Version>
<Version>1.2.2303.2918</Version>
</PropertyGroup>
<ItemGroup>
MP.MONO.SIM/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>MAPO-MONO</i>
<h4>Version: 1.2.2303.2917</h4>
<h4>Version: 1.2.2303.2918</h4>
<br /> Release Note:
<ul>
<li>
MP.MONO.SIM/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.2.2303.2917
1.2.2303.2918
MP.MONO.SIM/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.2.2303.2917</version>
<version>1.2.2303.2918</version>
<url>http://nexus.steamware.net/repository/SWS/MP.MONO.SIM/stable/LAST/MP.Mon.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/MP.MONO.SIM/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
MP.MONO.UI/MP.MONO.UI.csproj
+1 -1
View File
@@ -5,7 +5,7 @@
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Platforms>AnyCPU;x86;x64</Platforms>
<Version>1.2.2303.2917</Version>
<Version>1.2.2303.2918</Version>
</PropertyGroup>
<ItemGroup>
MP.MONO.UI/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>MAPO-MONO</i>
<h4>Version: 1.2.2303.2917</h4>
<h4>Version: 1.2.2303.2918</h4>
<br /> Release Note:
<ul>
<li>
MP.MONO.UI/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.2.2303.2917
1.2.2303.2918
MP.MONO.UI/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.2.2303.2917</version>
<version>1.2.2303.2918</version>
<url>http://nexus.steamware.net/repository/SWS/MP.MONO.UI/stable/LAST/MP.Mon.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/MP.MONO.UI/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>