From f8e8615dc8814cf55e8e84b6cc2475170cdbf148 Mon Sep 17 00:00:00 2001 From: mgw <1392924357@qq.com> Date: Mon, 24 Mar 2025 17:25:23 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_machine_connect/controllers/controllers.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sf_machine_connect/controllers/controllers.py b/sf_machine_connect/controllers/controllers.py index 7d2d76bd..43af4a9b 100644 --- a/sf_machine_connect/controllers/controllers.py +++ b/sf_machine_connect/controllers/controllers.py @@ -1129,7 +1129,8 @@ class Sf_Dashboard_Connect(http.Controller): cur.execute(""" SELECT * FROM device_data WHERE device_name = %s - AND time::date = CURRENT_DATE + AND time >= CURRENT_DATE -- 今日 00:00:00 + AND time < CURRENT_DATE + 1 -- 明日 00:00:00 AND device_state in ('待机', '警告', '运行中') ORDER BY time ASC LIMIT 1; @@ -1142,7 +1143,8 @@ class Sf_Dashboard_Connect(http.Controller): cur.execute(""" SELECT * FROM device_data WHERE device_name = %s - AND time::date = CURRENT_DATE + AND time >= CURRENT_DATE -- 今日 00:00:00 + AND time < CURRENT_DATE + 1 -- 明日 00:00:00 AND device_state in ('待机', '警告', '运行中') ORDER BY time DESC LIMIT 1;