增加24h的oee参数

sf_machine_connect/controllers/controllers.py

@@ -1273,6 +1273,19 @@ class Sf_Dashboard_Connect(http.Controller):
                         """, (item, time_threshold))
                 last_24_time = fetch_result_as_dict(cur)
 
+            with conn.cursor() as cur:
+                cur.execute("""
+                    SELECT COUNT(*) 
+                    FROM (
+                    SELECT DISTINCT ON (idle_start_time) idle_start_time 
+                    FROM device_data 
+                    WHERE device_name = %s AND idle_start_time IS NOT NULL AND time >= %s
+                    ORDER BY idle_start_time, time
+                    ) subquery;
+                """, (item, time_threshold))
+                idle_count = cur.fetchone()[0]
+
+            alarm_last_24_nums = []
             with conn.cursor() as cur:
                 cur.execute("""
                             SELECT DISTINCT ON (alarm_start_time) alarm_time, alarm_start_time
@@ -1282,6 +1295,7 @@ class Sf_Dashboard_Connect(http.Controller):
                         """, (item, time_threshold))
                 results = cur.fetchall()
                 for result in results:
+                    alarm_last_24_nums.append(result[1])
                     if result[0]:
                         if float(result[0]) >= 1000:
                             continue
@@ -1296,6 +1310,8 @@ class Sf_Dashboard_Connect(http.Controller):
                 'power_on_time': last_all_time['power_on_time'] if last_all_time['power_on_time'] is not None else 0,
                 'power_on_24_time': last_24_time['power_on_time'] if last_24_time['power_on_time'] is not None else 0,
                 'alarm_last_24_time': alarm_last_24_time,
+                'alarm_last_24_nums': len(list(set(alarm_last_24_nums))),
+                'idle_count': idle_count,
                 'first_online_time': first_online_duration,
             }