|
@@ -32,19 +32,14 @@ def addNewUserEquipment(userID, deviceContent, response):
|
|
nValid = Device_Info.objects.filter(userID=userID, NickName=deviceData['NickName'])
|
|
nValid = Device_Info.objects.filter(userID=userID, NickName=deviceData['NickName'])
|
|
if nValid.exists():
|
|
if nValid.exists():
|
|
return response.json(179)
|
|
return response.json(179)
|
|
- userDevice = Device_Info(id=CommonService.getUserID(getUser=False), userID_id=userID,
|
|
|
|
|
|
+ UID = deviceData['UID']
|
|
|
|
+ re_uid = re.compile(r'^[A-Za-z0-9]{20}$')
|
|
|
|
+ if re_uid.match(UID):
|
|
|
|
+ userDevice = Device_Info(id=CommonService.getUserID(getUser=False), userID_id=userID,
|
|
**deviceData)
|
|
**deviceData)
|
|
- userDevice.save()
|
|
|
|
- #
|
|
|
|
- #
|
|
|
|
- # UID = deviceData['NickName']
|
|
|
|
- # re_uid = re.compile(r'^[A-Za-z0-9]{20}$')
|
|
|
|
- # if re_uid.match(UID):
|
|
|
|
- # userDevice = Device_Info(id=CommonService.getUserID(getUser=False), userID_id=userID,
|
|
|
|
- # **deviceData)
|
|
|
|
- # userDevice.save()
|
|
|
|
- # else:
|
|
|
|
- # return response.json(180)
|
|
|
|
|
|
+ userDevice.save()
|
|
|
|
+ else:
|
|
|
|
+ return response.json(178)
|
|
else:
|
|
else:
|
|
return response.json(806)
|
|
return response.json(806)
|
|
|
|
|