|
|
@@ -61,7 +61,6 @@ class GatewayView(View):
|
|
|
sensor_type = int(request_dict.get('sensor_type', None))
|
|
|
event_type = int(request_dict.get('event_type', None))
|
|
|
defense = int(request_dict.get('defense', None))
|
|
|
- sensor_status = request_dict.get('sensor_status', None)
|
|
|
LOGGER.info('---调用网关推送接口--- request_dict:{}'.format(request_dict))
|
|
|
if not all([serial_number, ieee_addr, sensor_type, event_type]):
|
|
|
return response.json(444)
|
|
|
@@ -99,12 +98,10 @@ class GatewayView(View):
|
|
|
|
|
|
SensorRecord.objects.create(**sensor_record_dict)
|
|
|
|
|
|
- # (门磁,烟雾,人体)传感器被拆动/拆动恢复,修改拆动状态
|
|
|
- if sensor_status:
|
|
|
- if sensor_type != SENSOR_TYPE['smart_button']: # 智能按钮不更新
|
|
|
- gateway_sub_device_qs.update(is_tampered=1)
|
|
|
- elif sensor_type == SENSOR_TYPE['door_magnet'] or sensor_type == SENSOR_TYPE['smoke_sensor'] or \
|
|
|
- sensor_type == SENSOR_TYPE['body_sensor']:
|
|
|
+ # 门磁被拆动/拆动恢复,修改拆动状态
|
|
|
+ if event_type == 2152:
|
|
|
+ gateway_sub_device_qs.update(is_tampered=1)
|
|
|
+ elif event_type == 2156:
|
|
|
gateway_sub_device_qs.update(is_tampered=0)
|
|
|
|
|
|
# 撤防状态不推送
|
|
|
@@ -218,11 +215,11 @@ class GatewayView(View):
|
|
|
elif event_type == 2160:
|
|
|
alarm = '紧急按钮按下'
|
|
|
elif event_type == 2161:
|
|
|
- alarm = '按钮已按1下'
|
|
|
+ alarm = '单击'
|
|
|
elif event_type == 2162:
|
|
|
- alarm = '按钮已按2下'
|
|
|
+ alarm = '双击'
|
|
|
elif event_type == 2163:
|
|
|
- alarm = '按钮已按3下'
|
|
|
+ alarm = '长按'
|
|
|
|
|
|
# 水浸
|
|
|
elif event_type == 2170:
|
|
|
@@ -260,11 +257,11 @@ class GatewayView(View):
|
|
|
elif event_type == 2160:
|
|
|
alarm = 'Emergency button pressed'
|
|
|
elif event_type == 2161:
|
|
|
- alarm = 'Button pressed once'
|
|
|
+ alarm = 'Single click'
|
|
|
elif event_type == 2162:
|
|
|
- alarm = 'The button has been pressed twice'
|
|
|
+ alarm = 'Double click'
|
|
|
elif event_type == 2163:
|
|
|
- alarm = 'The button has been pressed 3 times'
|
|
|
+ alarm = 'Long press'
|
|
|
|
|
|
# 水浸
|
|
|
elif event_type == 2170:
|
