chenshibin преди 4 години
родител
ревизия
8fb05415e7
променени са 3 файла, в които са добавени 23 реда и са изтрити 0 реда
  1. 4 0
      Controller/EquipmentManager.py
  2. 5 0
      Controller/EquipmentManagerV2.py
  3. 14 0
      Controller/EquipmentManagerV3.py

+ 4 - 0
Controller/EquipmentManager.py

@@ -771,6 +771,10 @@ def queryInterface(request):
         dvls = CommonService.qs_to_list(dvql)
         uid_list = []
         for dvl in dvls:
+            if dvl['primaryUserID'] and dvl['id'] == dvl['primaryUserID']:
+                dvl['isPrimaryUser'] = 1
+            else:
+                dvl['isPrimaryUser'] = 0
             uid_list.append(dvl['UID'])
             # if dvl['isShare'] is False:
             #     uid_list.append(dvl['UID'])

+ 5 - 0
Controller/EquipmentManagerV2.py

@@ -152,6 +152,11 @@ class EquipmentManagerV2(View):
             dvls = CommonService.qs_to_list(dvql)
             uid_list = []
             for dvl in dvls:
+                if dvl['primaryUserID'] and dvl['id'] == dvl['primaryUserID']:
+                    dvl['isPrimaryUser'] = 1
+                else:
+                    dvl['isPrimaryUser'] = 0
+
                 uid_list.append(dvl['UID'])
                 # if dvl['isShare'] is False:
                 #     uid_list.append(dvl['UID'])

+ 14 - 0
Controller/EquipmentManagerV3.py

@@ -50,6 +50,8 @@ class EquipmentManagerV3(View):
                 return self.do_modify(userID, request_dict, response, request)
             elif operation == 'fuzzyQuery':
                 return self.do_fuzzy_query(userID, request_dict, response)
+            elif operation == 'mainUserDevice':
+                return self.do_mainUserDevice(userID, request_dict, response)
             else:
                 return response.json(414)
         else:
@@ -256,7 +258,13 @@ class EquipmentManagerV3(View):
             dvls = CommonService.qs_to_list(dvql)
             uid_list = []
             for dvl in dvls:
+                if dvl['primaryUserID'] and dvl['id'] == dvl['primaryUserID']:
+                    dvl['isPrimaryUser'] = 1
+                else:
+                    dvl['isPrimaryUser'] = 0
+
                 uid_list.append(dvl['UID'])
+
             ubqs = UID_Bucket.objects.filter(uid__in=uid_list). \
                 values('bucket__content', 'status', 'channel', 'endTime', 'uid')
             upqs = UID_Preview.objects.filter(uid__in=uid_list).order_by('channel').values('id', 'uid', 'channel')
@@ -583,3 +591,9 @@ class EquipmentManagerV3(View):
                 # 去前3位,后3位
                 password = password[3:-3]
         return password
+
+    def do_mainUserDevice(self, request_dict, response):
+        vodPrimaryUserID = request_dict.get('vodPrimaryUserID')
+        qs =Device_User.objects.filter(userID=vodPrimaryUserID).values('NickName', 'username', 'userEmail', 'phone')
+        dvql = CommonService.qs_to_list(qs)
+        return response.json(0, dvql)