|
|
@@ -400,13 +400,13 @@ class GatewaySubDeviceView(View):
|
|
|
}
|
|
|
|
|
|
device_type = sub_device_qs[0]['device_type']
|
|
|
- if device_type == 215 or device_type == 218 or device_type == 219: # 门磁,烟雾,人体传感器返回拆动状态
|
|
|
+ if device_type == 215 or device_type == 218 or device_type == 219: # 门磁,烟雾,人体传感器返回拆动状态
|
|
|
res['is_tampered'] = sub_device_qs[0]['is_tampered']
|
|
|
elif device_type == 220: # 温湿度传感器返回温湿度数据
|
|
|
- tem_record_qs = SensorRecord.objects.filter(gateway_sub_device_id=sub_device_id, event_type=18).\
|
|
|
- order_by('-created_time').values('alarm')
|
|
|
- hum_record_qs = SensorRecord.objects.filter(gateway_sub_device_id=sub_device_id, event_type=19).\
|
|
|
- order_by('-created_time').values('alarm')
|
|
|
+ tem_record_qs = SensorRecord.objects.filter(gateway_sub_device_id=sub_device_id,
|
|
|
+ event_type=18).order_by('-created_time').values('alarm')[:1]
|
|
|
+ hum_record_qs = SensorRecord.objects.filter(gateway_sub_device_id=sub_device_id,
|
|
|
+ event_type=19).order_by('-created_time').values('alarm')[:1]
|
|
|
temperature = tem_record_qs[0]['alarm'] if tem_record_qs.exists() else ''
|
|
|
humidity = hum_record_qs[0]['alarm'] if tem_record_qs.exists() else ''
|
|
|
res['temperature'] = temperature
|
