后台删除设备和序列号解绑uid删除推送分表数据

AdminController/DeviceManagementController.py

@@ -11,6 +11,8 @@ from Ansjer.config import OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
 from django.views.generic.base import View
+
+from Service.EquipmentInfoService import EquipmentInfoService
 from Service.ModelService import ModelService
 from Service.CommonService import CommonService
 from Model.models import Device_Info, UidSetModel, LogModel, UID_Bucket, Unused_Uid_Meal, Order_Model, StsCrdModel, \
@@ -131,7 +133,10 @@ class DeviceManagement(View):
         try:
             with transaction.atomic():
                 Device_Info.objects.filter(id=deviceID).delete()
-                Equipment_Info.objects.filter(userID_id=userID, devUid=uid).delete()    # 删除推送消息
+                # 删除推送消息
+                for val in range(1, 8):
+                    EquipmentInfoService.get_equipment_info_model('', val).\
+                        filter(device_user_id=userID, device_uid=uid).delete()
             return response.json(0)
         except Exception as e:
             print(e)

Controller/SerialNumberController.py

@@ -20,6 +20,7 @@ from Object.TokenObject import TokenObject
 from Service.AlgorithmService import AlgorithmBaseOn35
 from Service.CommonService import CommonService
 from Ansjer.config import CRCKey, SERVER_TYPE, SERVER_DOMAIN_US, SERVER_DOMAIN_CN
+from Service.EquipmentInfoService import EquipmentInfoService
 from Service.ModelService import ModelService
 from Object.AWS.S3Email import S3Email
 
@@ -337,8 +338,10 @@ class SerialNumberView(View):
                 Device_Info.objects.filter(UID=uid).delete()
                 UidSetModel.objects.filter(uid=uid).delete()
                 UidUserModel.objects.filter(UID=uid).delete()
-                Equipment_Info.objects.filter(devUid=uid).delete()
                 iotdeviceInfoModel.objects.filter(serial_number=serial).delete()
+                # 删除推送消息
+                for val in range(1, 8):
+                    EquipmentInfoService.get_equipment_info_model('', val).filter(device_uid=uid).delete()
 
                 # 重置设备云存
                 UID_Bucket.objects.filter(uid=uid).delete()