Просмотр исходного кода

添加智能场景接口允许startTime、endTime、repeat为零

peng 3 лет назад
Родитель
Сommit
675d31a7e8
2 измененных файлов с 2 добавлено и 6 удалено
  1. 2 5
      Controller/SensorGateway/SmartSceneController.py
  2. 0 1
      Model/models.py

+ 2 - 5
Controller/SensorGateway/SmartSceneController.py

@@ -233,8 +233,6 @@ class SmartSceneView(View):
 
             with transaction.atomic():
                 if not is_all_day or is_all_day == 1:  # 不设置时间或全天
-                    if is_all_day == 1:
-                        smart_scene_dict['is_all_day'] = is_all_day
                     smart_scene_qs = SmartScene.objects.create(**smart_scene_dict)
                 elif is_all_day == 2:
                     # if is_all_day == '0':
@@ -249,8 +247,8 @@ class SmartSceneView(View):
                     start_time = int(request_dict.get('startTime', None))
                     end_time = int(request_dict.get('endTime', None))
                     repeat = int(request_dict.get('repeat', None))
-                    if not all([start_time, end_time, repeat]):
-                        return response.json(444, {'error param': 'startTime and endTime and repeat'})
+                    # if not all([start_time, end_time, repeat]):
+                    #     return response.json(444, {'error param': 'startTime and endTime and repeat'})
                     effective_time_qs = EffectiveTime.objects.filter(start_time=start_time, end_time=end_time,
                                                                      repeat=repeat).values('id')
                     if effective_time_qs.exists():
@@ -259,7 +257,6 @@ class SmartSceneView(View):
                         effective_time_id = EffectiveTime.objects.create(start_time=start_time, end_time=end_time,
                                                                          repeat=repeat).id
                     smart_scene_dict['effective_time_id'] = effective_time_id
-                    smart_scene_dict['is_all_day'] = is_all_day
                     smart_scene_qs = SmartScene.objects.create(**smart_scene_dict)
                 else:
                     return response.json(444, {'error param': 'invalid isAllDay'})

+ 0 - 1
Model/models.py

@@ -2633,7 +2633,6 @@ class SmartScene(models.Model):
     tasks = models.CharField(default='', max_length=255, verbose_name=u'任务')
     is_all_day = models.SmallIntegerField(default=0, verbose_name=u'是否全天')  # 0: 不设置时间, 1: 全天, 2: 非全天
     effective_time_id = models.IntegerField(default=0, verbose_name=u'关联场景执行时间id')
-    is_all_day = models.BooleanField(default=False, verbose_name=u'是否全天')
     is_enable = models.BooleanField(default=True, verbose_name=u'是否开启')
     device_data = models.CharField(default='', max_length=255, verbose_name=u'设备场景数据')
     created_time = models.IntegerField(default=0, verbose_name='创建时间')