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

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

Browse Source 
Merge Request: 调整dashboard取值

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2061?initial=true
This commit is contained in:
马广威
2025-04-25 11:35:31 +08:00
committed by Coding
parent 04cb910803 6a920be6d1
commit e14646a6fc
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sf_machine_connect/controllers/controllers.py
View File

@@ -1298,7 +1298,7 @@ class Sf_Dashboard_Connect(http.Controller):
conn = psycopg2.connect(**db_config) conn = psycopg2.connect(**db_config)
# 获取请求的机床数据 # 获取请求的机床数据
machine_list = ast.literal_eval(kw['machine_list']) machine_list = ast.literal_eval(kw['machine_list'])
time_threshold = datetime.now() - timedelta(days=1) time_threshold = datetime.now().replace(hour=0, minute=0, second=0, microsecond=0)
alarm_last_24_time = 0.0 alarm_last_24_time = 0.0
alarm_all_time = 0.0 alarm_all_time = 0.0
@@ -1327,8 +1327,8 @@ class Sf_Dashboard_Connect(http.Controller):
cur.execute(""" cur.execute("""
SELECT * FROM device_data SELECT * FROM device_data
WHERE device_name = %s WHERE device_name = %s
AND device_state in ('待机', '警告', '运行中') 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 ORDER BY time DESC
LIMIT 1; LIMIT 1;
""", (item, time_threshold)) """, (item, time_threshold))
last_24_time = fetch_result_as_dict(cur) last_24_time = fetch_result_as_dict(cur)
@@ -1348,20 +1348,21 @@ class Sf_Dashboard_Connect(http.Controller):
alarm_last_24_nums = [] alarm_last_24_nums = []
with conn.cursor() as cur: with conn.cursor() as cur:
cur.execute(""" cur.execute("""
SELECT DISTINCT ON (alarm_start_time) alarm_time, alarm_start_time SELECT DISTINCT ON (alarm_start_time, alarm_time) alarm_time, alarm_start_time
FROM device_data FROM device_data
WHERE device_name = %s WHERE device_name = %s
AND alarm_start_time IS NOT NULL AND time >= %s; AND alarm_start_time IS NOT NULL AND alarm_start_time::timestamp >= %s;
""", (item, time_threshold)) """, (item, time_threshold))
results = cur.fetchall() results = cur.fetchall()
logging.info("results============:%s" % results)
for result in results: for result in results:
alarm_last_24_nums.append(result[1]) alarm_last_24_nums.append(result[1])
if result[0]: if result[0]:
if float(result[0]) >= 28800: if float(result[0]) >= 28800:
continue continue
alarm_last_24_time += float(result[0]) alarm_last_24_time = float(result[0])
else: else:
alarm_last_24_time += 0.0 alarm_last_24_time = 0.0
alarm_all_nums = [] alarm_all_nums = []
with conn.cursor() as cur: with conn.cursor() as cur: