插座排程删除以及修改移除 MQTT消息下发给设备

Controller/SensorGateway/SmartSocketController.py

@@ -376,10 +376,10 @@ class SmartSocketView(View):
                 data['created_time'] = now_time
                 socket_schedule = SocketSchedule.objects.create(**data)
                 task_id = socket_schedule.id
-            # 将排程任务下发给设备
-            cls.send_socket_schedule(serial_number, task_id, task_type, int(start_time),
-                                     end_time, int(repeat), device_switch,
-                                     task_switch)
+                # 将排程任务下发给设备
+                cls.send_socket_schedule(serial_number, task_id, task_type, int(start_time),
+                                         end_time, int(repeat), device_switch,
+                                         task_switch)
             return response.json(0)
         except Exception as e:
             LOGGER.info('智能插座异常,errLine:{}, errMsg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
@@ -666,13 +666,13 @@ class SmartSocketView(View):
                 if not socket_schedule_qs.exists():
                     return response.json(173)
                 # 发布MQTT消息通知设备删除排程任务
-                for val in socket_schedule_qs:
-                    if val.task_status:
-                        switch_status = 1 if val.switch_status else 0
-                        result = SmartSocketView.send_socket_schedule(val.serial_number, val.id, val.time_type,
-                                                                      val.start_time, val.end_time,
-                                                                      val.repeat, switch_status, 0)
-                        LOGGER.info('删除排程发布结果：{}'.format(result))
+                # for val in socket_schedule_qs:
+                #     if val.task_status:
+                #         switch_status = 1 if val.switch_status else 0
+                #         result = SmartSocketView.send_socket_schedule(val.serial_number, val.id, val.time_type,
+                #                                                       val.start_time, val.end_time,
+                #                                                       val.repeat, switch_status, 0)
+                #         LOGGER.info('删除排程发布结果：{}'.format(result))
                 socket_schedule_qs.delete()
                 return response.json(0)
         except Exception as e: