查询主用户接口优化

Controller/EquipmentManagerV3.py

@@ -71,7 +71,7 @@ class EquipmentManagerV3(View):
         elif operation == 'fuzzyQuery':
             return self.do_fuzzy_query(userID, request_dict, response)
         elif operation == 'mainUserDevice':
-            return self.do_mainUserDevice(request_dict, response)
+            return self.do_mainUserDevice(request_dict, response, userID)
         elif operation == 'getDeviceFeatures':
             return self.do_get_device_features(request_dict, response)
         elif operation == 'deviceRouse':
@@ -1053,7 +1053,7 @@ class EquipmentManagerV3(View):
         return password
 
     @staticmethod
-    def do_mainUserDevice(request_dict, response):
+    def do_mainUserDevice(request_dict, response, user_id):
         """
         根据UID或序列号获取云存主用户信息
         """
@@ -1064,7 +1064,11 @@ class EquipmentManagerV3(View):
                 dvq = Device_Info.objects.filter(UID=UID)
             elif serial_number:
                 serial_number = serial_number[:9]
-                dvq = Device_Info.objects.filter(serial_number=serial_number)
+                uid = CommonService.get_uid_by_serial_number(serial_number)
+                if serial_number == uid:  # 没查到绑定对应的UID
+                    dvq = Device_Info.objects.filter(serial_number=serial_number)
+                else:  # 根据序列号查到了对应的UID
+                    dvq = Device_Info.objects.filter(UID=uid)
             else:
                 return response.json(444)
             dvq = dvq.filter(~Q(vodPrimaryUserID='')).values('vodPrimaryUserID')
@@ -1077,14 +1081,19 @@ class EquipmentManagerV3(View):
             nickname = qs[0]['username']
             phone = qs[0]['phone']
             username = qs[0]['username']
+            sys_user_id = qs[0]['userID']
+
             qs = CommonService.qs_to_list(qs)
             if nickname == '':
                 qs[0]['NickName'] = username
             if phone == '':
                 qs[0]['phone'] = nickname
+
+            # 查询主用户并且返回主用户是否是当前账户标识
+            qs[0]['isOwnUser'] = sys_user_id and user_id and sys_user_id == user_id
             return response.json(0, qs)
         except Exception as e:
-            LOGGER.info('异常详情,errLine:{}, errMsg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
+            LOGGER.info('异常详情,userID:{}, errLine:{}, errMsg:{}'.format(user_id, e.__traceback__.tb_lineno, repr(e)))
             return response.json(500)
 
     def not_login_do_mainUserDevice(self, request_dict, response):