Эх сурвалжийг харах

fix:add data and returen vod func

chenjunkai 6 жил өмнө
parent
commit
9bf60acf0e

+ 16 - 3
Controller/EquipmentManager.py

@@ -313,14 +313,27 @@ def addInterface(request):
                     # if is_bind:
                     #     return response.json(15)
                     try:
-                        userDevice = Device_Info(id=CommonService.getUserID(getUser=False), userID_id=userID, UID=UID,
+                        pk = CommonService.getUserID(getUser=False)
+                        userDevice = Device_Info(id=pk, userID_id=userID, UID=UID,
                                                  NickName=NickName, View_Account=View_Account,
                                                  View_Password=View_Password, Type=Type, ChannelIndex=ChannelIndex)
                         userDevice.save()
                     except Exception as e:
-                        return response.json(10, repr(10))
+                        return response.json(10, repr(e))
                     else:
-                        return response.json(0)
+                        dvqs = Device_Info.objects.filter(id=pk).values('id', 'userID', 'NickName', 'UID',
+                                                                        'View_Account',
+                                                                        'View_Password', 'ChannelIndex', 'Type',
+                                                                        'isShare',
+                                                                        'primaryUserID', 'primaryMaster',
+                                                                        'data_joined', 'version',
+                                                                        'isVod', 'isExist')
+                        dvql = CommonService.qs_to_list(dvqs)
+                        ubqs = UID_Bucket.objects.filter(uid=UID). \
+                            values('bucket__content', 'status', 'channel', 'endTime', 'uid')
+                        res = dvql[0]
+                        res['vod'] = list(ubqs)
+                        return response.json(0, res)
 
             else:
                 return response.json(444, {'param': 'UID'})