peng 1 жил өмнө
parent
commit
b5262617b8

+ 1 - 1
Controller/EquipmentManager.py

@@ -823,7 +823,7 @@ def deleteInterface(request):
                 UidPushModel.objects.filter(uid_set__uid=uid).delete()
                 # 删除推送消息
                 del_eq_info_thread = threading.Thread(target=ModelService.del_user_list_eq_info,
-                                                      args=(user_id_list, uid))
+                                                      args=(user_id_list, userID, uid))
             else:
                 Device_Info.objects.filter(UID=uid, userID_id=userID).delete()
                 UidPushModel.objects.filter(uid_set__uid=uid, userID_id=userID).delete()

+ 3 - 1
Service/ModelService.py

@@ -158,13 +158,15 @@ class ModelService:
                 eq_list.delete()
 
     @staticmethod
-    def del_user_list_eq_info(user_id_list, uid):
+    def del_user_list_eq_info(user_id_list, user_id, uid):
         """
         根据用户id列表删除设备推送消息
         @param user_id_list: 用户id列表
+        @param user_id: 主用户id
         @param uid:
         @return:
         """
+        notify_alexa_delete(user_id, uid)
         for i in range(1, 8):
             EquipmentInfoService.get_equipment_info_model('', i).\
                 filter(device_user_id__in=user_id_list, device_uid=uid).delete()