From 5c2aac22e18fd8c9b4d13b9a05f4a466992b69d0 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 20 Nov 2024 16:38:14 +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=A83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/third/views_d.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/apps/third/views_d.py b/apps/third/views_d.py index ba2911e5..54f3b0d5 100644 --- a/apps/third/views_d.py +++ b/apps/third/views_d.py @@ -251,10 +251,8 @@ class TDeviceViewSet(ListModelMixin, UpdateModelMixin, DestroyModelMixin, Custom _, res = spClient.request(**spapis['device_list'], params=params) rows = res.get('rows', []) t_l = [] - for i in rows: - if i['name'] == '采集器': - rows.remove(i) - continue + filtered_rows = [i for i in rows if i['name'] != '采集器'] + for i in filtered_rows: t_l.append(i['sn']) td = TDevice.objects.filter(code=i['sn']).first() if td: @@ -427,18 +425,15 @@ class TDeviceViewSet(ListModelMixin, UpdateModelMixin, DestroyModelMixin, Custom # print(request.data) _, res = spClient.request(**spapis['device_list'], params=request.data) codes = [] - rows = res.get('rows', []) - for i in rows: - if i['name'] == '采集器': - rows.remove(i) - continue + filtered_rows = [i for i in res.get('rows', []) if i['name'] != '采集器'] + for i in filtered_rows: codes.append(i['sn']) tds_info = TDeviceSerializer( instance=TDevice.objects.filter(code__in=codes), many=True).data tds_dict = {} for i in tds_info: tds_dict[i['code']] = i - for i in rows: + for i in filtered_rows: i['my_info'] = {} if i['sn'] in tds_dict: i['my_info'] = tds_dict[i['sn']]