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

feat: speaker 接口忽略采集器2

This commit is contained in:
caoqianming 2024-11-20 16:28:11 +08:00
parent ae15f1a33c
commit 72604f9992
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/third/views_d.py
View File

@ -249,10 +249,11 @@ class TDeviceViewSet(ListModelMixin, UpdateModelMixin, DestroyModelMixin, Custom
"pageSize": 1000 "pageSize": 1000
} }
_, res = spClient.request(**spapis['device_list'], params=params) _, res = spClient.request(**spapis['device_list'], params=params)
rows = res['rows'] rows = res.get('rows', [])
t_l = [] t_l = []
for i in rows: for i in rows:
if i['name'] == '采集器': if i['name'] == '采集器':
rows.remove(i)
continue 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()
@ -426,8 +427,10 @@ 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 = []
for i in res['rows']: rows = res.get('rows', [])
for i in rows:
if i['name'] == '采集器': if i['name'] == '采集器':
rows.remove(i)
continue continue
codes.append(i['sn']) codes.append(i['sn'])
tds_info = TDeviceSerializer( tds_info = TDeviceSerializer(
@ -435,7 +438,7 @@ class TDeviceViewSet(ListModelMixin, UpdateModelMixin, DestroyModelMixin, Custom
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 res['rows']: for i in 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']]