后台删除数据/序列号解绑uid删除推送数据

AdminController/DeviceManagementController.py

@@ -421,7 +421,7 @@ class DeviceManagement(View):
                 if '设备配置数据' in delDataOptions:
                     UidSetModel.objects.filter(uid__in=uidList).delete()
                 if '设备推送数据' in delDataOptions:
-                    Equipment_Info.objects.filter(devUid__in=uidList).delete()
+                    EquipmentInfoService.delete_all_equipment_info(device_uid__in=uidList)
                 if '设备AP信息数据' in delDataOptions:
                     UidUserModel.objects.filter(UID__in=uidList).delete()
                 if '设备AI数据' in delDataOptions:

Controller/SerialNumberController.py

@@ -514,8 +514,7 @@ class SerialNumberView(View):
                 UidPushModel.objects.filter(uid_set__uid=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()
+                EquipmentInfoService.delete_all_equipment_info(device_uid=uid)
 
                 # 重置设备云存
                 UID_Bucket.objects.filter(uid=uid).delete()

Service/EquipmentInfoService.py

@@ -661,6 +661,16 @@ class EquipmentInfoService:
         for equipment_info_model in EQUIPMENT_INFO_MODEL_LIST:
             equipment_info_model.objects.filter(**kwargs).update(answer_status=1)
 
+    @staticmethod
+    def delete_all_equipment_info(**kwargs):
+        """
+        删除全部推送消息
+        @param kwargs:
+        @return:
+        """
+        for equipment_info_model in EQUIPMENT_INFO_MODEL_LIST:
+            equipment_info_model.objects.filter(**kwargs).delete()
+
     @staticmethod
     def get_equipment_info_model_with_full_id(full_id):
         """