feat: speaker 接口忽略采集器2
This commit is contained in:
parent
ae15f1a33c
commit
72604f9992
|
@ -249,10 +249,11 @@ class TDeviceViewSet(ListModelMixin, UpdateModelMixin, DestroyModelMixin, Custom
|
|||
"pageSize": 1000
|
||||
}
|
||||
_, res = spClient.request(**spapis['device_list'], params=params)
|
||||
rows = res['rows']
|
||||
rows = res.get('rows', [])
|
||||
t_l = []
|
||||
for i in rows:
|
||||
if i['name'] == '采集器':
|
||||
rows.remove(i)
|
||||
continue
|
||||
t_l.append(i['sn'])
|
||||
td = TDevice.objects.filter(code=i['sn']).first()
|
||||
|
@ -426,8 +427,10 @@ class TDeviceViewSet(ListModelMixin, UpdateModelMixin, DestroyModelMixin, Custom
|
|||
# print(request.data)
|
||||
_, res = spClient.request(**spapis['device_list'], params=request.data)
|
||||
codes = []
|
||||
for i in res['rows']:
|
||||
rows = res.get('rows', [])
|
||||
for i in rows:
|
||||
if i['name'] == '采集器':
|
||||
rows.remove(i)
|
||||
continue
|
||||
codes.append(i['sn'])
|
||||
tds_info = TDeviceSerializer(
|
||||
|
@ -435,7 +438,7 @@ class TDeviceViewSet(ListModelMixin, UpdateModelMixin, DestroyModelMixin, Custom
|
|||
tds_dict = {}
|
||||
for i in tds_info:
|
||||
tds_dict[i['code']] = i
|
||||
for i in res['rows']:
|
||||
for i in rows:
|
||||
i['my_info'] = {}
|
||||
if i['sn'] in tds_dict:
|
||||
i['my_info'] = tds_dict[i['sn']]
|
||||
|
|
Loading…
Reference in New Issue