|
@@ -12,7 +12,7 @@ from django.views.generic.base import View
|
|
from Object.RedisObject import RedisObject
|
|
from Object.RedisObject import RedisObject
|
|
from Ansjer.config import OSS_STS_ACCESS_SECRET, OSS_STS_ACCESS_KEY, BASE_DIR
|
|
from Ansjer.config import OSS_STS_ACCESS_SECRET, OSS_STS_ACCESS_KEY, BASE_DIR
|
|
from Model.models import Device_Info, UID_Bucket, UID_Preview, UidSetModel, UidPushModel, UidChannelSetModel, \
|
|
from Model.models import Device_Info, UID_Bucket, UID_Preview, UidSetModel, UidPushModel, UidChannelSetModel, \
|
|
- Device_User, iotdeviceInfoModel
|
|
|
|
|
|
+ Device_User, iotdeviceInfoModel, UIDCompanySerialModel
|
|
from Object.ResponseObject import ResponseObject
|
|
from Object.ResponseObject import ResponseObject
|
|
from Object.TokenObject import TokenObject
|
|
from Object.TokenObject import TokenObject
|
|
from Service.CommonService import CommonService
|
|
from Service.CommonService import CommonService
|
|
@@ -172,7 +172,15 @@ class EquipmentManagerV3(View):
|
|
version=version,
|
|
version=version,
|
|
vodPrimaryUserID=vodPrimaryUserID, vodPrimaryMaster=vodPrimaryMaster)
|
|
vodPrimaryUserID=vodPrimaryUserID, vodPrimaryMaster=vodPrimaryMaster)
|
|
userDevice.save()
|
|
userDevice.save()
|
|
- Device_Info.objects.filter(UID=UID).update(vodPrimaryUserID=vodPrimaryUserID,
|
|
|
|
|
|
+ uid_serial_qs = UIDCompanySerialModel.objects.filter(
|
|
|
|
+ uid__uid=UID)
|
|
|
|
+ if uid_serial_qs.exists():
|
|
|
|
+ uid_serial = uid_serial_qs[0]
|
|
|
|
+ Device_Info.objects.filter(UID=UID).update(vodPrimaryUserID=vodPrimaryUserID,
|
|
|
|
+ vodPrimaryMaster=vodPrimaryMaster,
|
|
|
|
+ serial_number=uid_serial.company_serial.serial_number.serial_number + uid_serial.company_serial.company.mark)
|
|
|
|
+ else:
|
|
|
|
+ Device_Info.objects.filter(UID=UID).update(vodPrimaryUserID=vodPrimaryUserID,
|
|
vodPrimaryMaster=vodPrimaryMaster)
|
|
vodPrimaryMaster=vodPrimaryMaster)
|
|
|
|
|
|
if not us_qs.exists():
|
|
if not us_qs.exists():
|