|
|
@@ -864,7 +864,10 @@ class EquipmentManagerV3(View):
|
|
|
# 获取iot_deviceInfo表的endpoint和token_iot_number
|
|
|
p['iot'] = []
|
|
|
if p['serial_number']: # 存在序列号根据序列号查询
|
|
|
- p['serial_number'] = CommonService.get_full_serial_number(p['UID'], p['serial_number'], p['Type'])
|
|
|
+ # 摄像头设备返回完整序列号
|
|
|
+ if p['UID'] != p['serial_number']:
|
|
|
+ p['serial_number'] = CommonService.get_full_serial_number(p['UID'], p['serial_number'],
|
|
|
+ p['Type'])
|
|
|
iotdeviceInfo_qs = iotdeviceInfoModel.objects.filter(serial_number=p['serial_number'][0:6])
|
|
|
else: # 根据uid查询
|
|
|
iotdeviceInfo_qs = iotdeviceInfoModel.objects.filter(uid=p['UID'])
|
|
|
@@ -925,7 +928,7 @@ class EquipmentManagerV3(View):
|
|
|
items.append(item)
|
|
|
return response.json(0, items)
|
|
|
except Exception as e:
|
|
|
- return response.json(500, 'errLine:{}, errMsg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
|
|
|
+ return response.json(500, 'error_ine:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
|
|
|
|
|
|
# 加密
|
|
|
def encrypt_pwd(self, userPwd):
|
