task的sensor_type和sensor_action转int

Controller/SensorGateway/SmartSceneController.py

@@ -297,8 +297,8 @@ class SmartSceneView(View):
                 task_list = []
                 for task in tasks_list:
                     task_temp = {
-                        'sensor_type': task['device_type'],
-                        'sensor_action': task['event_type']
+                        'sensor_type': int(task['device_type']),
+                        'sensor_action': int(task['event_type'])
                     }
                     sub_device_id = task.get('subDeviceId', None)
                     if sub_device_id:
@@ -543,8 +543,8 @@ class SmartSceneView(View):
             task_list = []
             for task in tasks_list:
                 task_temp = {
-                    'sensor_type': task['device_type'],
-                    'sensor_action': task['event_type']
+                    'sensor_type': int(task['device_type']),
+                    'sensor_action': int(task['event_type'])
                 }
                 task_sub_device_id = task.get('subDeviceId', None)
                 if task_sub_device_id:

Controller/SensorGateway/SubDeviceController.py

@@ -219,7 +219,7 @@ class GatewaySubDeviceView(View):
         now_time = int(time.time())
         # 判断event_type
         event_type = int(event_type)
-        if event_type != 2200 or event_type != 2201:
+        if event_type != 2200 and event_type != 2201:
             return response.json(444, {'invalid eventType': event_type})
 
         try: