优化稼动率接口

This commit is contained in:
mgw
2025-04-14 17:16:38 +08:00
parent c93553e78e
commit 07336326ce

View File

@@ -1508,18 +1508,18 @@ class Sf_Dashboard_Connect(http.Controller):
results = cur.fetchall() results = cur.fetchall()
print(results) print(results)
if len(results) >= 1: if len(results) >= 1:
total_power_on_time = convert_to_seconds(results[0][0]) total_power_on_time += convert_to_seconds(results[0][0])
else: else:
total_power_on_time = 0 total_power_on_time += 0
if len(results) >= 2: if len(results) >= 2:
month_power_on_time = total_power_on_time - convert_to_seconds(results[1][0]) month_power_on_time += convert_to_seconds(results[1][0])
else: else:
month_power_on_time = 0 month_power_on_time += 0
if len(results) >= 3: if len(results) >= 3:
today_power_on_time = total_power_on_time - convert_to_seconds(results[2][0]) today_power_on_time += convert_to_seconds(results[2][0])
today_power_on_dict[item] = today_power_on_time today_power_on_dict[item] = today_power_on_time
else: else:
today_power_on_time = 0 today_power_on_time += 0
print(total_power_on_time, month_power_on_time, today_power_on_time) print(total_power_on_time, month_power_on_time, today_power_on_time)
with conn.cursor() as cur: with conn.cursor() as cur:
@@ -1562,22 +1562,21 @@ class Sf_Dashboard_Connect(http.Controller):
conn.close() conn.close()
print('报警时间=============', TotalAlarmTime, MonthAlarmTime, TodayAlarmTime) print('报警时间=============', total_alarm_time, month_alarm_time, today_alarm_time)
logging.info("报警时间=%s" % TotalAlarmTime) logging.info("报警时间=%s" % total_alarm_time)
logging.info("报警时间=%s" % MonthAlarmTime) logging.info("报警时间=%s" % month_alarm_time)
logging.info("报警时间=%s" % TodayAlarmTime) logging.info("报警时间=%s" % today_alarm_time)
# 计算时间开动率(累计、月、日) # 计算时间开动率(累计、月、日)
if total_power_on_time and TotalAlarmTime: if total_power_on_time:
total_power_on_rate = (total_power_on_time - TotalAlarmTime) / total_power_on_time total_power_on_rate = (total_power_on_time - total_alarm_time) / total_power_on_time
else: else:
total_power_on_rate = 0 total_power_on_rate = 0
if month_power_on_time and MonthAlarmTime: if month_power_on_time:
month_power_on_rate = (month_power_on_time - MonthAlarmTime) / month_power_on_time month_power_on_rate = (total_power_on_time - month_power_on_time - month_alarm_time) / month_power_on_time
else: else:
month_power_on_rate = 0 month_power_on_rate = 0
if today_power_on_time and TodayAlarmTime: if today_power_on_time:
today_power_on_rate = (today_power_on_time - TodayAlarmTime) / today_power_on_time today_power_on_rate = (total_power_on_time - today_power_on_time - today_alarm_time) / today_power_on_time
else: else:
today_power_on_rate = 0 today_power_on_rate = 0
print("总开动率: %s" % total_power_on_rate) print("总开动率: %s" % total_power_on_rate)
@@ -1585,9 +1584,11 @@ class Sf_Dashboard_Connect(http.Controller):
print("日开动率: %s" % today_power_on_rate) print("日开动率: %s" % today_power_on_rate)
# 计算性能开动率(累计、月、日) # 计算性能开动率(累计、月、日)
total_performance_rate = len(orders) * 30 * 60 / (total_power_on_time - TotalAlarmTime) print('===========',orders)
month_performance_rate = len(month_data) * 30 * 60 / (month_power_on_time - MonthAlarmTime) print(len(orders))
today_performance_rate = len(today_data) * 30 * 60 / (today_power_on_time - TodayAlarmTime) if today_power_on_time != 0 else 0 total_performance_rate = len(orders) * 30 * 60 / (total_power_on_time - total_alarm_time)
month_performance_rate = len(month_data) * 30 * 60 / (month_power_on_time - month_alarm_time)
today_performance_rate = len(today_data) * 30 * 60 / (today_power_on_time - today_alarm_time) if today_power_on_time != 0 else 0
print("总性能率: %s" % total_performance_rate) print("总性能率: %s" % total_performance_rate)
print("月性能率: %s" % month_performance_rate) print("月性能率: %s" % month_performance_rate)
print("日性能率: %s" % today_performance_rate) print("日性能率: %s" % today_performance_rate)