优化响应信息

Controller/EquipmentManager.py

@@ -121,7 +121,7 @@ def showAllUserEquipment(userID, response):
         if userValid.exists():
             # own_permission = ModelService.check_permission(userID=userID,permID=30)
             if userValid[0].is_superuser != 100 and userValid[0].is_superuser != 1:
-                return response.json(604)
+                return response.json(612)
             else:
                 qs = Device_Info.objects.all()
                 res = CommonService.qs_to_dict(qs)
@@ -150,7 +150,7 @@ def showAllUserEquipmentPC(userID, fieldDict, response):
                 sqlDict['count'] = device_info_count
                 return response.json(0, sqlDict)
             else:
-                return response.json(604)
+                return response.json(612)
         else:
             return response.json(113)
 

Controller/EquipmentSensor.py

@@ -211,7 +211,7 @@ class EquipmentSensor(View):
                     return response.json(0, send_json)
                 else:
                     return response.json(0, {})
-            return response.json(604)
+            return response.json(612)
         else:
             return response.json(444)
 

Controller/OTAEquipment.py

@@ -478,7 +478,7 @@ def showAllEquipmentVersion(userID,response):
                 sqlDict = dict(zip(["datas"], [sqlList]))
                 return response.json(0, sqlDict)
             else:
-                return response.json(604)
+                return response.json(612)
         else:
             return response.json(113)
 

Controller/PermissionManager.py

@@ -312,7 +312,7 @@ class queryRoleView(View):
             role = Roles()
             return role.queryAllRoles(response=response)
         else:
-            return response.json(603)
+            return response.json(404)
 
 class addNewRoleView(View):
     @method_decorator(csrf_exempt)
@@ -372,7 +372,7 @@ class addNewRoleView(View):
                 role = Roles()
                 return role.addRoles(content=content,response=response)
             else:
-                return response.json(607)
+                return response.json(611)
 
 
 class delRoleView(View):
@@ -475,7 +475,7 @@ class modifyRoleView(View):
                 role = Roles()
                 return role.modifyRoles(rid=rid, content=content,response=response)
             else:
-                return response.json(607)
+                return response.json(611)
 
 
 # 权限View
@@ -520,7 +520,7 @@ class addNewPermsView(View):
             own_perm = ModelService.check_permission(userID,40)
             # if user_valid[0].is_superuser == 100 and user_valid[0].is_superuser != 1 and user_valid[0].is_superuser != 10:
             if own_perm is not True:
-                return response.json(600)
+                return response.json(612)
             else:
                 add_dict = {'id':int(request_dict['id']),'permName':request_dict['permName'],'description':request_dict['description']}
                 try:

Controller/UserManger.py

@@ -314,7 +314,7 @@ def showAllUserPC(userID, line, page, response):
                 sqlDict['count'] = device_user_count
                 return response.json(0, sqlDict)
             else:
-                return response.json(600)
+                return response.json(612)
         else:
             return response.json(113)
 
@@ -336,7 +336,7 @@ def showAllUser(userID, response):
                 sqlDict = dict(zip(["datas"], [sqlList]))
                 return response.json(0, sqlDict)
             else:
-                return response.json(600)
+                return response.json(612)
         else:
             return response.json(113)
 

Object/ResponseObject.py

@@ -1,6 +1,7 @@
 from django.shortcuts import HttpResponse
 import simplejson as json
 
+
 # 后面尽量尽量使用这个JSON响应类，模板未Controller/OauthManage.py
 
 
@@ -39,7 +40,7 @@ class ResponseObject(object):
             118: 'You do not enter the password two times!',
             120: 'The code has expired',
             121: 'The verification code is wrong!',
-            150: 'The superID is None or superID is equal to userID',
+            150: 'Wrong superID is None or userID',
             160: 'The All Equipment has been shared by the User!',
             171: 'Delete Equipment sharing failed',
             172: 'There is no Equipment for this User!',
@@ -69,14 +70,10 @@ class ResponseObject(object):
             500: 'Query Database Error:',
             501: 'Update database error!',
             502: 'The fields do not exist!',
-            600: 'Query permission denied!',
             601: 'Delete permission denied!',
             602: 'Modify permission denied!',
-            603: 'Permission denied!',
-            604: 'Query permission denied!',
-            605: 'Upload permission denied! ',
+            605: 'Upload permission denied!',
             606: 'User has not assigned role!',
-            607: 'Add permission denied!',
             611: 'Add permission denied!',
             612: 'Query permission denied!',
             615: 'SuperAdmin does not exist!',
@@ -92,16 +89,16 @@ class ResponseObject(object):
             808: 'Add a new role to the wrong',
             816: 'Add a new permissions error',
             817: 'The permissions do not exist!',
-            818: 'The deletion of the permissions failed',
+            818: 'Delete permission failed',
             700: 'Upload file error',
             701: 'The file does not exist!',
             900: 'There is no information about this version!',
             901: 'Getting URL failure!',
             902: 'The code does not exist!',
