|
@@ -193,7 +193,7 @@ class EquipmentManagerV3(View):
|
|
|
uid_serial = uid_serial_qs[0]
|
|
uid_serial = uid_serial_qs[0]
|
|
|
Device_Info.objects.filter(UID=UID).update(vodPrimaryUserID=vodPrimaryUserID,
|
|
Device_Info.objects.filter(UID=UID).update(vodPrimaryUserID=vodPrimaryUserID,
|
|
|
vodPrimaryMaster=vodPrimaryMaster,
|
|
vodPrimaryMaster=vodPrimaryMaster,
|
|
|
- serial_number=uid_serial.company_serial.serial_number.serial_number + uid_serial.company_serial.company.mark)
|
|
|
|
|
|
|
+ serial_number=uid_serial.company_serial.serial_number + uid_serial.company_serial.company.mark)
|
|
|
else:
|
|
else:
|
|
|
Device_Info.objects.filter(UID=UID).update(vodPrimaryUserID=vodPrimaryUserID,
|
|
Device_Info.objects.filter(UID=UID).update(vodPrimaryUserID=vodPrimaryUserID,
|
|
|
vodPrimaryMaster=vodPrimaryMaster)
|
|
vodPrimaryMaster=vodPrimaryMaster)
|
|
@@ -224,7 +224,7 @@ class EquipmentManagerV3(View):
|
|
|
res = dvql[0]
|
|
res = dvql[0]
|
|
|
res['vod'] = list(ubqs)
|
|
res['vod'] = list(ubqs)
|
|
|
|
|
|
|
|
- iotqs = iotdeviceInfoModel.objects.filter(serial_number__serial_number=dvql[0]['serial_number'])
|
|
|
|
|
|
|
+ iotqs = iotdeviceInfoModel.objects.filter(serial_number=dvql[0]['serial_number'])
|
|
|
if iotqs.exists():
|
|
if iotqs.exists():
|
|
|
res['iot'].append(
|
|
res['iot'].append(
|
|
|
{
|
|
{
|
|
@@ -356,7 +356,7 @@ class EquipmentManagerV3(View):
|
|
|
serial_number_list.append(dvl['serial_number'][0:6])
|
|
serial_number_list.append(dvl['serial_number'][0:6])
|
|
|
|
|
|
|
|
# 新增获取IOT证书内容
|
|
# 新增获取IOT证书内容
|
|
|
- iotqs = iotdeviceInfoModel.objects.filter(serial_number__serial_number__in=serial_number_list)
|
|
|
|
|
|
|
+ iotqs = iotdeviceInfoModel.objects.filter(serial_number__in=serial_number_list)
|
|
|
|
|
|
|
|
ubqs = UID_Bucket.objects.filter(uid__in=uid_list). \
|
|
ubqs = UID_Bucket.objects.filter(uid__in=uid_list). \
|
|
|
values('bucket__content', 'status', 'channel', 'endTime', 'uid')
|
|
values('bucket__content', 'status', 'channel', 'endTime', 'uid')
|
|
@@ -436,7 +436,7 @@ class EquipmentManagerV3(View):
|
|
|
# 新增IOT
|
|
# 新增IOT
|
|
|
p['iot'] = []
|
|
p['iot'] = []
|
|
|
for iot in iotqs:
|
|
for iot in iotqs:
|
|
|
- if p['serial_number'][0:6] == iot.serial_number.serial_number:
|
|
|
|
|
|
|
+ if p['serial_number'][0:6] == iot.serial_number:
|
|
|
p['iot'].append(
|
|
p['iot'].append(
|
|
|
{
|
|
{
|
|
|
'endpoint': iot.endpoint,
|
|
'endpoint': iot.endpoint,
|
|
@@ -550,7 +550,7 @@ class EquipmentManagerV3(View):
|
|
|
serial_number_list.append(dvl['serial_number'][0:6])
|
|
serial_number_list.append(dvl['serial_number'][0:6])
|
|
|
|
|
|
|
|
# 新增获取IOT证书内容
|
|
# 新增获取IOT证书内容
|
|
|
- iotqs = iotdeviceInfoModel.objects.filter(serial_number__serial_number__in=serial_number_list)
|
|
|
|
|
|
|
+ iotqs = iotdeviceInfoModel.objects.filter(serial_number__in=serial_number_list)
|
|
|
|
|
|
|
|
ubqs = UID_Bucket.objects.filter(uid__in=uid_list). \
|
|
ubqs = UID_Bucket.objects.filter(uid__in=uid_list). \
|
|
|
values('bucket__content', 'status', 'channel', 'endTime', 'uid')
|
|
values('bucket__content', 'status', 'channel', 'endTime', 'uid')
|
|
@@ -618,7 +618,7 @@ class EquipmentManagerV3(View):
|
|
|
# 新增IOT
|
|
# 新增IOT
|
|
|
p['iot'] = []
|
|
p['iot'] = []
|
|
|
for iot in iotqs:
|
|
for iot in iotqs:
|
|
|
- if p['serial_number'][0:6] == iot.serial_number.serial_number:
|
|
|
|
|
|
|
+ if p['serial_number'][0:6] == iot.serial_number:
|
|
|
p['iot'].append(
|
|
p['iot'].append(
|
|
|
{
|
|
{
|
|
|
'endpoint': iot.endpoint,
|
|
'endpoint': iot.endpoint,
|
lang