PDU
/
Mosqkiller-API
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

# 完善计算逻辑

This commit is contained in:
xianfuxing 2020-05-28 11:20:35 +08:00
parent 8663ae5022
commit 1c36bd85f9
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/counter/api/views.py
View File

@ -91,8 +91,8 @@ class DeviceLogStatisticAPIView(APIView, RoleMixin):
today = datetime.now(tz).date() today = datetime.now(tz).date()
# calc monthly count, put it in redis as cache. # calc monthly count, put it in redis as cache.
if cache.has_key('monthly_count'): if cache.get('month_ago_count'):
monthly_count = cache.get('monthly_count') month_ago_count = cache.get('month_ago_count')
else: else:
cur_month = tz.localize(datetime.combine(datetime(today.year, today.month, 1), time(0, 0)), is_dst=None) cur_month = tz.localize(datetime.combine(datetime(today.year, today.month, 1), time(0, 0)), is_dst=None)
one_month_ago_queryset = [ one_month_ago_queryset = [
@ -102,13 +102,13 @@ class DeviceLogStatisticAPIView(APIView, RoleMixin):
max_time=Max('data_time'))] max_time=Max('data_time'))]
if one_month_ago_queryset: if one_month_ago_queryset:
one_month_ago_count = sum(map(lambda x: int(x.count), 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: else:
monthly_count = 0 month_ago_count = 0
cache.set('monthly_count', monthly_count, 60 * 60) cache.set('monthly_count', month_ago_count, 60 * 60)
# calc daily count, put it in redis as cache. # 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') daily_count = cache.get('daily_count')
else: else:
midnight = tz.localize(datetime.combine(today, time(0, 0)), is_dst=None) midnight = tz.localize(datetime.combine(today, time(0, 0)), is_dst=None)
@ -122,7 +122,8 @@ class DeviceLogStatisticAPIView(APIView, RoleMixin):
daily_count = 0 daily_count = 0
cache.set('daily_count', daily_count, 60 * 60) 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) return Response(data)
def get_devices(self): def get_devices(self):