removed transaction groups and turned jam area to take data directly from db

This commit is contained in:
Salijoghli 2025-09-19 12:56:11 +04:00
parent e5ba6f43ec
commit ec74fad8cb
67 changed files with 174 additions and 370 deletions

View File

@ -1,20 +0,0 @@
SELECT
Total_Jam,
Inbound_jam,
Sorter_jam,
1 AS Total_perc,
Inbound_jam / Total_Jam AS Inbound_perc,
Sorter_jam / Total_Jam AS Sorter_perc,
Startstamp,
Endtstamp
FROM
(
SELECT
MIN(jam_area.t_stamp) AS Startstamp,
MAX(jam_area.t_stamp) AS Endtstamp,
SUM(IFNULL(Inbound_jam, 0) + IFNULL(Sorter_jam, 0)) AS Total_Jam,
SUM(jam_area.Inbound_jam = 1) AS Inbound_jam,
SUM(jam_area.Sorter_jam = 1) AS Sorter_jam
FROM jam_area
WHERE jam_area.t_stamp BETWEEN :starttime AND :endtime
) AS basajam;

View File

@ -0,0 +1,50 @@
SELECT
base.Total_Jam,
base.Inbound_jam,
base.Sorter_jam,
base.Startstamp,
base.Endtstamp,
1 AS Total_perc,
base.Inbound_jam / NULLIF(base.Total_Jam,0) AS Inbound_perc,
base.Sorter_jam / NULLIF(base.Total_Jam,0) AS Sorter_perc
FROM (
SELECT
MIN(a.eventtime) AS Startstamp,
MAX(COALESCE(c.eventtime, a.eventtime)) AS Endtstamp,
SUM(a.category = 'Inbound_jam') AS Inbound_jam,
SUM(a.category = 'Sorter_jam') AS Sorter_jam,
SUM(a.category IN ('Inbound_jam','Sorter_jam')) AS Total_Jam
FROM (
SELECT
ae.id,
ae.eventtime,
ae.eventid,
ae.displaypath AS device,
m.category
FROM alarm_events ae
JOIN (
SELECT 'UL15_1_TPE1' AS device, 'Inbound_jam' AS category UNION ALL
SELECT 'UL14_1_TPE1', 'Inbound_jam' UNION ALL
SELECT 'PS3_1_TPE1', 'Inbound_jam' UNION ALL
SELECT 'PS3_1_TPE2', 'Inbound_jam' UNION ALL
SELECT 'PS3_1_TPE3', 'Inbound_jam' UNION ALL
SELECT 'PS3_2_TPE1', 'Inbound_jam' UNION ALL
SELECT 'PS3_4_TPE1', 'Inbound_jam' UNION ALL
SELECT 'PS3_8_TPE1', 'Inbound_jam' UNION ALL
SELECT 'PS3_10_TPE1', 'Inbound_jam' UNION ALL
SELECT 'PS3_12_TPE1', 'Sorter_jam'
) AS m
ON ae.displaypath = m.device
WHERE ae.eventtype = 0
AND ae.eventtime BETWEEN :starttime AND :endtime
AND ae.displaypath NOT LIKE '%System Startup%'
AND ae.source NOT LIKE '%System Startup%'
) AS a
LEFT JOIN (
SELECT eventid, MIN(eventtime) AS eventtime
FROM alarm_events
WHERE eventtype = 1
GROUP BY eventid
) AS c
ON a.eventid = c.eventid
) AS base;

View File

@ -1,15 +0,0 @@
SELECT
roundtime,
Inbound_jam,
Sorter_jam
FROM
(
SELECT
SUM(jam_area.Inbound_jam = 1) AS Inbound_jam,
SUM(jam_area.Sorter_jam = 1) AS Sorter_jam,
FROM_UNIXTIME(CEIL(UNIX_TIMESTAMP(jam_area.t_stamp) / 600) * 600) AS roundtime
FROM jam_area
WHERE jam_area.t_stamp BETWEEN :starttime AND :endtime
GROUP BY FROM_UNIXTIME(CEIL(UNIX_TIMESTAMP(jam_area.t_stamp) / 600) * 600)
ORDER BY roundtime ASC
) AS okeyjam;

View File

@ -0,0 +1,38 @@
SELECT
roundtime,
Inbound_jam,
Sorter_jam
FROM (
SELECT
FROM_UNIXTIME(CEIL(UNIX_TIMESTAMP(a.eventtime) / 600) * 600) AS roundtime,
SUM(a.category = 'Inbound_jam') AS Inbound_jam,
SUM(a.category = 'Sorter_jam') AS Sorter_jam
FROM (
SELECT
ae.eventtime,
m.category
FROM alarm_events ae
JOIN (
-- Inbound devices
SELECT 'UL15_1_TPE1' AS device, 'Inbound_jam' AS category UNION ALL
SELECT 'UL14_1_TPE1', 'Inbound_jam' UNION ALL
SELECT 'PS3_1_TPE1', 'Inbound_jam' UNION ALL
SELECT 'PS3_1_TPE2', 'Inbound_jam' UNION ALL
SELECT 'PS3_1_TPE3', 'Inbound_jam' UNION ALL
SELECT 'PS3_2_TPE1', 'Inbound_jam' UNION ALL
SELECT 'PS3_4_TPE1', 'Inbound_jam' UNION ALL
SELECT 'PS3_8_TPE1', 'Inbound_jam' UNION ALL
SELECT 'PS3_10_TPE1', 'Inbound_jam' UNION ALL
-- Sorter devices
SELECT 'PS3_12_TPE1', 'Sorter_jam'
) AS m
ON ae.displaypath = m.device
WHERE ae.eventtype = 0
AND ae.eventtime BETWEEN :starttime AND :endtime
AND ae.displaypath NOT LIKE '%System Startup%'
AND ae.source NOT LIKE '%System Startup%'
) AS a
GROUP BY FROM_UNIXTIME(CEIL(UNIX_TIMESTAMP(a.eventtime) / 600) * 600)
ORDER BY roundtime ASC
) AS okeyjam;

View File

@ -10,8 +10,8 @@
"attributes": {
"lastModification": {
"actor": "admin",
"timestamp": "2025-09-18T19:21:10Z"
"timestamp": "2025-09-18T19:37:21Z"
},
"lastModificationSignature": "c5b28aa9e82e892f7a7a53b57c2b3eb9edc32956173075f5abc367616d69da2c"
"lastModificationSignature": "a59741c6f4844901815e6d950b0dbdf1263034263340da919f0e85a01be19f7b"
}
}

View File

@ -1,16 +0,0 @@
{
"scope": "G",
"version": 1,
"restricted": false,
"overridable": true,
"files": [
"data.bin"
],
"attributes": {
"lastModification": {
"actor": "admin",
"timestamp": "2025-09-02T08:30:35Z"
},
"lastModificationSignature": "41a403289a580f385f8cbe095a95a382d67c51c99ce56e0d2e02aa6fae652345"
}
}

View File

@ -1,16 +0,0 @@
{
"scope": "G",
"version": 1,
"restricted": false,
"overridable": true,
"files": [
"data.bin"
],
"attributes": {
"lastModification": {
"actor": "admin",
"timestamp": "2025-09-02T08:30:32Z"
},
"lastModificationSignature": "094dc03f39033b18e0453e94758df8d4b14d8d88f4a39ee4ea986a242c803e98"
}
}

View File

@ -1,16 +0,0 @@
{
"scope": "G",
"version": 1,
"restricted": false,
"overridable": true,
"files": [
"data.bin"
],
"attributes": {
"lastModification": {
"actor": "admin",
"timestamp": "2025-09-02T08:29:56Z"
},
"lastModificationSignature": "63c8c778795b4a55c4cc0c5f8327f4ac609b16f1ab3eb8d1e4985498361f5fda"
}
}

View File

@ -1,16 +0,0 @@
{
"scope": "G",
"version": 1,
"restricted": false,
"overridable": true,
"files": [
"data.bin"
],
"attributes": {
"lastModification": {
"actor": "admin",
"timestamp": "2025-09-02T08:29:48Z"
},
"lastModificationSignature": "d29179d61a482afc995e092612b97055accf3bf80a57bf4f9f27d535a872bb8c"
}
}

View File

@ -1,16 +0,0 @@
{
"scope": "G",
"version": 1,
"restricted": false,
"overridable": true,
"files": [
"data.bin"
],
"attributes": {
"lastModification": {
"actor": "admin",
"timestamp": "2025-09-02T08:30:00Z"
},
"lastModificationSignature": "391b5e8dcfca2b99baa954620327bb9f13ea820e4caa21ca6616eff1cabf27a7"
}
}

View File

