Forráskód Böngészése

优化重置和删除智能开关

peng 1 éve
szülő
commit
dc501c2e36
1 módosított fájl, 10 hozzáadás és 8 törlés
  1. 10 8
      Controller/SensorGateway/SmartSwitchController.py

+ 10 - 8
Controller/SensorGateway/SmartSwitchController.py

@@ -478,11 +478,12 @@ class SmartSwitchView(View):
             SwitchDimmingSettings.objects.filter(device_id=device_id).delete()
             SwitchDimmingSettings.objects.filter(device_id=device_id).delete()
             chronopher_qs = SwitchChronopher.objects.filter(device_id=device_id)
             chronopher_qs = SwitchChronopher.objects.filter(device_id=device_id)
             if chronopher_qs.exists():
             if chronopher_qs.exists():
-                chronopher_id = chronopher_qs[0].id
                 apscheduler_obj = ApschedulerObject()
                 apscheduler_obj = ApschedulerObject()
-                apscheduler_obj.del_job('switchchronopher_{}'.format(chronopher_id))  # 删除定时任务
-                apscheduler_obj.del_job('switchchronopher_{}_1'.format(chronopher_id))
-                apscheduler_obj.del_job('switchchronopher_{}_2'.format(chronopher_id))
+                for chronopher in chronopher_qs:
+                    chronopher_id = chronopher.id
+                    apscheduler_obj.del_job('switchchronopher_{}'.format(chronopher_id))  # 删除定时任务
+                    apscheduler_obj.del_job('switchchronopher_{}_1'.format(chronopher_id))
+                    apscheduler_obj.del_job('switchchronopher_{}_2'.format(chronopher_id))
                 chronopher_qs.delete()
                 chronopher_qs.delete()
             SceneLog.objects.filter(device_id=device_id).delete()
             SceneLog.objects.filter(device_id=device_id).delete()
             FamilyRoomDevice.objects.filter(device_id=device_id).delete()
             FamilyRoomDevice.objects.filter(device_id=device_id).delete()
@@ -503,11 +504,12 @@ class SmartSwitchView(View):
             SwitchDimmingSettings.objects.filter(device_id=device_id).delete()
             SwitchDimmingSettings.objects.filter(device_id=device_id).delete()
             chronopher_qs = SwitchChronopher.objects.filter(device_id=device_id)
             chronopher_qs = SwitchChronopher.objects.filter(device_id=device_id)
             if chronopher_qs.exists():
             if chronopher_qs.exists():
-                chronopher_id = chronopher_qs[0].id
                 apscheduler_obj = ApschedulerObject()
                 apscheduler_obj = ApschedulerObject()
-                apscheduler_obj.del_job('switchchronopher_{}'.format(chronopher_id))  # 删除定时任务
-                apscheduler_obj.del_job('switchchronopher_{}_1'.format(chronopher_id))
-                apscheduler_obj.del_job('switchchronopher_{}_2'.format(chronopher_id))
+                for chronopher in chronopher_qs:
+                    chronopher_id = chronopher.id
+                    apscheduler_obj.del_job('switchchronopher_{}'.format(chronopher_id))  # 删除定时任务
+                    apscheduler_obj.del_job('switchchronopher_{}_1'.format(chronopher_id))
+                    apscheduler_obj.del_job('switchchronopher_{}_2'.format(chronopher_id))
                 chronopher_qs.delete()
                 chronopher_qs.delete()
             SceneLog.objects.filter(device_id=device_id).delete()
             SceneLog.objects.filter(device_id=device_id).delete()
             msg = {
             msg = {