|
@@ -382,7 +382,7 @@ class SmartSocketView(View):
|
|
# 以下是查询智能插座接口
|
|
# 以下是查询智能插座接口
|
|
|
|
|
|
@staticmethod
|
|
@staticmethod
|
|
- def get_all_scene(cls, request_dict, response):
|
|
|
|
|
|
+ def get_all_scene(request_dict, response):
|
|
"""
|
|
"""
|
|
统计智能插座电量
|
|
统计智能插座电量
|
|
@request_dict serialNumber: 序列号
|
|
@request_dict serialNumber: 序列号
|
|
@@ -634,10 +634,8 @@ class SmartSocketView(View):
|
|
return response.json(500, {'errno': 'unit or startTime or endTime or serialNumber'})
|
|
return response.json(500, {'errno': 'unit or startTime or endTime or serialNumber'})
|
|
|
|
|
|
try:
|
|
try:
|
|
- socket_power_qs = SocketPowerStatistics.objects.filter(serial_number=serial_number).values('electricity',
|
|
|
|
- 'accumulated_time',
|
|
|
|
- 'power',
|
|
|
|
- 'created_time')
|
|
|
|
|
|
+ socket_power_qs = SocketPowerStatistics.objects.filter(serial_number=serial_number).\
|
|
|
|
+ values('electricity', 'accumulated_time', 'power', 'created_time')
|
|
# 时间和功耗
|
|
# 时间和功耗
|
|
data = {}
|
|
data = {}
|
|
new_list = []
|
|
new_list = []
|
|
@@ -688,7 +686,7 @@ class SmartSocketView(View):
|
|
'startTime': int(endTime),
|
|
'startTime': int(endTime),
|
|
'electricity': round(electricity, 1)
|
|
'electricity': round(electricity, 1)
|
|
})
|
|
})
|
|
-
|
|
|
|
|
|
+ new_list.sort(key=lambda k: k["startTime"], reverse=True)
|
|
data['week_or_month_or_year'] = new_list
|
|
data['week_or_month_or_year'] = new_list
|
|
return response.json(0, data)
|
|
return response.json(0, data)
|
|
except Exception as e:
|
|
except Exception as e:
|