From f2774271134ad33fac548637e192a8d379512cf8 Mon Sep 17 00:00:00 2001 From: xianfuxing Date: Wed, 1 Aug 2018 15:46:31 +0800 Subject: [PATCH] # using page query --- apps/counter/api/serializers.py | 1 + apps/counter/api/views.py | 4 ++-- apps/mosquito/api/pagination.py | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/apps/counter/api/serializers.py b/apps/counter/api/serializers.py index 04e3a80..b99836d 100644 --- a/apps/counter/api/serializers.py +++ b/apps/counter/api/serializers.py @@ -11,6 +11,7 @@ class DeviceCountSerializer(serializers.ModelSerializer): class Meta: model = DeviceCount fields = [ + 'id', 'device_id', 'signal', 'mosq_count', diff --git a/apps/counter/api/views.py b/apps/counter/api/views.py index 156408b..e2de5b7 100644 --- a/apps/counter/api/views.py +++ b/apps/counter/api/views.py @@ -15,7 +15,7 @@ class DeviceCountListAPIView(ListAPIView): serializer_class = DeviceCountSerializer permission_classes = [IsAuthenticated] filter_backends = [SearchFilter, OrderingFilter] - pagination_class = PostLimitOffsetPagination + pagination_class = PostPageNumberPagination search_fields = ['device_id'] queryset = DeviceCount.objects.all() @@ -24,6 +24,6 @@ class DeviceInfoListAPIView(ListAPIView): serializer_class = DeviceInfoSerializer permission_classes = [IsAuthenticated] filter_backends = [SearchFilter, OrderingFilter] - pagination_class = PostLimitOffsetPagination + pagination_class = PostPageNumberPagination search_fields = ['device_id', 'device_name', 'chip_type', 'chip_id'] queryset = DeviceInfo.objects.all() \ No newline at end of file diff --git a/apps/mosquito/api/pagination.py b/apps/mosquito/api/pagination.py index e375879..933d3a2 100644 --- a/apps/mosquito/api/pagination.py +++ b/apps/mosquito/api/pagination.py @@ -2,9 +2,9 @@ from rest_framework.pagination import LimitOffsetPagination, PageNumberPaginatio class PostLimitOffsetPagination(LimitOffsetPagination): - max_limit = 10 - default_limit = 8 + max_limit = 20 + default_limit = 10 class PostPageNumberPagination(PageNumberPagination): - page_size = 8 + page_size = 10