浏览代码

自主推送统计接口5

tanghongbin 5 年之前
父节点
当前提交
457db84da9
共有 2 个文件被更改,包括 13 次插入2 次删除
  1. 1 0
      Controller/AdminManage.py
  2. 12 2
      Controller/StatisticsController.py

+ 1 - 0
Controller/AdminManage.py

@@ -462,6 +462,7 @@ class AdminManage(TemplateView):
 
         time_struct = [localtime.tm_year, localtime.tm_mon, current_day, 0, 0, 0, 0, 0, 0]
         current_time = time.mktime(tuple(time_struct))
+        current_time = current_time - time.timezone - 8 * 60 * 60
         count = 0
         if level == 0: # 七天
             start_time = current_time - 6 * 24 * 60 * 60

+ 12 - 2
Controller/StatisticsController.py

@@ -40,13 +40,17 @@ def statistcsAppFrequency(request):
 
     time_struct = [current_year, 1, 1, 0, 0, 0, 0, 0, 0]
 
+    distance_time = 8 * 60 * 60
+
     # 该月的开始时间
     time_struct[1] = current_month
     start_time = time.mktime(tuple(time_struct))
+    start_time = start_time - time.timezone - distance_time
 
     # 该月的结束时间
     time_struct[1] = current_month + 1
     end_time = time.mktime(tuple(time_struct))
+    end_time = end_time - time.timezone - distance_time
 
     # 统计该月的数据
     uaf_qs = UserAppFrequencyModel.objects.filter(data_time__gte=start_time, data_time__lt=end_time) \
@@ -156,12 +160,14 @@ def statistcsPushDay(request):
     current_day = localtime.tm_mday
     print(current_day)
 
+    distance_time = 8 * 60 * 60
     time_struct = [localtime.tm_year, localtime.tm_mon, current_day - 1, 0, 0, 0, 0, 0, 0]
     start_time = int(time.mktime(tuple(time_struct)))
+    start_time = start_time - time.timezone - distance_time
+
     print(start_time)
 
-    time_struct[2] = current_day
-    end_time = int(time.mktime(tuple(time_struct)))
+    end_time = start_time + 24 * 60 * 60
     print(end_time)
 
     eq_qs = Equipment_Info.objects.filter(addTime__gte=start_time, addTime__lte=end_time)
@@ -208,11 +214,15 @@ def statistcsPushMonth(request):
     localtime = time.localtime()
     current_month = localtime.tm_mon
 
+    distance_time = 8 * 60 * 60
+
     time_struct = [localtime.tm_year, localtime.tm_mon, 1, 0, 0, 0, 0, 0, 0]
     start_time = int(time.mktime(tuple(time_struct)))
+    start_time = start_time - time.timezone - distance_time
 
     time_struct[1] = current_month + 1
     end_time = int(time.mktime(tuple(time_struct)))
+    end_time = end_time - time.timezone - distance_time
 
     eq_qs = EquipmentInfoExStatisticsModel.objects.filter(statistics_date__gte=start_time, statistics_date__lte=end_time, date_type=0)
     # 0:APNS推送,1:谷歌推送,2:极光推送