@ -1,16 +0,0 @@
{
"scope": "G",
"version": 1,
"restricted": false,
"overridable": true,
"files": [
"data.bin"
],
"attributes": {
"lastModification": {
"actor": "admin",
"timestamp": "2025-09-02T08:31:00Z"
},
"lastModificationSignature": "9d5e9d81ee1ebb272c988675486f24aefc86afb82648bdf2473ea3238982a494"
}
}

View File

@ -1,16 +0,0 @@
{
"scope": "G",
"version": 1,
"restricted": false,
"overridable": true,
"files": [
"data.bin"
],
"attributes": {
"lastModification": {
"actor": "admin",
"timestamp": "2025-09-02T08:30:55Z"
},
"lastModificationSignature": "224e6676160856b0b87c20ad68047c78271b98307a8e271af1809396d0b75fdb"
}
}

View File

@ -1,16 +0,0 @@
{
"scope": "G",
"version": 1,
"restricted": false,
"overridable": true,
"files": [
"data.bin"
],
"attributes": {
"lastModification": {
"actor": "admin",
"timestamp": "2025-09-02T08:30:47Z"
},
"lastModificationSignature": "a041b0503eefcd2b959447c731b0331b5c16e9c77692c8284d9c46e14891f7ce"
}
}

View File

@ -1,16 +0,0 @@
{
"scope": "G",
"version": 1,
"restricted": false,
"overridable": true,
"files": [
"data.bin"
],
"attributes": {
"lastModification": {
"actor": "admin",
"timestamp": "2025-09-02T08:27:56Z"
},
"lastModificationSignature": "661059595bfa76f3d3a19d4a9c311a0daf1f3c91714e516f7904c58df8bcac03"
}
}

View File

@ -1,16 +0,0 @@
{
"scope": "G",
"version": 1,
"restricted": false,
"overridable": true,
"files": [
"data.bin"
],
"attributes": {
"lastModification": {
"actor": "admin",
"timestamp": "2025-09-02T08:29:04Z"
},
"lastModificationSignature": "f941436502e27d910152164f23af2a711becb9ff68d9c1101fb0208a79e42dee"
}
}

View File

@ -1,16 +0,0 @@
{
"scope": "G",
"version": 1,
"restricted": false,
"overridable": true,
"files": [
"data.bin"
],
"attributes": {
"lastModification": {
"actor": "admin",
"timestamp": "2025-09-02T08:28:16Z"
},
"lastModificationSignature": "8227a8e77baacf5719b084a2f5fa7ffe9e096654c092e1dcf219bbab22caa18b"
}
}

View File

@ -1,16 +0,0 @@
{
"scope": "G",
"version": 1,
"restricted": false,
"overridable": true,
"files": [
"data.bin"
],
"attributes": {
"lastModification": {
"actor": "admin",
"timestamp": "2025-09-02T08:26:03Z"
},
"lastModificationSignature": "8c5b0923e2d27c76fbe01aad0e0daef3288cfb90fa30e9b4473833c5fe96d6cc"
}
}

View File

@ -1,16 +0,0 @@
{
"scope": "G",
"version": 1,
"restricted": false,
"overridable": true,
"files": [
"data.bin"
],
"attributes": {
"lastModification": {
"actor": "admin",
"timestamp": "2025-09-02T08:26:41Z"
},
"lastModificationSignature": "4932f70924bc0ad9d1074e6a35199a7c9f018a78a9567a88a7cfd5172fe123e7"
}
}

View File

@ -1,16 +0,0 @@
{
"scope": "G",
"version": 1,
"restricted": false,
"overridable": true,
"files": [
"data.bin"
],
"attributes": {
"lastModification": {
"actor": "admin",
"timestamp": "2025-09-02T08:27:17Z"
},
"lastModificationSignature": "0aa3fc131cacca44d91e99e1c5334e2570ad9b45280f39f43216cd7e62e3d048"
}
}

View File

@ -1,16 +0,0 @@
{
"scope": "G",
"version": 1,
"restricted": false,
"overridable": true,
"files": [
"data.bin"
],
"attributes": {
"lastModification": {
"actor": "admin",
"timestamp": "2025-09-02T08:28:31Z"
},
"lastModificationSignature": "d8c2310145547ba9561ab079092210b5dde35aaf8599badb3ae691bd3d0d9c7b"
}
}

View File

@ -1,16 +0,0 @@
{
"scope": "G",
"version": 1,
"restricted": false,
"overridable": true,
"files": [
"data.bin"
],
"attributes": {
"lastModification": {
"actor": "admin",
"timestamp": "2025-09-02T08:28:43Z"
},
"lastModificationSignature": "ce52196410e48c505cb1f5d16c6ae84ced3f927650d7a03b473a5e6a82c66cd9"
}
}

