Alexa搜索设备增加多通道设备

Controller/UserController.py

@@ -32,7 +32,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, UidSetModel, \
-    UserAppFrequencyModel, CountryIPModel, CountryModel
+    UserAppFrequencyModel, CountryIPModel, CountryModel, UidChannelSetModel
 from Object.AWS.SesClassObject import SesClassObject
 from Object.AliSmsObject import AliSmsObject
 from Object.RedisObject import RedisObject
@@ -2747,19 +2747,31 @@ class alexaUidView(TemplateView):
             # 给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')
+        us_qs = UidSetModel.objects.filter(uid__in=uid_list, is_alexa=1).values('uid', 'region_alexa', 'channel')
         if not us_qs.exists():
             return response.json(173)
         # uid,password,region的列表
         uid_arr = []
         for us in us_qs:
             uid = us['uid']
+            channel = us['channel']
             # 设备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})
+
+            # 多通道设备获取通道名
+            if channel > 1:
+                uid_channel_set_qs = UidChannelSetModel.objects.filter(uid=us).values('channel', 'channel_name')
+                if uid_channel_set_qs.exists():
+                    # DVR设备名为 UidChannelSetModel 的 channel_name
+                    for uid_channel_set in uid_channel_set_qs:
+                        uid_arr.append({'uid': uid, 'nick': uid_channel_set.channel_name, 'region': region_alexa,
+                                        'password': uid_dict[uid]['password'], 'multi_channel': 1,
+                                        'channel': uid_channel_set.channel})
+            else:
+                uid_arr.append({'uid': uid, 'nick': uid_dict[uid]['nick'], 'region': region_alexa,
+                                'password': uid_dict[uid]['password'], 'multi_channel': 0})
         res = {
             'uid_arr': uid_arr
         }