From ae15f1a33c01f9183e0e786ae7d82e9e3926a665 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 20 Nov 2024 16:24:04 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20speaker=20=E6=8E=A5=E5=8F=A3=E5=BF=BD?= =?UTF-8?q?=E7=95=A5=E9=87=87=E9=9B=86=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/em/filters.py | 3 ++- apps/third/views_d.py | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/apps/em/filters.py b/apps/em/filters.py index 57920f30..5241ea18 100644 --- a/apps/em/filters.py +++ b/apps/em/filters.py @@ -23,7 +23,8 @@ class EquipFilterSet(filters.FilterSet): "cate__code": ['exact', 'in', 'contains'], "cate__is_for_safe": ['exact'], "cate__is_for_enp": ['exact'], - "cate__is_car": ['exact'] + "cate__is_car": ['exact'], + "is_deleted": ['exact'] } def filter_tag(self, queryset, name, value): diff --git a/apps/third/views_d.py b/apps/third/views_d.py index c740efc4..8f881807 100644 --- a/apps/third/views_d.py +++ b/apps/third/views_d.py @@ -252,6 +252,8 @@ class TDeviceViewSet(ListModelMixin, UpdateModelMixin, DestroyModelMixin, Custom rows = res['rows'] t_l = [] for i in rows: + if i['name'] == '采集器': + continue t_l.append(i['sn']) td = TDevice.objects.filter(code=i['sn']).first() if td: @@ -425,6 +427,8 @@ class TDeviceViewSet(ListModelMixin, UpdateModelMixin, DestroyModelMixin, Custom _, res = spClient.request(**spapis['device_list'], params=request.data) codes = [] for i in res['rows']: + if i['name'] == '采集器': + continue codes.append(i['sn']) tds_info = TDeviceSerializer( instance=TDevice.objects.filter(code__in=codes), many=True).data