Browse Source

修改设备添加规格限制成字母加数字,长度为20

chenjunkai 6 years ago
parent
commit
c1cc763726
2 changed files with 10 additions and 2 deletions
  1. 8 2
      Controller/EquipmentManager.py
  2. 2 0
      Object/ResponseObject.py

+ 8 - 2
Controller/EquipmentManager.py

@@ -7,6 +7,7 @@ from Service.CommonService import CommonService
 import simplejson as json
 import simplejson as json
 from Object.TokenObject import TokenObject
 from Object.TokenObject import TokenObject
 from Object.ResponseObject import ResponseObject
 from Object.ResponseObject import ResponseObject
+import re
 
 
 
 
 def addNewUserEquipment(userID, deviceContent, response):
 def addNewUserEquipment(userID, deviceContent, response):
@@ -31,9 +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['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)
                                                  **deviceData)
-                        userDevice.save()
+                            userDevice.save()
+                        else:
+                            return response.json()
                 else:
                 else:
                     return response.json(806)
                     return response.json(806)
 
 

+ 2 - 0
Object/ResponseObject.py

@@ -61,6 +61,7 @@ class ResponseObject(object):
             177: 'Update equipment error',
             177: 'Update equipment error',
             178: 'ADD equipment error',
             178: 'ADD equipment error',
             179: 'Device name cannot be repeated',
             179: 'Device name cannot be repeated',
+            180: 'UID specification error',
             190: 'The rid does not exist!',
             190: 'The rid does not exist!',
             191: 'The roleName does not exist!',
             191: 'The roleName does not exist!',
             192: 'Delete role error',
             192: 'Delete role error',
@@ -209,6 +210,7 @@ class ResponseObject(object):
             177: '更新设备错误',
             177: '更新设备错误',
             178: '添加设备错误',
             178: '添加设备错误',
             179: '设备名称不能重复',
             179: '设备名称不能重复',
+            180: 'UID规格错误',
             190: '角色rid不存在!',
             190: '角色rid不存在!',
             191: '角色名不存在!',
             191: '角色名不存在!',
             192: '删除角色错误',
             192: '删除角色错误',