alexa搜索设备

Controller/UserController.py

@@ -2729,39 +2729,41 @@ class alexaUidView(TemplateView):
             return response.json(107)
 
     def validates(self, request_dict, response):
-        userID = request_dict.get('alexa_user_id')
         sid = request_dict.get('sid')
         sst = request_dict.get('sst')
+        userID = request_dict.get('alexa_user_id')
 
-        if sid == 'admin' and sst == 'admin':
-            uid_qs = Device_Info.objects.filter(userID_id=userID, isExist=1).values('UID', 'NickName', 'View_Password')
-            uid_dict = {}
-            uid_list = []
-            for uid_q in uid_qs:
-                # 追加
-                uid_list.append(uid_q['UID'])
-                # 给uid_q['UID']赋值
-                uid_dict[uid_q['UID']] = {'nick': uid_q['NickName'], 'password': uid_q['View_Password']}
-            us_qs = UidSetModel.objects.filter(uid__in=uid_list, is_alexa=1).values('uid', 'region_alexa')
-
-            # uid,password,region的列表
-            uid_arr = []
-            for us in us_qs:
-                uid = us['uid']
-                # 设备alexa区域
-                region_alexa = us['region_alexa']
-                if region_alexa == '':
-                    region_alexa = "en"
-                # uid_arr.append({'uid': uid, 'nick': uid_dict[uid]['nick'], 'password': uid_dict['uid']['password']})
-                uid_arr.append({'uid': uid, 'nick': uid_dict[uid]['nick'], 'password': uid_dict[uid]['password'],
-                                'region': region_alexa})
-            res = {
-                'uid_arr': uid_arr
-
-            }
-            return response.json(0, res)
-        else:
+        if sid != 'admin' or sst != 'admin':
             return response.json(107)
+        uid_qs = Device_Info.objects.filter(userID_id=userID, isExist=1).values('UID', 'NickName', 'View_Password')
+        if not uid_qs.exists():
+            return response.json(107)
+
+        uid_dict = {}
+        uid_list = []
+        for uid_q in uid_qs:
+            # 追加
+            uid_list.append(uid_q['UID'])
+            # 给uid_q['UID']赋值
+            uid_dict[uid_q['UID']] = {'nick': uid_q['NickName'], 'password': uid_q['View_Password']}
+
+        us_qs = UidSetModel.objects.filter(uid__in=uid_list, is_alexa=1).values('uid', 'region_alexa')
+        if not us_qs.exists():
+            return response.json(173)
+        # uid,password,region的列表
+        uid_arr = []
+        for us in us_qs:
+            uid = us['uid']
+            # 设备alexa区域
+            region_alexa = us['region_alexa']
+            if region_alexa == '':
+                region_alexa = 'EN'
+            uid_arr.append({'uid': uid, 'nick': uid_dict[uid]['nick'], 'password': uid_dict[uid]['password'],
+                            'region': region_alexa})
+        res = {
+            'uid_arr': uid_arr
+        }
+        return response.json(0, res)
 
 
 # 登出