View File

@ -1,16 +0,0 @@
{
"scope": "G",
"version": 1,
"restricted": false,
"overridable": true,
"files": [
"data.bin"
],
"attributes": {
"lastModification": {
"actor": "admin",
"timestamp": "2025-09-02T08:29:00Z"
},
"lastModificationSignature": "fe0d39e2562f8535b54ac5e7e608e2b527d42d5d4fb8bfdb92fe4f0bc60944cb"
}
}

View File

@ -1,16 +0,0 @@
{
"scope": "G",
"version": 1,
"restricted": false,
"overridable": true,
"files": [
"data.bin"
],
"attributes": {
"lastModification": {
"actor": "admin",
"timestamp": "2025-09-02T08:29:15Z"
},
"lastModificationSignature": "c5be6f37dfebf70d1631febedb0cbbb8ad836852283e9b6e9454ba49be8c19c2"
}
}

View File

@ -1,16 +0,0 @@
{
"scope": "G",
"version": 1,
"restricted": false,
"overridable": true,
"files": [
"data.bin"
],
"attributes": {
"lastModification": {
"actor": "admin",
"timestamp": "2025-09-02T08:26:03Z"
},
"lastModificationSignature": "7879c312980f3c128fa3ee7f8b78c4eff5bab6497bc71dcb81852b0273b3edfd"
}
}

View File

@ -1,20 +1,50 @@
SELECT
Total_Jam,
Inbound_jam,
Sorter_jam,
base.Total_Jam,
base.Inbound_jam,
base.Sorter_jam,
base.Startstamp,
base.Endtstamp,
1 AS Total_perc,
Inbound_jam / Total_Jam AS Inbound_perc,
Sorter_jam / Total_Jam AS Sorter_perc,
Startstamp,
Endtstamp
FROM
(
base.Inbound_jam / NULLIF(base.Total_Jam,0) AS Inbound_perc,
base.Sorter_jam / NULLIF(base.Total_Jam,0) AS Sorter_perc
FROM (
SELECT
MIN(jam_area.t_stamp) AS Startstamp,
MAX(jam_area.t_stamp) AS Endtstamp,
SUM(IFNULL(Inbound_jam, 0) + IFNULL(Sorter_jam, 0)) AS Total_Jam,
SUM(jam_area.Inbound_jam = 1) AS Inbound_jam,
SUM(jam_area.Sorter_jam = 1) AS Sorter_jam
FROM jam_area
WHERE jam_area.t_stamp BETWEEN :starttime AND :endtime
) AS basajam;
MIN(a.eventtime) AS Startstamp,
MAX(COALESCE(c.eventtime, a.eventtime)) AS Endtstamp,
SUM(a.category = 'Inbound_jam') AS Inbound_jam,
SUM(a.category = 'Sorter_jam') AS Sorter_jam,
SUM(a.category IN ('Inbound_jam','Sorter_jam')) AS Total_Jam
FROM (
SELECT
ae.id,
ae.eventtime,
ae.eventid,
ae.displaypath AS device,
m.category
FROM alarm_events ae
JOIN (
SELECT 'UL15_1_TPE1' AS device, 'Inbound_jam' AS category UNION ALL
SELECT 'UL14_1_TPE1', 'Inbound_jam' UNION ALL
SELECT 'PS3_1_TPE1', 'Inbound_jam' UNION ALL
SELECT 'PS3_1_TPE2', 'Inbound_jam' UNION ALL
SELECT 'PS3_1_TPE3', 'Inbound_jam' UNION ALL
SELECT 'PS3_2_TPE1', 'Inbound_jam' UNION ALL
SELECT 'PS3_4_TPE1', 'Inbound_jam' UNION ALL
SELECT 'PS3_8_TPE1', 'Inbound_jam' UNION ALL
SELECT 'PS3_10_TPE1', 'Inbound_jam' UNION ALL
SELECT 'PS3_12_TPE1', 'Sorter_jam'
) AS m
ON ae.displaypath = m.device
WHERE ae.eventtype = 0
AND ae.eventtime BETWEEN :starttime AND :endtime
AND ae.displaypath NOT LIKE '%System Startup%'
AND ae.source NOT LIKE '%System Startup%'
) AS a
LEFT JOIN (
SELECT eventid, MIN(eventtime) AS eventtime
FROM alarm_events
WHERE eventtype = 1
GROUP BY eventid
) AS c
ON a.eventid = c.eventid
) AS base;

