jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept Merge Request #1961: (feature/制造功能优化 -> develop)

Browse Source 
Merge Request: 优化数采查询代码

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1961?initial=true
This commit is contained in:
马广威
2025-03-24 16:51:02 +08:00
committed by Coding
parent c9ba3a07bf 20a8ca6146
commit 01ac8a19b6
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
sf_machine_connect/controllers/controllers.py
View File

@@ -1130,7 +1130,7 @@ class Sf_Dashboard_Connect(http.Controller):
SELECT * FROM device_data
WHERE device_name = %s
AND time::date = CURRENT_DATE
AND device_state != '离线'
AND device_state in ('离线')
ORDER BY time ASC
LIMIT 1;
""", (item,))
@@ -1143,7 +1143,7 @@ class Sf_Dashboard_Connect(http.Controller):
SELECT * FROM device_data
WHERE device_name = %s
AND time::date = CURRENT_DATE
AND device_state != '离线'
AND device_state in ('离线')
ORDER BY time DESC
LIMIT 1;
""", (item,))
@@ -1161,25 +1161,25 @@ class Sf_Dashboard_Connect(http.Controller):
# 获取当月第一条记录（排除device_state等于‘离线’的记录）
with conn.cursor() as cur:
cur.execute("""
SELECT * FROM device_data
SELECT * FROM device_datas
WHERE device_name = %s
AND EXTRACT(YEAR FROM time) = EXTRACT(YEAR FROM CURRENT_DATE)
AND EXTRACT(MONTH FROM time) = EXTRACT(MONTH FROM CURRENT_DATE)
AND device_state != '离线'
AND time >= DATE_TRUNC('MONTH', CURRENT_DATE)
AND time < DATE_TRUNC('MONTH', CURRENT_DATE) + INTERVAL '1 MONTH'
AND device_state in ('离线')
ORDER BY time ASC
LIMIT 1;
""", (item,))
first_month = fetch_result_as_dict(cur)
# print("当月第一条记录（非离线）:", first_month)
# print("当月第一条记录:", first_month)
# 获取当月最新一条记录（排除device_state等于‘离线’的记录）
# 获取当月最新一条记录
with conn.cursor() as cur:
cur.execute("""
SELECT * FROM device_data
WHERE device_name = %s
AND EXTRACT(YEAR FROM time) = EXTRACT(YEAR FROM CURRENT_DATE)
AND EXTRACT(MONTH FROM time) = EXTRACT(MONTH FROM CURRENT_DATE)
AND device_state != '离线'
AND time >= DATE_TRUNC('MONTH', CURRENT_DATE)
AND time < DATE_TRUNC('MONTH', CURRENT_DATE) + INTERVAL '1 MONTH'
AND device_state in ('离线')
ORDER BY time DESC
LIMIT 1;
""", (item,))
@@ -1200,7 +1200,7 @@ class Sf_Dashboard_Connect(http.Controller):
cur.execute("""
SELECT * FROM device_data
WHERE device_name = %s
AND device_state != '离线'
AND device_state in ('离线')
ORDER BY time ASC
LIMIT 1;
""", (item,))
@@ -1212,7 +1212,7 @@ class Sf_Dashboard_Connect(http.Controller):
cur.execute("""
SELECT * FROM device_data
WHERE device_name = %s
AND device_state != '离线'
AND device_state in ('离线')
ORDER BY time DESC
LIMIT 1;
""", (item,))
@@ -1290,7 +1290,7 @@ class Sf_Dashboard_Connect(http.Controller):
cur.execute("""
SELECT * FROM device_data
WHERE device_name = %s
AND device_state != '离线' AND process_time IS NOT NULL
AND device_state in ('离线') AND process_time IS NOT NULL
ORDER BY time DESC
LIMIT 1;
""", (item,))
@@ -1299,7 +1299,7 @@ class Sf_Dashboard_Connect(http.Controller):
cur.execute("""
SELECT * FROM device_data
WHERE device_name = %s
AND device_state != '离线' AND time >= %s AND process_time IS NOT NULL
AND device_state in ('离线') AND time >= %s AND process_time IS NOT NULL
ORDER BY time ASC
LIMIT 1;
""", (item, time_threshold))