-            903: 'The name of the file does not meet the conditions!',
+            903: 'Error filename',
             906: 'Cause of file operation error',
             907: 'The download file does not exist!',
-            910: 'There are too many downloads. Please wait a moment...',
+            910: 'Much downloads. Please wait a moment...',
         }
         data_cn = {
             0: '成功',
@@ -109,21 +106,21 @@ class ResponseObject(object):
             5: '请一分钟后再尝试',
             9: '用户账号不存在',
             10: res,
-            13: '该设备不存在',
-            14: '该设备不属于您',
+            13: '设备不存在',
+            14: '设备不属于您',
             15: '您尚未打开此服务',
             44: '系统错误！无法发送电子邮件',
             48: '系统对象错误',
             60: 'APP信息已经存在',
-            89: '您已经获得了验证码，请在5分钟后检查或再次确认。',
-            101: '手机的用户账号已经存在！',
-            102: '手机的用户账号不存在！',
-            103: '邮箱用户帐户已经存在！',
-            104: '邮箱用户帐户不存在！',
+            89: '已发验证码，请检测或5分钟后重新获取。',
+            101: '手机已存在！',
+            102: '手机不存在！',
+            103: '邮箱已存在！',
+            104: '邮箱不存在！',
             106: '创建用户错误',
-            107: '用户名格式不符合规则！',
-            109: '密码格式不符合规则！',
-            110: '因为用户未激活，用户是无效用户！',
+            107: '用户名格式不符合！',
+            109: '密码格式不符合！',
+            110: '用户未激活！',
             111: '您输入的密码不正确！',
             112: '未知错误不能更新密码！',
             113: '此用户标识不存在！',
@@ -132,7 +129,7 @@ class ResponseObject(object):
             118: '你不输入密码两次！',
             120: '验证码过期',
             121: '验证码错了！',
-            150: '超级用户不存在或者用户id错误',
+            150: '超级用户或用户id错误',
             160: '所有设备已被用户共享！',
             171: '删除设备共享失败',
             172: '这个用户没有设备！',
@@ -150,10 +147,10 @@ class ResponseObject(object):
             193: '未知的错误导致角色不能被删除！',
             194: '更新角色错误',
             195: '未知的错误导致角色无法更新！',
-            302: '更新令牌到数据库错误',
-            307: '令牌已经过期！',
-            310: '令牌中的用户名不存在！',
-            311: '令牌为空！',
+            302: '请重新登录! 更新令牌到数据库错误',
+            307: '请重新登录! 令牌已经过期！',
+            310: '请重新登录! 令牌中的用户名不存在！',
+            311: '请重新登录! 令牌为空！',
             403: 'API错误！',
             404: '您没有访问的权限！',
             414: '客户端错误！请确认请求路径！',
@@ -162,18 +159,14 @@ class ResponseObject(object):
             500: '查询数据库错误！',
             501: '更新数据库错误！',
             502: '在数据库中，参数字段不存在！',
-            600: '您没有权限查询所有用户信息！',
-            601: '您没有权限删除用户！',
-            602: '您没有修改用户信息的权限！',
-            603: '用户帐户没有权限执行此操作！',
-            604: '您没有权限查询所有用户设备信息！',
-            605: '你没有上传OTA文件的权限！',
+            601: '没有权限删除!',
+            602: '没有权限修改！',
+            605: '没有权限上传!',
             606: '用户没有分配角色！',
-            607: '用户没有添加新角色的权限！',
-            611: '您没有添加新权限的权限！',
-            612: '您没有查询所有用户的权限的权限！',
-            615: '超级管理员（USEID）帐户不存在！',
-            616: '用户（USERID）帐户不存在！',
+            611: '没有权限添加！',
+            612: '没有权限查询！',
+            615: '超级管理员帐户不存在！',
+            616: '用户帐户不存在！',
             800: '请求参数不存在！',
             801: '错误的请求参数！',
             802: 'content参数错误！',
@@ -191,10 +184,10 @@ class ResponseObject(object):
             900: '版本信息不存在',
             901: '获取链接失败',
             902: 'code不存在！',
-            903: '文件名不符合条件！',
+            903: '文件名不符合！',
             906: '文件操作错误',
-            907: '下载文件不存在！',
-            910: '下载太多了。请稍等…',
+            907: '文件不存在！',
+            910: '下载太多,请稍等…',
         }
         if self.lang == 'cn':
             msg = data_cn
@@ -208,8 +201,8 @@ class ResponseObject(object):
 
     def formal(self, code, res={}):
         formal_data = self.data(code, res)
-        return json.dumps(formal_data,ensure_ascii=False)
+        return json.dumps(formal_data, ensure_ascii=False)
 
     def json(self, code, res={}):
         result = self.formal(code, res)
-        return HttpResponse(result)
+        return HttpResponse(result)