Переглянути джерело

优化排程重复设置逻辑

zhangdongming 2 роки тому
батько
коміт
2eaf692421
1 змінених файлів з 7 додано та 7 видалено
  1. 7 7
      Controller/SensorGateway/SmartSocketController.py

+ 7 - 7
Controller/SensorGateway/SmartSocketController.py

@@ -269,13 +269,6 @@ class SmartSocketView(View):
             task_switch = request_dict.get('taskSwitch', None)
             if not all([task_type, start_time, end_time, repeat, device_switch, task_switch]):
                 return response.json(444)
-            # 排查是否已设置过当前排程
-            socket_s_qs = SocketSchedule.objects.filter(device_id=device_id,
-                                                        start_time=int(start_time),
-                                                        end_time=int(end_time),
-                                                        time_type=int(task_type))
-            if socket_s_qs.exists():
-                return response.json(174)
             device_switch = int(device_switch)
             task_switch = int(task_switch)
             now_time = int(time.time())
@@ -293,6 +286,13 @@ class SmartSocketView(View):
                 data['updated_time'] = now_time
                 socket_schedule_qs.update(**data)
             else:
+                # 排查是否已设置过当前排程
+                socket_s_qs = SocketSchedule.objects.filter(device_id=device_id,
+                                                            start_time=int(start_time),
+                                                            end_time=int(end_time),
+                                                            time_type=int(task_type))
+                if socket_s_qs.exists():
+                    return response.json(174)
                 # 添加排程
                 data['device_id'] = device_id
                 data['serial_number'] = serial_number