修改网关推送接口

Controller/gatewayController.py

@@ -46,6 +46,9 @@ class GatewayView(View):
         @request_dict sensor_type: 传感器类型
         @request_dict event_type: 事件类型
         @request_dict alarm: 消息内容
+        @request_dict defense: 防御状态,0:撤防,1:防御
+        @request_dict sensor_status: 拆动状态,拆动时传参
+        @request_dict sensor_low_power: 低电量
         @param response: 响应对象
         @return: response
         """
@@ -57,6 +60,8 @@ class GatewayView(View):
         event_type = int(request_dict.get('event_type', None))
         alarm = request_dict.get('alarm', None)
         defense = int(request_dict.get('defense', None))
+        sensor_status = request_dict.get('sensor_status', None)
+        sensor_low_power = request_dict.get('sensor_low_power', None)
         logger.info('---调用网关推送接口--- request_dict:{}'.format(request_dict))
         if not all([serial_number, ieee_addr, src_addr, sensor_type, event_type, alarm]):
             return response.json(444)
@@ -76,9 +81,9 @@ class GatewayView(View):
                                             event_type=event_type, created_time=n_time)
 
                 # (门磁,烟雾,人体)传感器被拆动/拆动恢复,修改拆动状态
-                if event_type == 2152 or event_type == 2182 or event_type == 2192:
+                if sensor_status:
                     gateway_sub_device_qs.update(is_tampered=1)
-                elif event_type == 2153 or event_type == 2183 or event_type == 2193:
+                elif sensor_type == 215 or sensor_type == 218 or sensor_type == 219:
                     gateway_sub_device_qs.update(is_tampered=0)
 
             # 撤防状态不推送