LCI/MTN6
10
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Add S02_130CH and S02_230CH

Browse Source
This commit is contained in:
b.makharadze 2025-05-29 10:35:42 +04:00
parent 14be86bf91
commit 506b860093
2 changed files with 61 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
MTN6_SCADA/com.inductiveautomation.perspective/views/Windows/Status/view.json
View File

@ -3,7 +3,7 @@
"currentTab": null "currentTab": null
}, },
"params": { "params": {
"Tab_ID": 1, "Tab_ID": 0,
"Table": "Status_tab" "Table": "Status_tab"
}, },
"propConfig": { "propConfig": {
@ -1100,6 +1100,7 @@
"config": { "config": {
"expression": "now(1000)" "expression": "now(1000)"
}, },
"previewEnabled": false,
"type": "expr" "type": "expr"
}, },
"onChange": { "onChange": {
@ -1454,37 +1455,37 @@
"data": [ "data": [
{ {
"value": { "value": {
"FullCount": 0, "FullCount": 1,
"FullDuration": "00:00:00", "FullDuration": "00:07:48",
"JamCount": 5, "JamCount": 1,
"JamDuration": "00:00:40", "JamDuration": "00:07:48",
"Lane": "S02_101CH" "Lane": "S02_101CH"
} }
}, },
{ {
"value": { "value": {
"FullCount": 8, "FullCount": 6,
"FullDuration": "00:01:02", "FullDuration": "00:28:44",
"JamCount": 8, "JamCount": 4,
"JamDuration": "00:01:16", "JamDuration": "00:27:24",
"Lane": "S02_102CH" "Lane": "S02_102CH"
} }
}, },
{ {
"value": { "value": {
"FullCount": 1, "FullCount": 0,
"FullDuration": "00:03:02", "FullDuration": "00:00:00",
"JamCount": 1, "JamCount": 0,
"JamDuration": "00:00:08", "JamDuration": "00:00:00",
"Lane": "S02_103CH" "Lane": "S02_103CH"
} }
}, },
{ {
"value": { "value": {
"FullCount": 1, "FullCount": 0,
"FullDuration": "00:03:31", "FullDuration": "00:00:00",
"JamCount": 1, "JamCount": 0,
"JamDuration": "00:04:09", "JamDuration": "00:00:00",
"Lane": "S02_104CH" "Lane": "S02_104CH"
} }
}, },
@ -1535,10 +1536,10 @@
}, },
{ {
"value": { "value": {
"FullCount": 0, "FullCount": 1,
"FullDuration": "00:00:00", "FullDuration": "00:18:19",
"JamCount": 0, "JamCount": 1,
"JamDuration": "00:00:00", "JamDuration": "00:18:19",
"Lane": "S02_110CH" "Lane": "S02_110CH"
} }
}, },
@ -1706,13 +1707,22 @@
}, },
{ {
"value": { "value": {
"FullCount": 0, "FullCount": 2,
"FullDuration": "00:00:00", "FullDuration": "00:00:46",
"JamCount": 0, "JamCount": 0,
"JamDuration": "00:00:00", "JamDuration": "00:00:00",
"Lane": "S02_129CH" "Lane": "S02_129CH"
} }
}, },
{
"value": {
"FullCount": 2,
"FullDuration": "00:19:03",
"JamCount": 1,
"JamDuration": "00:00:13",
"Lane": "S02_130CH"
}
},
{ {
"value": { "value": {
"FullCount": 0, "FullCount": 0,
@ -1973,6 +1983,15 @@
"JamDuration": "00:00:00", "JamDuration": "00:00:00",
"Lane": "S02_229CH" "Lane": "S02_229CH"
} }
},
{
"value": {
"FullCount": 0,
"FullDuration": "00:00:00",
"JamCount": 0,
"JamDuration": "00:00:00",
"Lane": "S02_230CH"
}
} }
], ],
"filter": { "filter": {
@ -2173,7 +2192,6 @@
"y": -0.0011 "y": -0.0011
}, },
"props": { "props": {
"currentTabIndex": 1,
"tabs": [ "tabs": [
"Enternet", "Enternet",
"Lane Status", "Lane Status",
@ -3891,7 +3909,7 @@
}, },
"props": { "props": {
"dismissOnSelect": false, "dismissOnSelect": false,
"formattedValue": "May 28, 2025 5:12 PM", "formattedValue": "May 29, 2025 9:57 AM",
"formattedValues": { "formattedValues": {
"date": "Mar 26, 2021", "date": "Mar 26, 2021",
"datetime": "Mar 26, 2021 12:00 AM", "datetime": "Mar 26, 2021 12:00 AM",
@ -3901,9 +3919,9 @@
"$": [ "$": [
"ts", "ts",
192, 192,
1748439758604 1748500031797
], ],
"$ts": 1748437958000 "$ts": 1748498231000
} }
}, },
"type": "ia.input.date-time-input" "type": "ia.input.date-time-input"
@ -4051,7 +4069,7 @@
}, },
"props": { "props": {
"dismissOnSelect": false, "dismissOnSelect": false,
"formattedValue": "May 28, 2025 5:42 PM", "formattedValue": "May 29, 2025 10:27 AM",
"formattedValues": { "formattedValues": {
"date": "Mar 29, 2021", "date": "Mar 29, 2021",
"datetime": "Mar 29, 2021 1:37 PM", "datetime": "Mar 29, 2021 1:37 PM",
@ -4061,9 +4079,9 @@
"$": [ "$": [
"ts", "ts",
192, 192,
1748439758604 1748500031797
], ],
"$ts": 1748439758000 "$ts": 1748500031000
} }
}, },
"type": "ia.input.date-time-input" "type": "ia.input.date-time-input"

27
MTN6_SCADA/ignition/named-query/Status/Lane Status/query.sql
View File

@ -4,14 +4,14 @@ WITH DesiredLanes AS (
SELECT 101 + n AS lane_number FROM ( SELECT 101 + n AS lane_number FROM (
SELECT a.N + b.N * 10 AS n SELECT a.N + b.N * 10 AS n
FROM (SELECT 0 AS N UNION SELECT 1 UNION SELECT 2 UNION SELECT 3 UNION SELECT 4 UNION SELECT 5 UNION SELECT 6 UNION SELECT 7 UNION SELECT 8 UNION SELECT 9) a, FROM (SELECT 0 AS N UNION SELECT 1 UNION SELECT 2 UNION SELECT 3 UNION SELECT 4 UNION SELECT 5 UNION SELECT 6 UNION SELECT 7 UNION SELECT 8 UNION SELECT 9) a,
(SELECT 0 AS N UNION SELECT 1 UNION SELECT 2) b (SELECT 0 AS N UNION SELECT 1 UNION SELECT 2 UNION SELECT 3) b
) numbers WHERE n <= 28 -- 101 to 129 ) numbers WHERE n <= 29 -- 101 to 130
UNION UNION
SELECT 201 + n FROM ( SELECT 201 + n FROM (
SELECT a.N + b.N * 10 AS n SELECT a.N + b.N * 10 AS n
FROM (SELECT 0 AS N UNION SELECT 1 UNION SELECT 2 UNION SELECT 3 UNION SELECT 4 UNION SELECT 5 UNION SELECT 6 UNION SELECT 7 UNION SELECT 8 UNION SELECT 9) a, FROM (SELECT 0 AS N UNION SELECT 1 UNION SELECT 2 UNION SELECT 3 UNION SELECT 4 UNION SELECT 5 UNION SELECT 6 UNION SELECT 7 UNION SELECT 8 UNION SELECT 9) a,
(SELECT 0 AS N UNION SELECT 1 UNION SELECT 2) b (SELECT 0 AS N UNION SELECT 1 UNION SELECT 2 UNION SELECT 3) b
) numbers WHERE n <= 28 -- 201 to 229 ) numbers WHERE n <= 29 -- 201 to 230
) lanes ) lanes
), ),
AlarmData AS ( AlarmData AS (
@ -50,28 +50,28 @@ LaneMapping AS (
WHEN strvalue LIKE '%Chute[%' THEN WHEN strvalue LIKE '%Chute[%' THEN
CASE CASE
WHEN CAST(SUBSTRING(strvalue, LOCATE('Chute[', strvalue) + 6, WHEN CAST(SUBSTRING(strvalue, LOCATE('Chute[', strvalue) + 6,
LOCATE(']', strvalue, LOCATE('Chute[', strvalue)) - LOCATE('Chute[', strvalue) - 6) AS UNSIGNED) BETWEEN 1 AND 29 LOCATE(']', strvalue, LOCATE('Chute[', strvalue)) - LOCATE('Chute[', strvalue) - 6) AS UNSIGNED) BETWEEN 1 AND 30
THEN 101 + (CAST(SUBSTRING(strvalue, LOCATE('Chute[', strvalue) + 6, THEN 101 + (CAST(SUBSTRING(strvalue, LOCATE('Chute[', strvalue) + 6,
LOCATE(']', strvalue, LOCATE('Chute[', strvalue)) - LOCATE('Chute[', strvalue) - 6) AS UNSIGNED) - 1) LOCATE(']', strvalue, LOCATE('Chute[', strvalue)) - LOCATE('Chute[', strvalue) - 6) AS UNSIGNED) - 1)
WHEN CAST(SUBSTRING(strvalue, LOCATE('Chute[', strvalue) + 6, WHEN CAST(SUBSTRING(strvalue, LOCATE('Chute[', strvalue) + 6,
LOCATE(']', strvalue, LOCATE('Chute[', strvalue)) - LOCATE('Chute[', strvalue) - 6) AS UNSIGNED) BETWEEN 30 AND 59 LOCATE(']', strvalue, LOCATE('Chute[', strvalue)) - LOCATE('Chute[', strvalue) - 6) AS UNSIGNED) BETWEEN 31 AND 60
THEN 201 + (CAST(SUBSTRING(strvalue, LOCATE('Chute[', strvalue) + 6, THEN 201 + (CAST(SUBSTRING(strvalue, LOCATE('Chute[', strvalue) + 6,
LOCATE(']', strvalue, LOCATE('Chute[', strvalue)) - LOCATE('Chute[', strvalue) - 6) AS UNSIGNED) - 31) LOCATE(']', strvalue, LOCATE('Chute[', strvalue)) - LOCATE('Chute[', strvalue) - 6) AS UNSIGNED) - 31)
ELSE NULL ELSE NULL
END END
WHEN strvalue LIKE '%Chute[_%' THEN WHEN strvalue LIKE '%Chute[_%' THEN
CASE CASE
WHEN CAST(SUBSTRING(strvalue, LOCATE('Chute_', strvalue) + 6) AS UNSIGNED) BETWEEN 1 AND 29 WHEN CAST(SUBSTRING(strvalue, LOCATE('Chute_', strvalue) + 6) AS UNSIGNED) BETWEEN 1 AND 30
THEN 101 + (CAST(SUBSTRING(strvalue, LOCATE('Chute_', strvalue) + 6) AS UNSIGNED) - 1) THEN 101 + (CAST(SUBSTRING(strvalue, LOCATE('Chute_', strvalue) + 6) AS UNSIGNED) - 1)
WHEN CAST(SUBSTRING(strvalue, LOCATE('Chute_', strvalue) + 6) AS UNSIGNED) BETWEEN 30 AND 59 WHEN CAST(SUBSTRING(strvalue, LOCATE('Chute_', strvalue) + 6) AS UNSIGNED) BETWEEN 31 AND 60
THEN 201 + (CAST(SUBSTRING(strvalue, LOCATE('Chute_', strvalue) + 6) AS UNSIGNED) - 31) THEN 201 + (CAST(SUBSTRING(strvalue, LOCATE('Chute_', strvalue) + 6) AS UNSIGNED) - 31)
ELSE NULL ELSE NULL
END END
WHEN strvalue LIKE '%Chute%' THEN WHEN strvalue LIKE '%Chute%' THEN
CASE CASE
WHEN CAST(REGEXP_SUBSTR(strvalue, '[0-9]+') AS UNSIGNED) BETWEEN 1 AND 29 WHEN CAST(REGEXP_SUBSTR(strvalue, '[0-9]+') AS UNSIGNED) BETWEEN 1 AND 30
THEN 101 + (CAST(REGEXP_SUBSTR(strvalue, '[0-9]+') AS UNSIGNED) - 1) THEN 101 + (CAST(REGEXP_SUBSTR(strvalue, '[0-9]+') AS UNSIGNED) - 1)
WHEN CAST(REGEXP_SUBSTR(strvalue, '[0-9]+') AS UNSIGNED) BETWEEN 30 AND 59 WHEN CAST(REGEXP_SUBSTR(strvalue, '[0-9]+') AS UNSIGNED) BETWEEN 31 AND 60
THEN 201 + (CAST(REGEXP_SUBSTR(strvalue, '[0-9]+') AS UNSIGNED) - 31) THEN 201 + (CAST(REGEXP_SUBSTR(strvalue, '[0-9]+') AS UNSIGNED) - 31)
ELSE NULL ELSE NULL
END END
@ -80,9 +80,8 @@ LaneMapping AS (
FROM alarm_event_data FROM alarm_event_data
WHERE propname = 'Tag' AND strvalue LIKE '%Chute%' WHERE propname = 'Tag' AND strvalue LIKE '%Chute%'
), ),
-- Pre-aggregate jam and full events separately to avoid cross-joins
JamEvents AS ( JamEvents AS (
SELECT SELECT DISTINCT
lm.lane_number, lm.lane_number,
ad.event_uuid, ad.event_uuid,
ad.active_time, ad.active_time,
@ -93,14 +92,14 @@ JamEvents AS (
WHERE aed.propname = 'Jam' AND aed.strvalue = '1' WHERE aed.propname = 'Jam' AND aed.strvalue = '1'
), ),
FullEvents AS ( FullEvents AS (
SELECT SELECT DISTINCT
lm.lane_number, lm.lane_number,
ad.event_uuid, ad.event_uuid,
ad.active_time, ad.active_time,
ad.clear_time ad.clear_time
FROM LaneMapping lm FROM LaneMapping lm
INNER JOIN AlarmData ad ON lm.record_id = ad.record_id INNER JOIN AlarmData ad ON lm.record_id = ad.record_id
INNER JOIN alarm_event_data aed ON ad.record_id = aed.id INNER JOIN alarm_event_data aed ON ad.record_id = ad.record_id
WHERE aed.propname = 'Full' AND aed.strvalue = '1' WHERE aed.propname = 'Full' AND aed.strvalue = '1'
), ),
Aggregated AS ( Aggregated AS (