fix nickname bug

Controller/EquipmentManager.py

@@ -613,10 +613,10 @@ def queryInterface(request):
         nowTime = int(time.time())
         data = []
         # 设备拓展信息表
-        us_qs = UidSetModel.objects.filter(uid__in=uid_list).values('uid', 'version')
+        us_qs = UidSetModel.objects.filter(uid__in=uid_list).values('uid', 'version', 'nickname')
         uv_dict = {}
         for us in us_qs:
-            uv_dict[us['uid']] = us['version']
+            uv_dict[us['uid']] = {'version': us['version'], 'nickname': us['nickname']}
         for p in dvls:
             p['vod'] = []
             for dm in ubqs:
@@ -629,7 +629,16 @@ def queryInterface(request):
                     obj = 'uid_preview/{uid}/channel_{channel}.png'.format(uid=up['uid'], channel=up['channel'])
                     img_sign = bucket.sign_url('GET', obj, 300)
                     p['preview'].append(img_sign)
-            p['uid_version'] = uv_dict[p['UID']] if p['UID'] in uv_dict else ''
+            p_uid = p['UID']
+            if p_uid in uv_dict:
+                # 设备版本号
+                p['uid_version'] = uv_dict[p_uid]['version']
+                # 设备昵称
+                if uv_dict[p_uid]['nickname']:
+                    p['NickName'] = uv_dict[p_uid]['nickname']
+            else:
+                # 设备版本号
+                p['uid_version'] = ''
             data.append(p)
         return response.json(0, data)
     else: