From 1d3072d87804e940b8ae3d6c8a32a661b09acfc4 Mon Sep 17 00:00:00 2001 From: fxxian Date: Tue, 26 Mar 2024 21:27:31 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9B=B4=E6=AD=A3=E4=BA=8C=E4=BB=A3?= =?UTF-8?q?=E6=97=B6=E9=97=B4=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 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/apps/counter/api/serializers.py b/apps/counter/api/serializers.py index 11c7331..0c7c762 100644 --- a/apps/counter/api/serializers.py +++ b/apps/counter/api/serializers.py @@ -1,4 +1,4 @@ -import time +import pytz from typing import Optional from django.db.models import Q, Min, Max from django.core.cache import cache @@ -286,6 +286,13 @@ class DeviceInfoSerializer(serializers.ModelSerializer): return None def get_time(self, obj): + # 区分一代和二代设备 + if obj.chip_type == 'AIR-V2': + if self.mosq_device_info and self.mosq_device_info.update_time: + eastern = pytz.timezone('Asia/Shanghai') + update_time = self.mosq_device_info.update_time.astimezone(eastern) + return update_time.strftime('%Y-%m-%d %H:%M:%S') + if self.latest: return self.latest['data_time'].replace('T', ' ').replace('Z', '') return None