Răsfoiți Sursa

优化定时器

peng 1 an în urmă
părinte
comite
18d62efe6e

+ 2 - 2
Controller/SensorGateway/SmartSwitchController.py

@@ -302,13 +302,13 @@ class SmartSwitchView(View):
                     if time_point_device_will_doing in ['0', '1']:  # 开启或关闭
                         msg = {
                             "taskId": chronopher_id,
-                            "deviceSwitch": int(time_point_device_will_doing),  # 设备开关0:关,1:开
+                            "deviceSwitch": int(time_point_device_will_doing),  # 设备开关-1:反转,0:关,1:开,2:预设亮度
                             "slowTime": slow_open_or_close_speed
                         }
                     else:  # 开启且设置亮度
                         msg = {
                             "taskId": chronopher_id,
-                            "deviceSwitch": 1,  # 设备开关0:关,1:开
+                            "deviceSwitch": 2,
                             "pwmControl": int(time_point_device_will_doing),
                             'slowTime': slow_open_or_close_speed
                         }

+ 1 - 3
Object/ApschedulerObject.py

@@ -10,6 +10,7 @@ class ApschedulerObject:
     def __init__(self):
         self.scheduler = BackgroundScheduler()
         self.scheduler.add_jobstore(DjangoJobStore(), 'default')
+        self.scheduler.start()
 
     @staticmethod
     def auto_hello():  # 任务
@@ -20,14 +21,12 @@ class ApschedulerObject:
         self.scheduler.add_job(func=func, trigger='cron', day_of_week=day_of_week, hour=hour, minute=minute,
                                replace_existing=True, id=task_id, max_instances=1, coalesce=False, args=args,
                                misfire_grace_time=300)
-        self.scheduler.start()
 
     def create_interval_job(self, func, task_id, minutes, start_time, end_time, args):  # 间隔任务
         self.scheduler.add_job(func=func, trigger='interval', minutes=minutes,
                                start_date=datetime.datetime.fromtimestamp(start_time),
                                end_date=datetime.datetime.fromtimestamp(end_time),
                                replace_existing=True, id=task_id, max_instances=1, coalesce=False, args=args)
-        self.scheduler.start()
 
     def create_date_job(self, func, task_id, time_stamp, args):
         """
@@ -40,7 +39,6 @@ class ApschedulerObject:
         """
         self.scheduler.add_job(func=func, trigger='date', run_date=datetime.datetime.fromtimestamp(time_stamp),
                                replace_existing=True, id=task_id, max_instances=1, coalesce=False, args=args)
-        self.scheduler.start()
 
     @staticmethod
     def del_job(task_id):  # 删除任务