|
@@ -85,17 +85,15 @@ class GatewayView(View):
|
|
'event_type': event_type,
|
|
'event_type': event_type,
|
|
'created_time': n_time,
|
|
'created_time': n_time,
|
|
}
|
|
}
|
|
- # 处理温湿度
|
|
|
|
|
|
+ # 处理温湿度,不推送
|
|
if sensor_type == SENSOR_TYPE['tem_hum_sensor'] and (
|
|
if sensor_type == SENSOR_TYPE['tem_hum_sensor'] and (
|
|
event_type == EVENT_TYPE['temperature'] or event_type == EVENT_TYPE['humidity']):
|
|
event_type == EVENT_TYPE['temperature'] or event_type == EVENT_TYPE['humidity']):
|
|
num = request_dict.get('num', None)
|
|
num = request_dict.get('num', None)
|
|
num = str(int(num) / 100)
|
|
num = str(int(num) / 100)
|
|
sensor_record_dict['alarm'] = num
|
|
sensor_record_dict['alarm'] = num
|
|
- if event_type == EVENT_TYPE['temperature']:
|
|
|
|
- alarm += ':' + num + '℃'
|
|
|
|
- else:
|
|
|
|
- alarm += ':' + num + '%'
|
|
|
|
- # 写入传感器记录数据
|
|
|
|
|
|
+ SensorRecord.objects.create(**sensor_record_dict)
|
|
|
|
+ return response.json(0)
|
|
|
|
+
|
|
SensorRecord.objects.create(**sensor_record_dict)
|
|
SensorRecord.objects.create(**sensor_record_dict)
|
|
|
|
|
|
# (门磁,烟雾,人体)传感器被拆动/拆动恢复,修改拆动状态
|
|
# (门磁,烟雾,人体)传感器被拆动/拆动恢复,修改拆动状态
|