Quellcode durchsuchen

优化删除设备接口5

locky vor 2 Jahren
Ursprung
Commit
df303dc40e
1 geänderte Dateien mit 4 neuen und 6 gelöschten Zeilen
  1. 4 6
      Controller/EquipmentManager.py

+ 4 - 6
Controller/EquipmentManager.py

@@ -818,18 +818,16 @@ def deleteInterface(request):
             del_channel_permission_user_id = ''
             # 主用户删除
             if userID == vod_primary_user_id:
-                user_id_list = Device_Info.objects.filter(UID=uid).values_list('userID_id', flat=True)
+                user_id_list = list(Device_Info.objects.filter(UID=uid).values_list('userID_id', flat=True))
                 Device_Info.objects.filter(UID=uid).delete()
                 UidPushModel.objects.filter(uid_set__uid=uid).delete()
-                # 异步删除推送消息
-                asy = threading.Thread(target=ModelService.del_user_list_eq_info, args=(user_id_list, uid))
-                asy.start()
+                # 删除推送消息
+                ModelService.del_user_list_eq_info(user_id_list, uid)
             else:
                 Device_Info.objects.filter(UID=uid, userID_id=userID).delete()
                 UidPushModel.objects.filter(uid_set__uid=uid, userID_id=userID).delete()
                 # 异步删除推送消息
-                asy = threading.Thread(target=ModelService.del_eq_info, args=(userID, uid))
-                asy.start()
+                ModelService.del_eq_info, args=(userID, uid)
                 if is_share:
                     del_channel_permission_user_id = userID
             DeviceShareView.del_device_channel_permission(userID, uid)