pmc

Controller/EquipmentManager.py

@@ -108,7 +108,6 @@ def showAllUserEquipment(userID, response):
         return response.json(0, res)
 
 
-
 def showAllUserEquipmentPC(userID, fieldDict, response):
     try:
         user_valid = Device_User.objects.filter(userID=userID).order_by('-data_joined')
@@ -179,21 +178,31 @@ def queryUserEquipmentInterface(request):
     res = CommonService.qs_to_dict(dvqs)
     datas = res['datas']
     uid_list = []
+    pm_master = []
     for q in datas:
         uid_list.append(q['fields']['UID'])
+        if q['fields']['UID']:
+            pm_master.append(q['fields']['primaryUserID'])
     ubqs = UID_Bucket.objects.filter(uid__in=uid_list). \
         values('bucket__content', 'status', 'channel', 'endTime', 'uid')
     ubql = CommonService.qs_to_list(ubqs)
-    # print(uid_list)
     res = []
+    pm_names = Device_User.objects.filter(userID__in=pm_master).values_list('userID', 'username').distinct()
+    pm_dict = {}
+    for pm in pm_names:
+        pm_dict[pm[0]] = pm[1]
+    print(pm_names)
+    # 获取设备主用户名字
     for p in datas:
         p['fields']['vod'] = []
         for dm in ubql:
             if p['fields']['UID'] == dm['uid']:
                 p['fields']['vod'].append(dm)
-        p['fields']['master'] = ModelService.get_user_name(p['fields']['primaryUserID'])
+        if p['fields']['primaryUserID'] in pm_dict.keys():
+            p['fields']['primaryMaster'] = pm_dict[p['fields']['primaryUserID']]
+        else:
+            p['fields']['primaryMaster'] = ''
         res.append(p)
-    # print(res)
     return response.json(0, {'datas': res})
 
 

Model/models.py

@@ -213,52 +213,6 @@ class Device_User(AbstractBaseUser):
             rids.append(role.rid)
         return rids
 
-    # def has_perm(self, permission, obj=None):
-    #     roles = self.role.all()
-    #     for role in roles:
-    #         if role.rid == 100:
-    #             return True
-    #
-    #     permlist = self.permission.all()
-    #     for perm in permlist:
-    #         if perm.permName == permission:
-    #             return True
-    #
-    #     for role in roles:
-    #         permlist = role.permission.all()
-    #         for perm in permlist:
-    #             if perm.permName == permission:
-    #                 return True
-    #
-    #     return False
-
-    # def get_all_perms_id(self):
-    #     roles = self.role.all()
-    #     perms = self.permission.all()
-    #
-    #     permslist = []
-    #     for role in roles:
-    #         if role.rid == 100:
-    #             perms = Permissions.objects.all()
-    #             for perm in perms:
-    #                 permslist.append(perm.id)
-    #             return permslist
-    #
-    #     for perm in perms:
-    #         permslist.append(perm.id)
-    #
-    #     permSet = set(permslist)
-    #     for role in roles:
-    #         permlist_tmp = []
-    #         for perm in role.permission.all():
-    #             permlist_tmp.append(perm.id)
-    #
-    #         permSet_tmp = set(permlist_tmp)
-    #         permSet = permSet.union(permSet_tmp)
-    #         permslist = list(permSet)
-    #         permslist.sort()
-    #         return permslist
-
     def get_all_permission(self):
         roles = self.role.all()
         perms = self.permission.all()
@@ -286,9 +240,6 @@ class Device_User(AbstractBaseUser):
             permslist.sort()
             return permslist
 
-    # def has_module_perms(self, app_label):
-    #     return True
-
     @property
     def is_staff(self):
         return self.is_superuser