From b90c21bbbf025f969805e8dc5da145977e45ce4f Mon Sep 17 00:00:00 2001 From: xianfuxing Date: Wed, 1 Aug 2018 13:57:17 +0800 Subject: [PATCH] =?UTF-8?q?#=20=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/counter/api/serializers.py | 16 ++++++++++++++-- apps/mosquito/api/pagination.py | 4 ++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/apps/counter/api/serializers.py b/apps/counter/api/serializers.py index b807f23..04e3a80 100644 --- a/apps/counter/api/serializers.py +++ b/apps/counter/api/serializers.py @@ -30,10 +30,13 @@ class DeviceCountSerializer(serializers.ModelSerializer): return obj.vol def get_calc_time(self, obj): - return obj.data_time + return obj.data_time.strftime('%Y-%m-%d %H:%M:%S') class DeviceInfoSerializer(serializers.ModelSerializer): + compile_time = serializers.SerializerMethodField() + last_connect = serializers.SerializerMethodField() + last_offline_time = serializers.SerializerMethodField() class Meta: model = DeviceInfo @@ -46,4 +49,13 @@ class DeviceInfoSerializer(serializers.ModelSerializer): 'online', 'last_connect', 'last_offline_time' - ] \ No newline at end of file + ] + + def get_compile_time(self, obj): + return obj.compile_time.strftime('%Y-%m-%d %H:%M:%S') + + def get_last_connect(self, obj): + return obj.last_connect.strftime('%Y-%m-%d %H:%M:%S') + + def get_last_offline_time(self, obj): + return obj.last_offline_time.strftime('%Y-%m-%d %H:%M:%S') diff --git a/apps/mosquito/api/pagination.py b/apps/mosquito/api/pagination.py index 6d381e4..e375879 100644 --- a/apps/mosquito/api/pagination.py +++ b/apps/mosquito/api/pagination.py @@ -3,8 +3,8 @@ from rest_framework.pagination import LimitOffsetPagination, PageNumberPaginatio class PostLimitOffsetPagination(LimitOffsetPagination): max_limit = 10 - default_limit = 4 + default_limit = 8 class PostPageNumberPagination(PageNumberPagination): - page_size = 4 + page_size = 8