Updated Alarms

SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/named-query/GetActiveAlarms/query.sql

@@ -1,13 +1,11 @@
--- GetActiveAlarms: Returns all currently active (uncleared) alarms
+/*+ MAX_EXECUTION_TIME(8000) */
--- Uses: idx_alarm_events_active, idx_alarm_events_clear, idx_alarm_event_data_lookup
--- Expected performance: <200ms on 37K rows, <500ms on 1M+ rows
--- Param: :priorityList (comma-separated priority numbers, or empty string for all)
 
 SELECT
   ae.id AS ID,
   ae.eventtime AS StartTimestamp,
   TIME_FORMAT(SEC_TO_TIME(TIMESTAMPDIFF(SECOND, ae.eventtime, NOW())), '%H:%i:%s') AS Duration,
   CONCAT(REPLACE(ae.displaypath, '_', '-'), ' ', SUBSTRING_INDEX(ae.source, ':/alm:', -1)) AS Description,
+
   CASE ae.priority
     WHEN 0 THEN 'Diagnostic' 
     WHEN 1 THEN 'Low' 
@@ -16,22 +14,55 @@ SELECT
     WHEN 4 THEN 'Critical' 
     ELSE 'Unknown'
   END AS Priority,
+
   CONCAT(ae.displaypath, '.HMI.Alarm.', SUBSTRING_INDEX(IFNULL(aed.strValue, ''), '/', -1)) AS Tag,
-  SUBSTRING_INDEX(SUBSTRING_INDEX(IFNULL(aed.strValue, ''), '/', 2), '/', -1) AS Location,
+  
+  CASE 
+    WHEN SUBSTRING_INDEX(SUBSTRING_INDEX(IFNULL(aed.strValue, ''), '/', 2), '/', -1) = 'Chute' THEN 'SMC'
+    ELSE SUBSTRING_INDEX(SUBSTRING_INDEX(IFNULL(aed.strValue, ''), '/', 2), '/', -1)
+  END AS Location,
+  
+  CASE 
+    WHEN ae.priority = 3 THEN 'Alarms-Styles/High'
+    WHEN ae.priority = 2 THEN 'Alarms-Styles/Medium'
+    WHEN ae.priority = 1 THEN 'Alarms-Styles/Low'
+    WHEN ae.priority = 0 THEN 'Alarms-Styles/Diagnostic'
+    ELSE 'Alarms-Styles/NoAlarm'
+  END AS Style,
+  
   aed.strValue AS FullTag,
   ae.displaypath AS Device
+
 FROM alarm_events ae FORCE INDEX (idx_alarm_events_active)
 LEFT JOIN alarm_event_data aed FORCE INDEX (idx_alarm_event_data_lookup)
   ON aed.id = ae.id AND aed.propname = 'myTag'
-WHERE ae.eventtype = 0
+
+WHERE 
+  ae.eventtype = 0
   AND ae.displaypath NOT LIKE '%System Startup%'
   AND ae.source NOT LIKE '%System Startup%'
-  AND (:priorityList = '' OR FIND_IN_SET(CAST(ae.priority AS CHAR), :priorityList) > 0)
+
-  -- FORCE INDEX ensures idx_alarm_events_clear is used in subquery
+  -- Priority filter (same logic as other queries)
+  AND (
+       :priority IS NULL OR :priority = '' OR :priority = 0
+    OR (:priority = 3 AND ae.priority = 3)
+    OR (:priority = 2 AND ae.priority BETWEEN 2 AND 3)
+    OR (:priority = 1 AND ae.priority BETWEEN 1 AND 3)
+  )
+
+  -- Location filter
+  AND (
+       :location IS NULL OR :location = ''
+    OR SUBSTRING_INDEX(SUBSTRING_INDEX(IFNULL(aed.strValue, ''), '/', 2), '/', -1)
+         LIKE CONCAT('%', :location, '%')
+  )
+
+  -- Exclude cleared alarms
   AND NOT EXISTS (
     SELECT 1 
     FROM alarm_events clr FORCE INDEX (idx_alarm_events_clear)
     WHERE clr.eventid = ae.eventid 
       AND clr.eventtype = 1
   )
+
 ORDER BY ae.eventtime DESC;

SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/named-query/GetAlarms/query.sql

@@ -1,9 +1,3 @@
--- GetAlarms: Alarms that ended (cleared) within the specified timeframe
--- Shows active alarms ONLY if the timeframe includes current time
--- MAXIMUM PERFORMANCE: Optimized for EndTimestamp filtering
--- Expected performance: <500ms on 37K rows
--- Params: :starttime (DATETIME), :endtime (DATETIME)
-
 /*+ MAX_EXECUTION_TIME(8000) */
 
 SELECT 
@@ -15,6 +9,7 @@ SELECT
     '%H:%i:%s'
   ) AS Duration,
   CONCAT(REPLACE(a.displaypath, '_', '-'), ' ', SUBSTRING_INDEX(a.source, ':/alm:', -1)) AS Description,
+  
   CASE a.priority
     WHEN 0 THEN 'Diagnostic'
     WHEN 1 THEN 'Low'
@@ -23,13 +18,27 @@ SELECT
     WHEN 4 THEN 'Critical'
     ELSE 'Unknown'
   END AS Priority,
+
   CONCAT(a.displaypath, '.HMI.Alarm.', SUBSTRING_INDEX(IFNULL(aed.strValue, ''), '/', -1)) AS Tag,
-  SUBSTRING_INDEX(SUBSTRING_INDEX(IFNULL(aed.strValue, ''), '/', 2), '/', -1) AS Location,
+  
+  CASE 
+    WHEN SUBSTRING_INDEX(SUBSTRING_INDEX(IFNULL(aed.strValue, ''), '/', 2), '/', -1) = 'Chute' THEN 'SMC'
+    ELSE SUBSTRING_INDEX(SUBSTRING_INDEX(IFNULL(aed.strValue, ''), '/', 2), '/', -1)
+  END AS Location,
+  
+  CASE 
+    WHEN a.priority = 3 THEN 'Alarms-Styles/High'
+    WHEN a.priority = 2 THEN 'Alarms-Styles/Medium'
+    WHEN a.priority = 1 THEN 'Alarms-Styles/Low'
+    WHEN a.priority = 0 THEN 'Alarms-Styles/Diagnostic'
+    ELSE 'Alarms-Styles/NoAlarm'
+  END AS Style,
+  
   aed.strValue AS FullTag,
   a.displaypath AS Device
