优化稼动率接口
This commit is contained in:
@@ -1508,18 +1508,18 @@ class Sf_Dashboard_Connect(http.Controller):
|
||||
results = cur.fetchall()
|
||||
print(results)
|
||||
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:
|
||||
total_power_on_time = 0
|
||||
total_power_on_time += 0
|
||||
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:
|
||||
month_power_on_time = 0
|
||||
month_power_on_time += 0
|
||||
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
|
||||
else:
|
||||
today_power_on_time = 0
|
||||
today_power_on_time += 0
|
||||
print(total_power_on_time, month_power_on_time, today_power_on_time)
|
||||
|
||||
with conn.cursor() as cur:
|
||||
@@ -1562,22 +1562,21 @@ class Sf_Dashboard_Connect(http.Controller):
|
||||
|
||||
conn.close()
|
||||
|
||||
print('报警时间=============', TotalAlarmTime, MonthAlarmTime, TodayAlarmTime)
|
||||
logging.info("报警时间=%s" % TotalAlarmTime)
|
||||
logging.info("月报警时间=%s" % MonthAlarmTime)
|
||||
logging.info("日报警时间=%s" % TodayAlarmTime)
|
||||
|
||||
print('报警时间=============', total_alarm_time, month_alarm_time, today_alarm_time)
|
||||
logging.info("报警时间=%s" % total_alarm_time)
|
||||
logging.info("报警时间=%s" % month_alarm_time)
|
||||
logging.info("报警时间=%s" % today_alarm_time)
|
||||
# 计算时间开动率(累计、月、日)
|
||||
if total_power_on_time and TotalAlarmTime:
|
||||
total_power_on_rate = (total_power_on_time - TotalAlarmTime) / total_power_on_time
|
||||
if total_power_on_time:
|
||||
total_power_on_rate = (total_power_on_time - total_alarm_time) / total_power_on_time
|
||||
else:
|
||||
total_power_on_rate = 0
|
||||
if month_power_on_time and MonthAlarmTime:
|
||||
month_power_on_rate = (month_power_on_time - MonthAlarmTime) / month_power_on_time
|
||||
if month_power_on_time:
|
||||
month_power_on_rate = (total_power_on_time - month_power_on_time - month_alarm_time) / month_power_on_time
|
||||
else:
|
||||
month_power_on_rate = 0
|
||||
if today_power_on_time and TodayAlarmTime:
|
||||
today_power_on_rate = (today_power_on_time - TodayAlarmTime) / today_power_on_time
|
||||
if today_power_on_time:
|
||||
today_power_on_rate = (total_power_on_time - today_power_on_time - today_alarm_time) / today_power_on_time
|
||||
else:
|
||||
today_power_on_rate = 0
|
||||
print("总开动率: %s" % total_power_on_rate)
|
||||
@@ -1585,9 +1584,11 @@ class Sf_Dashboard_Connect(http.Controller):
|
||||
print("日开动率: %s" % today_power_on_rate)
|
||||
|
||||
# 计算性能开动率(累计、月、日)
|
||||
total_performance_rate = len(orders) * 30 * 60 / (total_power_on_time - TotalAlarmTime)
|
||||
month_performance_rate = len(month_data) * 30 * 60 / (month_power_on_time - MonthAlarmTime)
|
||||
today_performance_rate = len(today_data) * 30 * 60 / (today_power_on_time - TodayAlarmTime) if today_power_on_time != 0 else 0
|
||||
print('===========',orders)
|
||||
print(len(orders))
|
||||
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" % month_performance_rate)
|
||||
print("日性能率: %s" % today_performance_rate)
|
||||
|
||||
Reference in New Issue
Block a user