优化获取推送日期加上时区计算

Controller/DetectControllerV2.py

@@ -168,22 +168,7 @@ class NotificationView(View):
             logger.info('uid={}'.format(uid))
             logger.info(redis_list)
             new_device_info_list = []
-            local_date_now = datetime.datetime.fromtimestamp(int(n_time))
-            logger.info('---设备事件，日期{},时间戳{}'.format(str(local_date_now.date()), n_time))
-
-            dt = datetime.date(local_date_now.year, local_date_now.month, local_date_now.day).weekday() + 1
-            logger.info('weekday{}'.format(dt))
-            dt = datetime.date(local_date_now.year, local_date_now.month, local_date_now.day).isoweekday()
-            logger.info('isoweekday{}'.format(dt))
-            dt = datetime.date(local_date_now.year, local_date_now.month, local_date_now.day).strftime("%A")
-            logger.info('strftime %A{}'.format(dt))
-            dt = calendar.weekday(local_date_now.year, local_date_now.month, local_date_now.day) + 1
-            logger.info('calendar'.format(dt))
-            dt = pendulum.parse(str(local_date_now.date())).day_of_week
-            dt = 7 if dt == 0 else dt
-            logger.info('pendulum:{}'.format(dt))
-            local_date_now = str(local_date_now.date())
-
+            local_date_time = ''
             for up in redis_list:
                 push_type = up['push_type']
                 appBundleId = up['appBundleId']
@@ -202,7 +187,10 @@ class NotificationView(View):
                 kwag_args['msg_title'] = msg_title
                 kwag_args['msg_text'] = msg_text
                 logger.info('推送要的数据: {}'.format(kwag_args))
-
+                local_date_time = CommonService.get_now_time_str(n_time=n_time, tz=tz, lang='cn')
+                logger.info('<<<<<根据时区计算后日期={}，时区={}'.format(local_date_time, tz))
+                local_date_time = local_date_time[0:10]
+                logger.info('<<<<<切片后的日期={}'.format(local_date_time))
                 # 以下是存库
                 userID_id = up["userID_id"]
                 if userID_id not in userID_ids:
@@ -235,7 +223,7 @@ class NotificationView(View):
                         # start 根据设备侦测时间为准进行分表存储数据
                         logger.info('分表存数据start------')
                         new_device_info_list.append(EquipmentInfoService.get_equipment_info_obj(
-                            local_date_now,
+                            local_date_time,
                             device_user_id=userID_id,
                             event_time=n_time,
                             event_type=event_type,
@@ -273,7 +261,7 @@ class NotificationView(View):
                 # new 分表批量存储 设备信息
                 if new_device_info_list and len(new_device_info_list) > 0:
                     # 根据日期获得星期几
-                    week = LocalDateTimeUtil.date_to_week(local_date_now)
+                    week = LocalDateTimeUtil.date_to_week(local_date_time)
                     EquipmentInfoService.equipment_info_bulk_create(week, new_device_info_list)
                     logger.info('设备信息分表批量保存end------')
 

Object/utils/LocalDateTimeUtil.py

@@ -69,7 +69,7 @@ def date_to_week(str_date):
         logger.info('-----进入日期转星期-----')
         dt = pendulum.parse(str_date).day_of_week
         dt = 7 if dt == 0 else dt
-        logger.info('---第三方模块星期{}'.format(dt))
+        logger.info('---根据pendulum模块解析后=星期{}'.format(dt))
         return dt
     return datetime.datetime.now().weekday() + 1