Browse Source

進行排序

guanhailong 2 năm trước cách đây
mục cha
commit
46abfd8f11
1 tập tin đã thay đổi với 4 bổ sung6 xóa
  1. 4 6
      Controller/SensorGateway/SmartSocketController.py

+ 4 - 6
Controller/SensorGateway/SmartSocketController.py

@@ -382,7 +382,7 @@ class SmartSocketView(View):
     # 以下是查询智能插座接口
 
     @staticmethod
-    def get_all_scene(cls, request_dict, response):
+    def get_all_scene(request_dict, response):
         """
         统计智能插座电量
         @request_dict serialNumber: 序列号
@@ -634,10 +634,8 @@ class SmartSocketView(View):
             return response.json(500, {'errno': 'unit or startTime or endTime or serialNumber'})
 
         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 = {}
             new_list = []
@@ -688,7 +686,7 @@ class SmartSocketView(View):
                     'startTime': int(endTime),
                     'electricity': round(electricity, 1)
                 })
-
+            new_list.sort(key=lambda k: k["startTime"], reverse=True)
             data['week_or_month_or_year'] = new_list
             return response.json(0, data)
         except Exception as e: