|
@@ -123,11 +123,15 @@ class DeviceManagement(View):
|
|
# 根据id删除设备
|
|
# 根据id删除设备
|
|
def deleteDevice(self, request_dict, response):
|
|
def deleteDevice(self, request_dict, response):
|
|
deviceID = request_dict.get('deviceID', None)
|
|
deviceID = request_dict.get('deviceID', None)
|
|
- if not deviceID:
|
|
|
|
|
|
+ userID = request_dict.get('userID', None)
|
|
|
|
+ uid = request_dict.get('uid', None)
|
|
|
|
+ if not all([deviceID, userID, uid]):
|
|
return response.json(444)
|
|
return response.json(444)
|
|
|
|
|
|
try:
|
|
try:
|
|
- Device_Info.objects.filter(id=deviceID).delete()
|
|
|
|
|
|
+ with transaction.atomic():
|
|
|
|
+ Device_Info.objects.filter(id=deviceID).delete()
|
|
|
|
+ Equipment_Info.objects.filter(userID_id=userID, devUid=uid).delete() # 删除推送消息
|
|
return response.json(0)
|
|
return response.json(0)
|
|
except Exception as e:
|
|
except Exception as e:
|
|
print(e)
|
|
print(e)
|