Prechádzať zdrojové kódy

修复检查二维码是否过期接口,创建智能场景接口

peng 3 rokov pred
rodič
commit
6269f0d29f

+ 2 - 2
Controller/SensorGateway/GatewayFamilyMemberController.py

@@ -538,11 +538,11 @@ class GatewayFamilyMemberView(View):
         if not user_family_qs.exists():
             return response.json(173)
         user_family_qs = user_family_qs.values('id', 'name', 'user__userEmail',
-                                               'user__userIconUrl',
+                                               'user__userIconPath',
                                                'user__phone', 'user__NickName',
                                                'user__username')
         user_icon_url = ''
-        userIconPath = str(user_family_qs[0]['userIconPath'])
+        userIconPath = str(user_family_qs[0]['user__userIconPath'])
         if userIconPath and userIconPath.find('static/') != -1:
             userIconPath = userIconPath.replace('static/', '').replace('\\', '/')
             user_icon_url = SERVER_DOMAIN + 'account/getAvatar/' + userIconPath

+ 1 - 3
Controller/SensorGateway/SmartSceneController.py

@@ -189,8 +189,6 @@ class SmartSceneView(View):
         tasks = request_dict.get('tasks', None)
         is_all_day = request_dict.get('isAllDay', None)
 
-        if not any([device_id, sub_device_id]):
-            return response.json(444, {'error param': 'deviceId or subDeviceId'})
         if not all([conditions, tasks]):
             return response.json(444, {'error param': 'conditions and tasks'})
 
@@ -238,7 +236,7 @@ class SmartSceneView(View):
                 msg['scene_status'] = 1
                 msg['sensor_type'] = conditions_dict['sensor']['device_type']
                 msg['sensor_src'] = int(sub_device_qs[0]['src_addr'], 16)
-                msg['sensor_status'] = int(conditions_dict['sensor']['eventValues'][0]['value'])
+                msg['sensor_status'] = int(conditions_dict['sensor']['eventValues'][0]['event_type'])
 
             with transaction.atomic():
                 if is_all_day is None:  # 不设置时间