ts

Controller/EquipmentManager.py

@@ -12,15 +12,14 @@ import re
 #     查询用户设备
 @csrf_exempt
 def queryUserEquipmentInterface(request):
+    request.encoding = 'utf-8'
     response = ResponseObject()
     if request.method == 'POST':
-        request.encoding = 'utf-8'
         request_dict = request.POST
     elif request.method == 'GET':
-        request.encoding = 'utf-8'
         request_dict = request.GET
     else:
-        return response.json(801)
+        return response.json(444)
     token = request_dict.get('token', None)
     tko = TokenObject(token)
     response.lang = tko.lang
@@ -54,7 +53,7 @@ def addNewUserEquipmentInterface(request):
     elif request.method == 'GET':
         request_dict = request.GET
     else:
-        return response.json(801)
+        return response.json(444)
     token = request_dict.get('token', None)
     deviceContent = request_dict.get('content', None)
     if not deviceContent:
@@ -70,7 +69,7 @@ def addNewUserEquipmentInterface(request):
             try:
                 deviceData = json.loads(deviceContent)
             except Exception as e:
-                return response.json(803, repr(e))
+                return response.json(444, repr(e))
             else:
                 UID = deviceData.get('UID', None)
                 if not UID:
@@ -127,7 +126,7 @@ def delUserEquipmentInterface(request):
     elif request.method == 'GET':
         request_dict = request.GET
     else:
-        return response.json(801)
+        return response.json(444)
     token = request_dict.get('token', None)
     id = request_dict.get('id', None)
     if not id:
@@ -167,7 +166,7 @@ def modifyUserEquipmentInterface(request):
         request.encoding = 'utf-8'
         request_dict = request.GET
     else:
-        return response.json(801)
+        return response.json(444)
     token = request_dict.get('token', None)
     deviceContent = request_dict.get('content', None)
     id = request_dict.get('id', None)
@@ -200,7 +199,7 @@ def showAllUserEquipmentInterface(request, *callback_args, **callback_kwargs):
     elif request.method == 'GET':
         fieldDict = request.GET
     else:
-        return response.json(801)
+        return response.json(444)
     token = request.POST.get('token', None)
     type = request.POST.get('type', None)
     tko = TokenObject(token)
@@ -237,7 +236,7 @@ def findEquipmentInfoInterface(request, *callback_args, **callback_kwargs):
     elif request.method == 'POST':
         fieldDict = request.POST
     else:
-        return response.json(801)
+        return response.json(444)
     deviceContent = fieldDict.get('content', None)
     token = fieldDict.get('token', None)
     tko = TokenObject(token)

Controller/LogManager.py

@@ -149,7 +149,7 @@ class HelpView(TemplateView):
                     elif reInfoType == 'helpfile':
                         return self.getHelpCHM(response)
                     else:
-                        return response.json(801)
+                        return response.json(444)
                 else:
                     return response.json(404)
             else:

Controller/OTAEquipment.py

@@ -35,7 +35,7 @@ def addNewEquipmentVersion(deviceContent, token, response):
                     print(type(deviceContent))
                     deviceData = json.loads(deviceContent)
                 except Exception as e:
-                    return response.json(803, repr(e))
+                    return response.json(444, repr(e))
                 else:
                     version = deviceData.get('version', None)
                     if version is not None:
@@ -51,7 +51,7 @@ def addNewEquipmentVersion(deviceContent, token, response):
                             except Exception as e:
                                 errorInfo = traceback.format_exc()
                                 print('添加设备错误: %s ' % errorInfo)
-                                return response.json(806, repr(e))
+                                return response.json(444, repr(e))
                             else:
                                 res = CommonService.qs_to_dict([equipmentVersion])
                                 return response.json(0, res)
@@ -157,7 +157,7 @@ def downloadUpdataFileUrl(request):
     elif request.method == 'POST':
         request_dict = request.POST
     else:
-        errorJSON = response.formal(801)
+        errorJSON = response.formal(444)
         response = HttpResponse(errorJSON, content_type='text/plain', charset='utf-8')
         response['Content-Error'] = errorJSON
         return response
@@ -170,7 +170,7 @@ def downloadUpdataFileUrl(request):
         return downloadUrl(fileType, fileCode, fileVersion, fileName, response)
 
     else:
-        errorJSON = response.formal(800)
+        errorJSON = response.formal(444)
         response = HttpResponse(errorJSON, content_type='text/plain', charset='utf-8')
         response['Content-Error'] = errorJSON
         return response
@@ -191,7 +191,7 @@ def getEquipmentVersionInterface(request):
         request.encoding = 'gb2312'
         request_dict = request.GET
     else:
-        return response.json(801)
+        return response.json(444)
     code = request_dict.get('code', None)
     ov = request_dict.get('ov', None)
     if not code:
@@ -218,7 +218,7 @@ def getUpdataFileUrlInterface(request):
         request.encoding = 'utf-8'
         code = request.GET.get('code', None)
     else:
-        return response.json(801)
+        return response.json(444)
     if not code:
         return response.json(444, 'code')
     eq = Equipment_Version.objects.filter(code=code, status=1, lang='en').order_by('-data_joined')
@@ -304,7 +304,7 @@ def downloadUpdataFileUrlInterface(request, fileType, fileName,
             return response
 
     else:
-        errorJSON = res.formal(800)
+        errorJSON = res.formal(444)
         response = HttpResponse(errorJSON, content_type='text/plain', charset='utf-8')
         response['Content-Error'] = errorJSON
         return response
@@ -431,15 +431,14 @@ def getDir(self, fileType, fileName, fileCode, fileVersion, response):
 
 @csrf_exempt
 def addNewEquipmentVersionInterface(request):
+    request.encoding = 'utf-8'
     response = ResponseObject()
     if request.method == "POST":
-        request.encoding = 'utf-8'
         request_dict = request.POST
     elif request.method == "GET":
-        request.encoding = 'gb2312'
         request_dict = request.GET
     else:
-        return response.json(801)
+        return response.json(444)
     deviceContent = request_dict.get('content', None).encode('utf-8')
     token = request_dict.get('token', None)
     deviceContent = str(deviceContent, encoding='utf-8')

Controller/PermissionManager.py

@@ -106,7 +106,7 @@ class Roles(object):
         try:
             roleContent = json.loads(content)
         except Exception as e:
-            return response.json(803, repr(e))
+            return response.json(444, repr(e))
         else:
             rid = roleContent.get('rid', None)
             if rid == None:
@@ -164,7 +164,7 @@ class Roles(object):
         except Exception as e:
             errorInfo = traceback.format_exc()
             print('The content parameter format is wrong: %s' % errorInfo)
-            return response.json(803)
+            return response.json(444)
         else:
             try:
                 permission_list = roleContent['permission']

Controller/UserManger.py

@@ -113,7 +113,7 @@ class perfectUserInfoView(TemplateView):
         if userContent != None:
             dataValid = json.loads(userContent)
             if 'userID' and 'password' and 'is_superuser' in dataValid.keys():
-                return response.json(802)
+                return response.json(444)
         if userIconPath == None and userContent == None:
             return response.json(800)
         elif userIconPath == None and userContent != None:
@@ -145,7 +145,7 @@ class perfectUserInfoView(TemplateView):
             try:
                 UserData = json.loads(userContent)
             except Exception as e:
-                return response.json(803, repr(e))
+                return response.json(444, repr(e))
         try:
             if userIconPath is not None and userContent is not None:
                 User.update(userIconPath=userIconPath, userIconUrl=userIconUrl, **UserData)

Controller/shareUserPermission.py

@@ -291,7 +291,7 @@ class unsharedUserEquipmentView(View):
                     if content != None and MasterID != None:
                         return self.unsharedUserEquipmentSQL(MasterID, GuestID, False, response, args, content=content)
                     else:
-                        return response.json(805)
+                        return response.json(444,'content or unsharedAll')
             else:
                 return response.json(tko.code)
         else:

Object/ResponseObject.py

@@ -17,6 +17,7 @@ class ResponseObject(object):
             5: 'Please try again one minute later！',
             9: 'User accounts is not exist',
             10: res,
+            12: 'You are not the primary user of the device!',
             13: 'Device is not exist !',
             14: 'Device is not belong to you',
             15: 'Not own service',
@@ -64,19 +65,13 @@ class ResponseObject(object):
             309: 'Please ReLogin! errmsg token',
             403: 'API ERROR!',
             404: 'You don not have permission to access this!',
-            414: 'Please confirm the request path!',
+            414: 'Please confirm the request url!',
             424: 'Database Error !',
             444: 'Wrong parameters!',
             474: 'System Maintaining！',
             500: 'Query Database Error:',
             501: 'Update database error!',
             606: 'User has not assigned role!',
-            800: 'Request KEY is None!',
-            801: 'Wrong request KEY!',
-            802: 'Parameter error!',
-            803: 'Wrong parameter',
-            805: 'Un share Error! content or unsharedAll must be provided!',
-            806: 'The content parameter is incomplete!',
             807: 'The role has already existed!',
             808: 'Add a new role to the wrong',
             816: 'Add a new permissions error',
@@ -97,6 +92,7 @@ class ResponseObject(object):
             5: '请一分钟后再尝试',
             9: '用户账号不存在',
             10: res,
+            12: '您不是设备主用户',
             13: '设备不存在',
             14: '设备不属于您',
             15: '您尚未打开此服务',
@@ -144,20 +140,14 @@ class ResponseObject(object):
             309: '请重新登录!',
             403: 'API错误！',
             404: '您没有访问的权限！',
-            414: '客户端错误！请确认请求路径！',
+            414: '请确认请求url！',
             424: '数据库错误！',
-            444: '请确认参数的正确性！',
+            444: '参数错误！',
             474: '系统维护中！',
             500: '查询数据库错误！',
             501: '更新数据库错误！',
             606: '用户没有分配角色！',
             616: '用户帐户不存在！',
-            800: '请求参数不存在！',
-            801: '错误的请求参数！',
-            802: 'content参数错误！',
-            803: 'content参数格式错误',
-            805: 'content或unsharedAll参数没有传递',
-            806: 'content参数不完整！',
             807: '角色已经存在！',
             808: '添加新角色错误',
             816: '新增权限错误',