is_all_day字段从场景执行时间表移到智能场景表

Controller/SensorGateway/SmartSceneController.py

@@ -234,13 +234,14 @@ class SmartSceneView(View):
                 if not is_all_day:  # 没传时间
                     smart_scene_qs = SmartScene.objects.create(**smart_scene_dict)
                 else:
-                    if is_all_day == '0':
-                        effective_time_qs = EffectiveTime.objects.filter(is_all_day=True).values('id')
-                        if effective_time_qs.exists():
-                            effective_time_id = effective_time_qs[0]['id']
-                        else:
-                            effective_time_id = EffectiveTime.objects.create(is_all_day=True).id
-                        smart_scene_dict['effective_time_id'] = effective_time_id
+                    if is_all_day == '1':
+                        # effective_time_qs = EffectiveTime.objects.filter(is_all_day=True).values('id')
+                        # if effective_time_qs.exists():
+                        #     effective_time_id = effective_time_qs[0]['id']
+                        # else:
+                        #     effective_time_id = EffectiveTime.objects.create(is_all_day=True).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:
                         start_time = int(request_dict.get('startTime', None))

Model/models.py

@@ -2632,6 +2632,7 @@ class SmartScene(models.Model):
     conditions = models.CharField(default='', max_length=255, verbose_name=u'条件')
     tasks = models.CharField(default='', max_length=255, verbose_name=u'任务')
     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='创建时间')
@@ -2645,7 +2646,6 @@ class SmartScene(models.Model):
 
 class EffectiveTime(models.Model):
     id = models.AutoField(primary_key=True, verbose_name=u'自增标记id')
-    is_all_day = models.BooleanField(default=False, verbose_name=u'是否全天')
     start_time = models.SmallIntegerField(default=0, verbose_name=u'开始时间')
     end_time = models.SmallIntegerField(default=0, verbose_name=u'结束时间')
     repeat = models.SmallIntegerField(default=0, verbose_name=u'重复周期')