Browse Source

修复删除场景失败问题

locky 2 years ago
parent
commit
3e9e716f21
1 changed files with 1 additions and 1 deletions
  1. 1 1
      Controller/SensorGateway/GatewayDeviceController.py

+ 1 - 1
Controller/SensorGateway/GatewayDeviceController.py

@@ -170,7 +170,6 @@ class GatewayDeviceView(View):
                             sub_id_list = gateway_qs.values_list('id', flat=True)
                             smart_scene_qs = SmartScene.objects.filter(
                                 Q(device_id=device_id) | Q(sub_device_id__in=sub_id_list))
-                            gateway_qs.delete()
                         else:
                             smart_scene_qs = SmartScene.objects.filter(device_id=device_id)
                         if smart_scene_qs.exists():
@@ -189,6 +188,7 @@ class GatewayDeviceView(View):
                                     return response.json(10044)
                                 time.sleep(0.3)
                             smart_scene_qs.delete()
+                        gateway_qs.delete()     # 删除子设备
                         scene_log_qs = SceneLog.objects.filter(device_id=device_id)
                         if scene_log_qs.exists():
                             scene_log_qs.delete()