|
@@ -45,13 +45,18 @@ class UserDeviceService:
|
|
|
'isCameraOpenCloud', 'serial_number').order_by('-data_joined')
|
|
|
dv_list = CommonService.qs_to_list(dv_qs)
|
|
|
uid_list = []
|
|
|
- seen = set()
|
|
|
+ exist_uid = []
|
|
|
unique_results = []
|
|
|
for item in dv_qs:
|
|
|
- key = (item['userID'], item['UID']) # 根据 userID_id 和 UID 进行去重
|
|
|
- if key not in seen:
|
|
|
- seen.add(key)
|
|
|
+ UID = item['UID']
|
|
|
+ # 删除重复的uid数据
|
|
|
+ if UID not in exist_uid:
|
|
|
+ exist_uid.append(UID)
|
|
|
unique_results.append(item)
|
|
|
+ else:
|
|
|
+ Device_Info.objects.filter(id=item['id']).delete()
|
|
|
+ username = CommonService.get_username(user_id)
|
|
|
+ LOGGER.info('{}删除重复uid{}'.format(username, UID))
|
|
|
|
|
|
# 分页操作
|
|
|
dv_list = unique_results[(page - 1) * line:page * line]
|