优化删除设备同时删除推送信息

Controller/EquipmentManager.py

@@ -813,27 +813,23 @@ def deleteInterface(request):
             if userID == dv_qs[0].vodPrimaryUserID:
                 Device_Info.objects.filter(UID=uid).update(vodPrimaryUserID='', vodPrimaryMaster='')
 
+            up_qs = UidPushModel.objects.filter(uid_set__uid=uid)
             if dv_qs[0].isShare:
-                dv_qs.delete()
                 DeviceShareView.del_device_channel_permission(userID, uid)
             else:
                 # a.主用户删除设备
-                dv_qs.delete()
                 # 删除设备影子信息uid_set   外键关联删除设备推送配置信息 uid_push
-                up_qs = UidPushModel.objects.filter(uid_set__uid=uid)
                 DetectControllerView().do_delete_redis(uid)
                 if up_qs.count() > 1:
-                    UidPushModel.objects.filter(uid_set__uid=uid, userID_id=userID).delete()
                     redisObj = RedisObject()
                     ykey = '{uid}_redis_qs'.format(uid=uid)
                     if ykey:
                         redisObj.del_data(key=ykey)
-                else:
-                    up_qs.delete()
                 # b.删除次用户设备
                 Device_Info.objects.filter(UID=uid, isShare=True, primaryUserID=userID).delete()
                 DeviceShareView.del_device_channel_permission('', uid)
-
+            up_qs.delete()
+            dv_qs.delete()
             if not serial_number:
                 serial_number = CommonService.query_serial_with_uid(uid)
             del_unicom_info(userID, serial_number)