|
@@ -523,7 +523,7 @@ class SmartSceneView(View):
|
|
|
@param response: 响应对象
|
|
@param response: 响应对象
|
|
|
@return: response
|
|
@return: response
|
|
|
"""
|
|
"""
|
|
|
- smart_scene_id = request_dict.get('smartSceneId', None)
|
|
|
|
|
|
|
+ smart_scene_id = int(request_dict.get('smartSceneId', None))
|
|
|
device_id = request_dict.get('deviceId', None)
|
|
device_id = request_dict.get('deviceId', None)
|
|
|
sub_device_id = request_dict.get('subDeviceId', None)
|
|
sub_device_id = request_dict.get('subDeviceId', None)
|
|
|
scene_name = request_dict.get('sceneName', None)
|
|
scene_name = request_dict.get('sceneName', None)
|
|
@@ -592,7 +592,7 @@ class SmartSceneView(View):
|
|
|
serial_number = sub_device_qs[0]['device__serial_number']
|
|
serial_number = sub_device_qs[0]['device__serial_number']
|
|
|
msg['smart_scene_id'] = smart_scene_id
|
|
msg['smart_scene_id'] = smart_scene_id
|
|
|
msg['scene_status'] = 1 if smart_scene_qs[0].is_enable else 0
|
|
msg['scene_status'] = 1 if smart_scene_qs[0].is_enable else 0
|
|
|
- msg['sensor_type'] = conditions_dict['sensor']['device_type']
|
|
|
|
|
|
|
+ msg['sensor_type'] = int(conditions_dict['sensor']['device_type'])
|
|
|
msg['sensor_src'] = int(sub_device_qs[0]['src_addr'], 16)
|
|
msg['sensor_src'] = int(sub_device_qs[0]['src_addr'], 16)
|
|
|
msg['sensor_status'] = int(conditions_dict['sensor']['eventValues'][0]['event_type'])
|
|
msg['sensor_status'] = int(conditions_dict['sensor']['eventValues'][0]['event_type'])
|
|
|
else:
|
|
else:
|
