|
|
@@ -965,19 +965,17 @@ class EquipmentManagerV3(View):
|
|
|
"""
|
|
|
测试工具删除设备
|
|
|
@param request_dict: 请求数据
|
|
|
- @request_dict user_id: 用户id
|
|
|
@request_dict uid: uid
|
|
|
@request_dict time_stamp: 时间戳
|
|
|
@request_dict time_stamp_token: 时间戳token
|
|
|
@param response: 响应
|
|
|
@return: response
|
|
|
"""
|
|
|
- user_id = request_dict.get('user_id')
|
|
|
uid = request_dict.get('uid')
|
|
|
time_stamp = request_dict.get('time_stamp', None)
|
|
|
time_stamp_token = request_dict.get('time_stamp_token', None)
|
|
|
|
|
|
- if not all([user_id, uid, time_stamp, time_stamp_token]):
|
|
|
+ if not all([uid, time_stamp, time_stamp_token]):
|
|
|
return response.json(444)
|
|
|
|
|
|
try:
|
|
|
@@ -986,11 +984,10 @@ class EquipmentManagerV3(View):
|
|
|
return response.json(13)
|
|
|
|
|
|
with transaction.atomic():
|
|
|
- Device_Info.objects.filter(userID_id=user_id, UID=uid).delete()
|
|
|
+ Device_Info.objects.filter(UID=uid).delete()
|
|
|
# 删除推送消息
|
|
|
for val in range(1, 8):
|
|
|
- EquipmentInfoService.get_equipment_info_model('', val). \
|
|
|
- filter(device_user_id=user_id, device_uid=uid).delete()
|
|
|
+ EquipmentInfoService.get_equipment_info_model('', val).filter(device_uid=uid).delete()
|
|
|
return response.json(0)
|
|
|
except Exception as e:
|
|
|
return response.json(500, repr(e))
|
