From 1c36bd85f97f752b8287f011ef06753ff2c45911 Mon Sep 17 00:00:00 2001 From: xianfuxing Date: Thu, 28 May 2020 11:20:35 +0800 Subject: [PATCH] =?UTF-8?q?#=20=E5=AE=8C=E5=96=84=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/counter/api/views.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/apps/counter/api/views.py b/apps/counter/api/views.py index 2ffc3f9..cf8db64 100644 --- a/apps/counter/api/views.py +++ b/apps/counter/api/views.py @@ -91,8 +91,8 @@ class DeviceLogStatisticAPIView(APIView, RoleMixin): today = datetime.now(tz).date() # calc monthly count, put it in redis as cache. - if cache.has_key('monthly_count'): - monthly_count = cache.get('monthly_count') + if cache.get('month_ago_count'): + month_ago_count = cache.get('month_ago_count') else: cur_month = tz.localize(datetime.combine(datetime(today.year, today.month, 1), time(0, 0)), is_dst=None) one_month_ago_queryset = [ @@ -102,13 +102,13 @@ class DeviceLogStatisticAPIView(APIView, RoleMixin): max_time=Max('data_time'))] if one_month_ago_queryset: one_month_ago_count = sum(map(lambda x: int(x.count), one_month_ago_queryset)) - monthly_count = total_count - one_month_ago_count + month_ago_count = total_count - one_month_ago_count else: - monthly_count = 0 - cache.set('monthly_count', monthly_count, 60 * 60) + month_ago_count = 0 + cache.set('monthly_count', month_ago_count, 60 * 60) # calc daily count, put it in redis as cache. - if cache.has_key('daily_count'): + if cache.get('daily_count'): daily_count = cache.get('daily_count') else: midnight = tz.localize(datetime.combine(today, time(0, 0)), is_dst=None) @@ -122,7 +122,8 @@ class DeviceLogStatisticAPIView(APIView, RoleMixin): daily_count = 0 cache.set('daily_count', daily_count, 60 * 60) - data = {'total_count': total_count - monthly_count, 'daily_count': daily_count} + # print(total_count, month_ago_count) + data = {'month_ago_count': month_ago_count, 'daily_count': daily_count} return Response(data) def get_devices(self):