|
@@ -69,6 +69,7 @@ class GatewayView(View):
|
|
|
return response.json(444)
|
|
|
|
|
|
n_time = int(time.time())
|
|
|
+
|
|
|
try:
|
|
|
nickname = serial_number
|
|
|
# 查询子设备表id
|
|
@@ -79,8 +80,18 @@ class GatewayView(View):
|
|
|
gateway_sub_device_id = gateway_sub_device_qs[0]['id']
|
|
|
nickname = gateway_sub_device_qs[0]['nickname']
|
|
|
# 写入传感器记录数据
|
|
|
- SensorRecord.objects.create(gateway_sub_device_id=gateway_sub_device_id, alarm=alarm,
|
|
|
- event_type=event_type, created_time=n_time)
|
|
|
+ if sensor_type == 220:
|
|
|
+ num = request_dict.get('num', None)
|
|
|
+ num = str(int(num) / 100)
|
|
|
+ if event_type == 2201:
|
|
|
+ alarm = alarm + ":" + num + "%"
|
|
|
+ else:
|
|
|
+ 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)
|
|
|
|
|
|
# (门磁,烟雾,人体)传感器被拆动/拆动恢复,修改拆动状态
|
|
|
if sensor_status:
|