From 2f2dfbbe916d572d0ee59a83c41c5bb5c5b33c6f Mon Sep 17 00:00:00 2001 From: "VIJAY\\vijay" Date: Tue, 23 Aug 2022 14:12:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=A8device=5Fid=E5=92=8C?= =?UTF-8?q?device=5Fname=E4=B8=8D=E8=83=BD=E6=90=9C=E7=B4=A2=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/mosquito/api/views.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/apps/mosquito/api/views.py b/apps/mosquito/api/views.py index 01d06b0..64750ec 100644 --- a/apps/mosquito/api/views.py +++ b/apps/mosquito/api/views.py @@ -117,6 +117,7 @@ class WeatherLogListAPIView(ListAPIView, RoleMixin, DeviceListMixin): def get_queryset(self, *args, **kwargs): user_roles = self.get_role() + device = self.request.GET.get('device') start = self.request.GET.get('start') end = self.request.GET.get('end') queryset = WeatherLog.objects.get_queryset().order_by('-data_time') @@ -125,6 +126,15 @@ class WeatherLogListAPIView(ListAPIView, RoleMixin, DeviceListMixin): devices = self.get_device_list() device_ids = [device.device_id for device in devices if device.org == self.request.user.org] queryset = queryset.filter(device_id__in=device_ids) + if device: + # device_id or device_name + qs = queryset.filter(device_id__icontains=device) + if qs.count() > 0: + queryset = qs + else: + qs = WeatherLog.objects.filter(device_name__contains=device) + device_ids = [device.device_id for device in qs] + queryset = queryset.filter(device_id__in=device_ids) last_day = self.request.GET.get('last_day') if last_day == '1': t = datetime.now().replace(tzinfo=pytz.timezone('UTC')) - timedelta(days=1)