zcdsj
/
factory
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: speaker 接口忽略采集器3

This commit is contained in:
caoqianming 2024-11-20 16:38:14 +08:00
parent 72604f9992
commit 5c2aac22e1
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/third/views_d.py
View File

@ -251,10 +251,8 @@ class TDeviceViewSet(ListModelMixin, UpdateModelMixin, DestroyModelMixin, Custom
_, res = spClient.request(**spapis['device_list'], params=params) _, res = spClient.request(**spapis['device_list'], params=params)
rows = res.get('rows', []) rows = res.get('rows', [])
t_l = [] t_l = []
for i in rows: filtered_rows = [i for i in rows if i['name'] != '采集器']
if i['name'] == '采集器': for i in filtered_rows:
rows.remove(i)
continue
t_l.append(i['sn']) t_l.append(i['sn'])
td = TDevice.objects.filter(code=i['sn']).first() td = TDevice.objects.filter(code=i['sn']).first()
if td: if td:
@ -427,18 +425,15 @@ class TDeviceViewSet(ListModelMixin, UpdateModelMixin, DestroyModelMixin, Custom
# print(request.data) # print(request.data)
_, res = spClient.request(**spapis['device_list'], params=request.data) _, res = spClient.request(**spapis['device_list'], params=request.data)
codes = [] codes = []
rows = res.get('rows', []) filtered_rows = [i for i in res.get('rows', []) if i['name'] != '采集器']
for i in rows: for i in filtered_rows:
if i['name'] == '采集器':
rows.remove(i)
continue
codes.append(i['sn']) codes.append(i['sn'])
tds_info = TDeviceSerializer( tds_info = TDeviceSerializer(
instance=TDevice.objects.filter(code__in=codes), many=True).data instance=TDevice.objects.filter(code__in=codes), many=True).data
tds_dict = {} tds_dict = {}
for i in tds_info: for i in tds_info:
tds_dict[i['code']] = i tds_dict[i['code']] = i
for i in rows: for i in filtered_rows:
i['my_info'] = {} i['my_info'] = {}
if i['sn'] in tds_dict: if i['sn'] in tds_dict:
i['my_info'] = tds_dict[i['sn']] i['my_info'] = tds_dict[i['sn']]