uid_sarr

Controller/UserController.py

@@ -27,7 +27,7 @@ from ratelimit.decorators import ratelimit
 
 from Ansjer.config import AuthCode_Expire, SERVER_DOMAIN, APNS_CONFIG, JPUSH_CONFIG, FCM_CONFIG, TUTK_PUSH_DOMAIN
 from Controller.CheckUserData import DataValid, date_handler, RandomStr
-from Model.models import Device_User, Role, UidPushModel, UserOauth2Model, UserExModel, Device_Info
+from Model.models import Device_User, Role, UidPushModel, UserOauth2Model, UserExModel, Device_Info,UidSetModel
 from Object.AWS.SesClassObject import SesClassObject
 from Object.AliSmsObject import AliSmsObject
 from Object.RedisObject import RedisObject
@@ -2065,11 +2065,17 @@ class alexaUidView(TemplateView):
         sst = request_dict.get('sst')
         if sid == 'admin' and sst == 'admin':
             uid_qs = Device_Info.objects.filter(userID_id=userID, isExist=1).values('UID', 'NickName', 'View_Password')
-            uid_arr = []
+            uid_dict = {}
+            uid_list = []
             for uid_q in uid_qs:
-                uid_arr.append({'uid': uid_q['UID'], 'nick': uid_q['NickName'], 'password': uid_q['View_Password']})
+                uid_list.append(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')
+            uid_arr = []
+            for us in us_qs:
+                uid = us['uid']
+                uid_arr.append({'uid': uid, 'nick': uid_dict[uid]['NickName'], 'password': uid_dict['uid']['View_Password']})
             res = {
-                'userID': userID,
                 'uid_arr': uid_arr
             }
             return response.json(0,res)