修改time_dict赋值

Controller/SensorGateway/SmartSceneController.py

@@ -1215,7 +1215,6 @@ class SmartSceneView(View):
                 time_dict = {
                     'time_stamp': time_stamp
                 }
-                condition['time_dict'] = time_dict
             else:
                 condition['time'] = 'cron'
                 weeks = cls.int_to_weeks(repeat)
@@ -1224,7 +1223,7 @@ class SmartSceneView(View):
                     'hour': hour,
                     'minute': minute
                 }
-                condition['time_dict'] = time_dict
+            condition['time_dict'] = time_dict
         else:
             device_type = int(conditions_dict['sensor']['device_type'])
             event_type = int(conditions_dict['sensor']['eventValues'][0]['event_type'])

Controller/TestApi.py

@@ -39,7 +39,6 @@ from Ansjer.config import (
     CONFIG_TEST,
     BASE_DIR
 )
-from Controller.SensorGateway.SmartSceneController import SmartSceneView
 from Model.models import (
     CompanySerialModel,
     Device_Info,
@@ -182,6 +181,8 @@ class testView(View):
             return self.generic_report_push(request_dict, response)
         elif operation == 'celery':  # celery
             return self.celery(request_dict, response)
+        elif operation == 'tz':
+            return self.tz(request_dict, response)
         else:
             return response.json(414)
 
@@ -1256,7 +1257,8 @@ class testView(View):
             #                             task='Controller.CeleryTasks.tasks.hello')
 
             # 定时任务
-            # celery_beat_obj.creat_clocked_task(timezone_offset, time_string, name, task, kwargs=kwargs)
+            celery_beat_obj.creat_clocked_task(
+                name=name, task=task, timezone_offset=timezone_offset, time_string=time_string)
             # time_stamp = CommonService.convert_to_timestamp(timezone_offset, time_string)
             # clocked_time = CommonService.get_date_from_timestamp(time_stamp, timezone_offset)
             # schedule, _ = ClockedSchedule.objects.get_or_create(clocked_time=clocked_time)
@@ -1287,3 +1289,14 @@ class testView(View):
             return response.json(0)
         except Exception as e:
             return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
+
+    @staticmethod
+    def tz(request_dict, response):
+        try:
+            zone_info_list = ['Pacific/Midway','Pacific/Honolulu','America/Anchorage','America/Los_Angeles','America/Denver','America/Chicago','America/New_York','America/Halifax','Canada/Newfoundland','America/Buenos_Aires','Atlantic/South_Georgia','Atlantic/Cape_Verde','Europe/London','Europe/Paris','Europe/Athens','Europe/Moscow','Asia/Tehran','Asia/Dubai','Asia/Kabul','Asia/Karachi','Asia/Almaty','Asia/Rangoon','Asia/Bangkok','Asia/Shanghai','Asia/Tokyo','Australia/Darwin','Australia/Sydney','Asia/Magadan','Pacific/Auckland']
+            for zone_info in zone_info_list:
+                timezone = zoneinfo.ZoneInfo(zone_info)
+                print(timezone)
+            return response.json(0)
+        except Exception as e:
+            return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))