Browse Source

没数据返回空列表

locky 3 năm trước cách đây
mục cha
commit
a95f75488c
1 tập tin đã thay đổi với 4 bổ sung3 xóa
  1. 4 3
      Controller/SensorGateway/SubDeviceController.py

+ 4 - 3
Controller/SensorGateway/SubDeviceController.py

@@ -224,7 +224,7 @@ class GatewaySubDeviceView(View):
                                                                    created_time__range=(start_time, now_time)). \
                         values('alarm', 'created_time').order_by('created_time')
                     if not sensor_record_qs.exists():
-                        return response.json(0)
+                        return response.json(0, {'records': [], 'time': now_time})
 
                     for sensor_record in sensor_record_qs:
                         created_time = time.strftime('%m/%d %H:%M %w', time.localtime(sensor_record['created_time']))
@@ -245,7 +245,7 @@ class GatewaySubDeviceView(View):
                                                                    created_time__range=(start_time, now_time)). \
                         values('alarm', 'created_time').order_by('created_time')
                     if not sensor_record_qs.exists():
-                        return response.json(0)
+                        return response.json(0, {'records': [], 'time': now_time})
 
                     for sensor_record in sensor_record_qs:
                         created_time = time.strftime('%m/%d %H:%M %w', time.localtime(sensor_record['created_time']))
@@ -263,7 +263,7 @@ class GatewaySubDeviceView(View):
                                                                    created_time__range=(start_time, now_time)). \
                         values('alarm', 'created_time').order_by('created_time')
                     if not sensor_record_qs.exists():
-                        return response.json(0)
+                        return response.json(0, {'records': [], 'time': now_time})
 
                     for sensor_record in sensor_record_qs:
                         created_time = time.strftime('%m/%d %H:%M %w', time.localtime(sensor_record['created_time']))
@@ -280,6 +280,7 @@ class GatewaySubDeviceView(View):
                 # 组织响应数据列表,value为每 小时/天 的平均值
                 for k, v in record_dict.items():
                     record_list.append({'key': k, 'value': round(sum(v) / len(v), 1)})
+
                 res = {
                     'records': record_list,
                     'time': now_time