|
|
@@ -79,19 +79,23 @@ class GatewayView(View):
|
|
|
if gateway_sub_device_qs.exists():
|
|
|
gateway_sub_device_id = gateway_sub_device_qs[0]['id']
|
|
|
nickname = gateway_sub_device_qs[0]['nickname']
|
|
|
- # 写入传感器记录数据
|
|
|
- if sensor_type == 220:
|
|
|
+ sensor_record_dict = {
|
|
|
+ 'gateway_sub_device_id': gateway_sub_device_id,
|
|
|
+ 'alarm': alarm,
|
|
|
+ 'event_type': event_type,
|
|
|
+ 'created_time': n_time,
|
|
|
+ }
|
|
|
+ # 处理温湿度
|
|
|
+ if sensor_type == 220 and (event_type == 2200 or event_type == 2201):
|
|
|
num = request_dict.get('num', None)
|
|
|
num = str(int(num) / 100)
|
|
|
- if event_type == 2201:
|
|
|
- alarm = alarm + ":" + num + "%"
|
|
|
- else:
|
|
|
+ sensor_record_dict['alarm'] = num
|
|
|
+ if event_type == 2200:
|
|
|
alarm = alarm + ":" + num + "℃"
|
|
|
- SensorRecord.objects.create(gateway_sub_device_id=gateway_sub_device_id, alarm=num,
|
|
|
- event_type=event_type, created_time=n_time)
|
|
|
- else:
|
|
|
- SensorRecord.objects.create(gateway_sub_device_id=gateway_sub_device_id, alarm=alarm,
|
|
|
- event_type=event_type, created_time=n_time)
|
|
|
+ else:
|
|
|
+ alarm = alarm + ":" + num + "%"
|
|
|
+ # 写入传感器记录数据
|
|
|
+ SensorRecord.objects.create(**sensor_record_dict)
|
|
|
|
|
|
# (门磁,烟雾,人体)传感器被拆动/拆动恢复,修改拆动状态
|
|
|
if sensor_status:
|
peng