View File

@ -18,7 +18,7 @@
"cacheEnabled": false,
"database": "MariaDB",
"fallbackEnabled": false,
"lastModificationSignature": "d28148e533b521ca7448a7a35e2fd2582364e52564a09582e0003b134f568ec6",
"lastModificationSignature": "1b827a02dae8f111f327bf3f538cde6a523ebb07e0f63ecd029cb52dd92b3355",
"permissions": [
{
"zone": "",
@ -27,7 +27,7 @@
],
"lastModification": {
"actor": "admin",
"timestamp": "2025-09-02T06:58:02Z"
"timestamp": "2025-09-19T08:53:02Z"
},
"syntaxProvider": "class com.adbs.syntax.MySQLSyntaxProvider",
"parameters": [

View File

@ -2,14 +2,37 @@ SELECT
roundtime,
Inbound_jam,
Sorter_jam
FROM
(
FROM (
SELECT
SUM(jam_area.Inbound_jam = 1) AS Inbound_jam,
SUM(jam_area.Sorter_jam = 1) AS Sorter_jam,
FROM_UNIXTIME(CEIL(UNIX_TIMESTAMP(jam_area.t_stamp) / 600) * 600) AS roundtime
FROM jam_area
WHERE jam_area.t_stamp BETWEEN :starttime AND :endtime
GROUP BY FROM_UNIXTIME(CEIL(UNIX_TIMESTAMP(jam_area.t_stamp) / 600) * 600)
FROM_UNIXTIME(CEIL(UNIX_TIMESTAMP(a.eventtime) / 600) * 600) AS roundtime,
SUM(a.category = 'Inbound_jam') AS Inbound_jam,
SUM(a.category = 'Sorter_jam') AS Sorter_jam
FROM (
SELECT
ae.eventtime,
m.category
FROM alarm_events ae
JOIN (
-- Inbound devices
SELECT 'UL15_1_TPE1' AS device, 'Inbound_jam' AS category UNION ALL
SELECT 'UL14_1_TPE1', 'Inbound_jam' UNION ALL
SELECT 'PS3_1_TPE1', 'Inbound_jam' UNION ALL
SELECT 'PS3_1_TPE2', 'Inbound_jam' UNION ALL
SELECT 'PS3_1_TPE3', 'Inbound_jam' UNION ALL
SELECT 'PS3_2_TPE1', 'Inbound_jam' UNION ALL
SELECT 'PS3_4_TPE1', 'Inbound_jam' UNION ALL
SELECT 'PS3_8_TPE1', 'Inbound_jam' UNION ALL
SELECT 'PS3_10_TPE1', 'Inbound_jam' UNION ALL
-- Sorter devices
SELECT 'PS3_12_TPE1', 'Sorter_jam'
) AS m
ON ae.displaypath = m.device
WHERE ae.eventtype = 0
AND ae.eventtime BETWEEN :starttime AND :endtime
AND ae.displaypath NOT LIKE '%System Startup%'
AND ae.source NOT LIKE '%System Startup%'
) AS a
GROUP BY FROM_UNIXTIME(CEIL(UNIX_TIMESTAMP(a.eventtime) / 600) * 600)
ORDER BY roundtime ASC
) AS okeyjam;

View File

@ -18,7 +18,7 @@
"cacheEnabled": false,
"database": "MariaDB",
"fallbackEnabled": false,
"lastModificationSignature": "65838fd0226973bf25313a996070f752a5cd7a6ed291d4d8bf67790fb30da27d",
"lastModificationSignature": "77bfc7726fc29934c742d2a4f63ce08cd90bf49f60e41651c741195d8c323e6d",
"permissions": [
{
"zone": "",
@ -27,7 +27,7 @@
],
"lastModification": {
"actor": "admin",
"timestamp": "2025-09-01T15:54:27Z"
"timestamp": "2025-09-19T08:54:29Z"
},
"syntaxProvider": "class com.adbs.syntax.MySQLSyntaxProvider",
"parameters": [

View File

@ -32,3 +32,5 @@ Starting conversion: 20250915:10.46.20
Conversion finished. Elapsed time: 10 ms
Starting conversion: 20250918:20.02.12
Conversion finished. Elapsed time: 11 ms
Starting conversion: 20250919:12.08.01
Conversion finished. Elapsed time: 10 ms