ts

Controller/EquipmentManager.py

@@ -30,20 +30,19 @@ def queryUserEquipmentInterface(request):
     if not userID:
         return response.json(104)
     dvqs = Device_Info.objects.filter(userID_id=userID)
+    dvdict = CommonService.qs_to_dict(dvqs)
     uid_list = Device_Info.objects.filter(userID_id=userID, isShare=False).\
         values_list('UID', flat=True)
     ubqs = UID_Bucket.objects.filter(uid__in=uid_list). \
         values('bucket__content', 'status', 'channel', 'endTime', 'uid')
-    ubql = CommonService.qs_to_list(ubqs)
     res = []
-    for p in dvqs:
-        p.vod = []
-        for dm in ubql:
-            if p.UID == dm['uid']:
-                p.vod.append(dm)
+    for p in dvdict['datas']:
+        p['fields']['vod'] = []
+        for dm in ubqs:
+            if p['fields']['UID'] == dm['uid']:
+                p['fields']['vod'].append(dm)
         res.append(p)
-    resdict = CommonService.qs_to_dict(res)
-    return response.json(0, resdict)
+    return response.json(0, {'datas':res})
 
 
 @csrf_exempt