+
 FROM alarm_events a FORCE INDEX (idx_alarm_events_type_time_id)
 LEFT JOIN (
-  -- Find first clear time for each alarm
   SELECT eventid, MIN(eventtime) AS min_clear_time
   FROM alarm_events FORCE INDEX (idx_alarm_events_clear)
   WHERE eventtype = 1
@@ -39,17 +48,15 @@ LEFT JOIN (
 ) clr ON clr.eventid = a.eventid AND clr.min_clear_time >= a.eventtime
 LEFT JOIN alarm_event_data aed FORCE INDEX (idx_alarm_event_data_lookup)
   ON aed.id = a.id AND aed.propname = 'myTag'
+
 WHERE 
   a.eventtype = 0
   AND a.displaypath NOT LIKE '%System Startup%'
   AND a.source NOT LIKE '%System Startup%'
-  -- Smart time filtering: 
+
-  -- If endtime is near NOW (within 5 mins), get ALL active alarms + historical in window
+  -- Smart time filtering
-  -- If endtime is in the past, only get alarms that started in the window
   AND (
-    -- Historical alarms: started in the time window
     (a.eventtime >= :starttime AND a.eventtime < :endtime)
-    -- OR Live mode: ALL active alarms if endtime is within 5 mins of NOW
     OR (
       :endtime >= DATE_SUB(NOW(), INTERVAL 5 MINUTE)
       AND NOT EXISTS (
@@ -59,10 +66,25 @@ WHERE
       )
     )
   )
-  -- Final filter: Cleared alarms must have cleared in window
+
   AND (
-    clr.min_clear_time IS NOT NULL                          -- Cleared alarms in window
+    clr.min_clear_time IS NOT NULL
-    OR :endtime >= DATE_SUB(NOW(), INTERVAL 5 MINUTE)       -- Active alarms if endtime is recent
+    OR :endtime >= DATE_SUB(NOW(), INTERVAL 5 MINUTE)
+  )
+
+  -- Priority filter
+  AND (
+       :priority IS NULL OR :priority = '' OR :priority = 0
+    OR (:priority = 3 AND a.priority = 3)
+    OR (:priority = 2 AND a.priority BETWEEN 2 AND 3)
+    OR (:priority = 1 AND a.priority BETWEEN 1 AND 3)
+  )
+
+  -- Location filter
+  AND (
+       :location IS NULL OR :location = ''
+    OR SUBSTRING_INDEX(SUBSTRING_INDEX(IFNULL(aed.strValue, ''), '/', 2), '/', -1)
+         LIKE CONCAT('%', :location, '%')
   )
 
 ORDER BY 

SCADA_PERSPECTIVE_PARENT_PROJECT/ignition/named-query/GetAlarmsWithCount/query.sql

@@ -1,12 +1,6 @@
--- GetAlarmsWithCount: Alarm statistics with activation counts for a time window
--- Uses: idx_alarm_events_type_time_id, idx_alarm_events_clear, idx_alarm_event_data_lookup
--- Expected performance: <300ms on 37K rows, <800ms on 1M+ rows
--- Params: :startTime (DATETIME or NULL/empty), :endTime (DATETIME or NULL/empty)
-
 /*+ MAX_EXECUTION_TIME(8000) */
 
 WITH ClearedEvents AS (
-  -- Pre-aggregate clear times - FORCED index usage for speed
   SELECT 
     eventid, 
     MIN(eventtime) AS clear_time
@@ -20,7 +14,10 @@ SELECT
 
   CONCAT(ae.displaypath, '.HMI.Alarm.', SUBSTRING_INDEX(IFNULL(aed.strValue, ''), '/', -1)) AS Tag,
 
-  SUBSTRING_INDEX(SUBSTRING_INDEX(IFNULL(aed.strValue, ''), '/', 2), '/', -1) AS Location,
+  CASE 
+    WHEN SUBSTRING_INDEX(SUBSTRING_INDEX(IFNULL(aed.strValue, ''), '/', 2), '/', -1) = 'Chute' THEN 'SMC'
+    ELSE SUBSTRING_INDEX(SUBSTRING_INDEX(IFNULL(aed.strValue, ''), '/', 2), '/', -1)
+  END AS Location,
 
   CASE ae.priority
     WHEN 0 THEN 'Diagnostic' 
@@ -31,7 +28,14 @@ SELECT
     ELSE 'Unknown'
   END AS Priority,
   
-  -- First/Last timestamps (clipped to window if provided)
+  CASE 
+    WHEN ae.priority = 3 THEN 'Alarms-Styles/High'
+    WHEN ae.priority = 2 THEN 'Alarms-Styles/Medium'
+    WHEN ae.priority = 1 THEN 'Alarms-Styles/Low'
+    WHEN ae.priority = 0 THEN 'Alarms-Styles/Diagnostic'
+    ELSE 'Alarms-Styles/NoAlarm'
+  END AS Style,
+
   MIN(
     GREATEST(
       ae.eventtime, 
@@ -46,7 +50,6 @@ SELECT
     )
   ) AS LastTimestamp,
 
-  -- Duration within window (formatted as HH:MM:SS string)
   TIME_FORMAT(
     SEC_TO_TIME(
       SUM(
@@ -64,9 +67,7 @@ SELECT
     '%H:%i:%s'
   ) AS Duration,
 
-  -- Activation count: how many times alarm triggered in the window
   COUNT(*) AS "Count",
-
   aed.strValue AS FullTag,
   ae.displaypath AS Device
 
@@ -80,12 +81,23 @@ WHERE
   ae.eventtype = 0
   AND ae.displaypath NOT LIKE '%System Startup%'
   AND ae.source NOT LIKE '%System Startup%'
-  -- Time window filter: FORCE INDEX ensures fast range scan
   AND (
     (:startTime IS NULL OR :startTime = '' OR ae.eventtime >= :startTime)
     AND
     (:endTime   IS NULL OR :endTime   = '' OR ae.eventtime <= :endTime)
   )
+  -- Priority filter
+  AND (
+       :priority IS NULL OR :priority = '' OR :priority = 0
+    OR (:priority = 3 AND ae.priority = 3)
+    OR (:priority = 2 AND ae.priority BETWEEN 2 AND 3)
+    OR (:priority = 1 AND ae.priority BETWEEN 1 AND 3)
+  )
+  -- Location filter (matches if string found anywhere)
+  AND (
+       :location IS NULL OR :location = '' 
+    OR SUBSTRING_INDEX(SUBSTRING_INDEX(IFNULL(aed.strValue, ''), '/', 2), '/', -1) LIKE CONCAT('%', :location, '%')
+  )
 
 GROUP BY
   ae.source,