增加主用户机制

Controller/AccessLog.py

@@ -64,7 +64,7 @@ class AccessLog(View):
             order = '-id'
         if not page or not line:
             return response.json(444,'page,line')
-        own_perm = ModelService.check_permission(userID=userID, permID=30)
+        own_perm = ModelService.check_perm(userID=userID, permID=30)
         if own_perm is not True:
             return response.json(404)
         qs = Access_Log.objects.all().order_by(order)
@@ -78,7 +78,7 @@ class AccessLog(View):
 
     # 清空日志表
     def truncate_by_admin(self, userID, response, ):
-        check_perm = ModelService.check_permission(userID=userID, permID=10)
+        check_perm = ModelService.check_perm(userID=userID, permID=10)
         if check_perm is True:
             from django.db import connection
             cursor = connection.cursor()
@@ -97,7 +97,7 @@ class AccessLog(View):
         endtime = request_dict.get('endtime', None)
         if not page or not line:
             return response.json(444, 'page,line')
-        check_perm = ModelService.check_permission(userID=userID, permID=20)
+        check_perm = ModelService.check_perm(userID=userID, permID=20)
         if check_perm is not True:
             return response.json(404)
         try:
@@ -152,7 +152,7 @@ def statisticsPath(request):
     if tko.code != 0:
         return response.json(tko.code)
     userID = tko.userID
-    own_perm = ModelService.check_permission(userID, 10)
+    own_perm = ModelService.check_perm(userID, 10)
     if own_perm is not True:
         return response.json(404)
     paths = TemplateService.log_api()
@@ -179,7 +179,7 @@ def deleteSn(request):
     if tko.code != 0:
         return response.json(tko.code)
     userID = tko.userID
-    own_perm = ModelService.check_permission(userID, 10)
+    own_perm = ModelService.check_perm(userID, 10)
     if own_perm is not True:
         return response.json(404)
     dltime = datetime.datetime.now() - datetime.timedelta(days=int(days))

Controller/AdminManage.py

@@ -64,7 +64,7 @@ class AdminManage(TemplateView):
             return self.getAllDeviceArea(userID, response)
 
     def resetUserPwd(self, request_dict, userID, response):
-        own_permission = ModelService.check_permission(userID=userID, permID=50)
+        own_permission = ModelService.check_perm(userID=userID, permID=50)
         if not own_permission:
             return response.json(404)
         duserID = request_dict.get('duserID', None)
@@ -84,7 +84,7 @@ class AdminManage(TemplateView):
 
     def getAllUserName(self, userID, response):
         # 权限固定为30
-        own_permission = ModelService.check_permission(userID=userID, permID=30)
+        own_permission = ModelService.check_perm(userID=userID, permID=30)
         if own_permission is not True:
             return response.json(404)
         username_list = Device_User.objects.all().values_list('username', flat=True)
@@ -96,7 +96,7 @@ class AdminManage(TemplateView):
     #    获取全部用户的在线个数
     def getAllOnLine(self, userID, response):
         # 权限固定为30
-        own_permission = ModelService.check_permission(userID=userID, permID=30)
+        own_permission = ModelService.check_perm(userID=userID, permID=30)
         if own_permission is not True:
             return response.json(404)
         allonline = Device_User.objects.all().values('online')
@@ -115,7 +115,7 @@ class AdminManage(TemplateView):
     #    获取全部用户的在线人数
     def getOnLine(self, userID, response):
         # 权限固定为30
-        own_permission = ModelService.check_permission(userID=userID, permID=30)
+        own_permission = ModelService.check_perm(userID=userID, permID=30)
         if own_permission is True:
             online_list = Device_User.objects.all().values('online', 'last_login')
             # 两个变量，分别是在线，离线
@@ -142,7 +142,7 @@ class AdminManage(TemplateView):
 
     # 获取所有设备地区
     def getAllDeviceArea(self, userID, response):
-        own_permission = ModelService.check_permission(userID=userID, permID=30)
+        own_permission = ModelService.check_perm(userID=userID, permID=30)
         if own_permission is True:
             qs = Device_Info.objects.all().values('area', 'UID')
             uid_area_dict = {}
@@ -169,7 +169,7 @@ class AdminManage(TemplateView):
     '''
 
     def getStatisAccess(self, userID, request_dict, response):
-        own_permission = ModelService.check_permission(userID=userID, permID=30)
+        own_permission = ModelService.check_perm(userID=userID, permID=30)
         if own_permission is not True:
             return response.json(404)
         time_stamp = int(request_dict.get('timestamp', None))
@@ -187,7 +187,7 @@ class AdminManage(TemplateView):
         return response.json(0, {'count': res})
 
     def getAllUID(self, userID, response):
-        own_permission = ModelService.check_permission(userID=userID, permID=30)
+        own_permission = ModelService.check_perm(userID=userID, permID=30)
         if own_permission is not True:
             return response.json(404)
         uid_list = Device_Info.objects.all().values_list('UID', flat=True)
@@ -206,7 +206,7 @@ def getUserIds(request):
     if tko.code != 0:
         return response.json(tko.code)
     userID = tko.userID
-    own_perm = ModelService.check_permission(userID, 30)
+    own_perm = ModelService.check_perm(userID, 30)
     if own_perm is not True:
         return response.json(404)
     dn = Device_User.objects.all().values('userID', 'username')
@@ -236,7 +236,7 @@ def search_user_by_content(request):
     if tko.code != 0:
         return response.json(tko.code)
     userID = tko.userID
-    own_perm = ModelService.check_permission(userID=userID, permID=20)
+    own_perm = ModelService.check_perm(userID=userID, permID=20)
     if own_perm is not True:
         return response.json(404)
     try:

Controller/AppInfo.py

@@ -78,7 +78,7 @@ class AppInfo(View):
             return response.json(444, 'app_type,appBundleId')
 
     def add(self, request_dict, userID, response):
-        own_perm = ModelService.check_permission(userID=userID, permID=40)
+        own_perm = ModelService.check_perm(userID=userID, permID=40)
         if own_perm is not True:
             return response.json(404)
         appBundleId = request_dict.get('appBundleId', None)
@@ -137,7 +137,7 @@ class AppInfo(View):
                         return response.json(500)
 
     def query(self, request_dict, userID, response):
-        own_perm = ModelService.check_permission(userID=userID, permID=30)
+        own_perm = ModelService.check_perm(userID=userID, permID=30)
         if own_perm is not True:
             return response.json(404)
         page = int(request_dict.get('page', None))
@@ -154,7 +154,7 @@ class AppInfo(View):
         return response.json(0)
 
     def update(self, request_dict, userID, response):
-        own_perm = ModelService.check_permission(userID=userID, permID=30)
+        own_perm = ModelService.check_perm(userID=userID, permID=30)
         if own_perm is not True:
             return response.json(404)
         id = request_dict.get('id', None)
@@ -185,7 +185,7 @@ class AppInfo(View):
             return response.json(0, {'update_id': app_info.id, 'update_time': str(app_info.update_time)})
 
     def delete(self, request_dict, userID, response):
-        own_perm = ModelService.check_permission(userID=userID, permID=10)
+        own_perm = ModelService.check_perm(userID=userID, permID=10)
         if own_perm is not True:
             return response.json(404)
         id_list = request_dict.getlist('id', None)

Controller/CloudVod.py

@@ -84,7 +84,6 @@ class CloudVodView(View):
             ip = CommonService.get_ip_address(request)
             return self.do_getSts(request_dict, ip, response)
         # 付款完成
-
         elif operation == 'payExecute':
             return self.do_paypal_execute(request_dict, response)
         elif operation == 'storeplaylist':
@@ -118,7 +117,7 @@ class CloudVodView(View):
             else:
                 return response.json(414)
 
-    def do_get_details(self, request_dict, userID, response):
+    def do_get_details(self, request_dict, response):
         did = request_dict.get('did', None)
         dvqs = Device_Info.objects.filter(id=did).values('UID')
         if not dvqs.exists():
@@ -134,13 +133,12 @@ class CloudVodView(View):
     def do_get_appSts(self, request_dict, userID, response):
         did = request_dict.get('id')
         channel = request_dict.get('channel')
-        dvqs = Device_Info.objects.filter(userID_id=userID, id=did).values('UID')
+        dvqs = Device_Info.objects.filter(userID_id=userID, id=did,isShare=False).values('UID')
         if not dvqs.exists():
             return response.json(10, '设备不属于')
         UID = dvqs[0]['UID']
-        ubqs = UID_Bucket.objects.filter(uid=UID, channel=channel, status=1).values('channel', 'bucket__bucket',
-                                                                                    'bucket__endpoint',
-                                                                                    'bucket__region', 'endTime')
+        ubqs = UID_Bucket.objects.filter(uid=UID, channel=channel, status=1). \
+            values('channel', 'bucket__bucket', 'bucket__endpoint', 'bucket__region', 'endTime')
         now_time = CommonService.get_utc()
         if not ubqs.exists():
             return response.json(10, '未购买')
@@ -266,6 +264,9 @@ class CloudVodView(View):
         did = request_dict.get('did', None)
         rank = request_dict.get('rank', None)
         channel = request_dict.get('channel', None)
+        qs = Device_Info.objects.filter(userID_id=userID, id=did, isShare=False).values("UID")
+        if not qs.exists():
+            return response.json(13)
         if not did or not channel or not rank:
             return response.json(444, 'did,channel,rank')
         smqs = Store_Meal.objects.filter(id=rank).values("currency", "price", "content", "day", "bucket__storeDay")
@@ -275,10 +276,6 @@ class CloudVodView(View):
         price = smqs[0]['price']
         content = smqs[0]['content']
         day = smqs[0]['day']
-
-        qs = Device_Info.objects.filter(userID_id=userID, id=did).values("UID")
-        if not qs.exists():
-            return response.json(13)
         uid = qs[0]['UID']
         ubqs = UID_Bucket.objects.filter(uid=uid, channel=channel).values("bucket__storeDay")
         if ubqs.exists():
@@ -424,7 +421,7 @@ class CloudVodView(View):
         hour = request_dict.get('hour', None)
         if not did or not channel or not daytime:
             return response.json(444, 'did,channel')
-        qs = Device_Info.objects.filter(userID_id=userID, id=did).values("UID")
+        qs = Device_Info.objects.filter(userID_id=userID, id=did,isShare=False).values("UID")
         if not qs.exists():
             return response.json(13)
         uid = qs[0]['UID']
@@ -538,7 +535,7 @@ class CloudVodView(View):
         channel = request_dict.get('channel', None)
         if not did or not status or not channel:
             return response.json(444, 'did,status,channel')
-        dvqs = Device_Info.objects.filter(id=did, userID_id=userID).values("UID")
+        dvqs = Device_Info.objects.filter(id=did, userID_id=userID,isShare=False).values("UID")
         if not dvqs.exists():
             return response.json(10, '没有设备')
         UID = dvqs[0]["UID"]
@@ -596,7 +593,7 @@ class CloudVodView(View):
 
         did = request_dict.get('did', None)
         channel = request_dict.get('channel', None)
-        dvqs = Device_Info.objects.filter(id=did, userID_id=userID).values("UID")
+        dvqs = Device_Info.objects.filter(id=did, userID_id=userID,isShare=False).values("UID")
         if not dvqs.exists():
             return response.json(10, '无设备')
         UID = dvqs[0]["UID"]
@@ -627,4 +624,4 @@ class CloudVodView(View):
             thumb = bucket.sign_url('GET', ts, 3600,
                                     params={'x-oss-process': 'video/snapshot,t_10000,m_fast,w_300'})
             vod_play_list.append({'name': vod['time'], 'sign_url': vod_play_url, 'thumb': thumb, 'sec': vod['sec']})
-        return response.json(0, vod_play_list)
+        return response.json(0, vod_play_list)

Controller/DeviceLog.py

@@ -71,7 +71,7 @@ def DeviceLog(request, uid):
                     line = 10000
                 param_flag = CommonService.get_param_flag(data=[userID, page, line, uid])
                 own_dev = ModelService.check_own_device(userID=userID, UID=uid)
-                own_per = ModelService.check_permission(userID=userID, permID=30)
+                own_per = ModelService.check_perm(userID=userID, permID=30)
                 if own_dev is True or own_per is True:
                     if param_flag is True:
                         query = {'uid': uid}

Controller/DeviceManage.py

@@ -69,7 +69,7 @@ class DeviceManage(View):
             return response.json(444)
 
     def query(self, request_dict, userID, response):
-        own_perm = ModelService.check_permission(userID=userID, permID=30)
+        own_perm = ModelService.check_perm(userID=userID, permID=30)
         if own_perm is True:
             page = int(request_dict.get('page', None))
             line = int(request_dict.get('line', None))
@@ -101,7 +101,7 @@ class DeviceManage(View):
             return response.json(404)
 
     def delete(self, request_dict, userID, response):
-        own_perm = ModelService.check_permission(userID=userID, permID=10)
+        own_perm = ModelService.check_perm(userID=userID, permID=10)
         if own_perm is True:
             id = request_dict.get('id', None)
             if id:
@@ -113,7 +113,7 @@ class DeviceManage(View):
             return response.json(404)
 
     def findByUser(self, request_dict, userID, response):
-        own_perm = ModelService.check_permission(userID=userID, permID=30)
+        own_perm = ModelService.check_perm(userID=userID, permID=30)
         if own_perm is True:
             page = int(request_dict.get('page', None))
             line = int(request_dict.get('line', None))

Controller/DeviceMeal.py

@@ -78,7 +78,7 @@ class DeviceMeal(View):
         return response.json(444, 'userID,operation')
 
     def add(self, request_dict, userID, response):
-        own_perm = ModelService.check_permission(userID=userID, permID=40)
+        own_perm = ModelService.check_perm(userID=userID, permID=40)
         if own_perm is True:
             uid = request_dict.get('uid', None)
             channel = request_dict.get('channel', None)
@@ -126,7 +126,7 @@ class DeviceMeal(View):
             return response.json(404)
 
     def query(self, request_dict, userID, response):
-        own_perm = ModelService.check_permission(userID=userID, permID=30)
+        own_perm = ModelService.check_perm(userID=userID, permID=30)
         if own_perm is True:
             page = int(request_dict.get('page', None))
             line = int(request_dict.get('line', None))
@@ -151,7 +151,7 @@ class DeviceMeal(View):
             return response.json(404)
 
     def update(self, request_dict, userID, response):
-        own_perm = ModelService.check_permission(userID=userID, permID=30)
+        own_perm = ModelService.check_perm(userID=userID, permID=30)
         if not own_perm:
             return response.json(404)
         id = request_dict.get('id', None)
@@ -173,7 +173,7 @@ class DeviceMeal(View):
                                      'end_time': str(dmqs.end_time)})
 
     def delete(self, request_dict, userID, response):
-        own_perm = ModelService.check_permission(userID=userID, permID=10)
+        own_perm = ModelService.check_perm(userID=userID, permID=10)
         if own_perm is True:
             id_list = request_dict.getlist('id', None)
             param_flag = CommonService.get_param_flag(data=[id_list])

Controller/EquipmentInfo.py

@@ -191,7 +191,7 @@ class EquipmentInfo(View):
         userID_id = request_dict.get('userID_id', None)
         if not page or not line:
             return response.json(444, 'page,line')
-        check_perm = ModelService.check_permission(userID=userID, permID=30)
+        check_perm = ModelService.check_perm(userID=userID, permID=30)
         if not check_perm:
             return response.json(404)
         uid_list = Device_Info.objects.filter(userID_id=userID_id).values_list('UID', flat=True)
@@ -210,7 +210,7 @@ class EquipmentInfo(View):
         id_list = request_dict.getlist('id', None)
         if not len(id_list):
             return response.json(444, 'id is None or not list')
-        check_perm = ModelService.check_permission(userID=userID, permID=10)
+        check_perm = ModelService.check_perm(userID=userID, permID=10)
         if check_perm is True:
             try:
                 is_delete = Equipment_Info.objects.filter(id__in=id_list).delete()

Controller/EquipmentManager.py

@@ -9,7 +9,64 @@ from Object.ResponseObject import ResponseObject
 import re
 
 
-def addNewUserEquipment(userID, deviceContent, response):
+#     查询用户设备
+@csrf_exempt
+def queryUserEquipmentInterface(request):
+    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)
+    token = request_dict.get('token', None)
+    tko = TokenObject(token)
+    response.lang = tko.lang
+    if tko.code != 0:
+        return response.json(tko.code)
+    userID = tko.userID
+    if not userID:
+        return response.json(104)
+    dvqs = Device_Info.objects.filter(userID_id=userID)
+    uid_list = Device_Info.objects.filter(userID_id=userID, isShare=False).\
+        values_list('UID', flat=True)
+    ubqs = UID_Bucket.objects.filter(uid__in=uid_list). \
+        values('bucket__content', 'status', 'channel', 'endTime', 'uid')
+    ubql = CommonService.qs_to_list(ubqs)
+    res = []
+    for p in dvqs:
+        p.vod = []
+        for dm in ubql:
+            if p.UID == dm['uid']:
+                p.vod.append(dm)
+        res.append(p)
+    resdict = CommonService.qs_to_dict(res)
+    return response.json(0, resdict)
+
+
+@csrf_exempt
+def addNewUserEquipmentInterface(request, *callback_args,
+                                 **callback_kwargs):
+    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)
+    token = request_dict.get('token', None)
+    deviceContent = request_dict.get('content', None)
+    if not deviceContent:
+        return response.json(444, 'content')
+    tko = TokenObject(token)
+    response.lang = tko.lang
+    if tko.code != 0:
+        return response.json(tko.code)
+    userID = tko.userID
     userIDValid = Device_User.objects.filter(userID=userID)
     if userIDValid:
         try:
@@ -48,7 +105,8 @@ def addNewUserEquipment(userID, deviceContent, response):
                                 # else:
                                 #     return response.json(111)
                             else:
-                                userDevice = Device_Info(id=CommonService.getUserID(getUser=False), userID_id=userID,
+                                userDevice = Device_Info(id=CommonService.getUserID(getUser=False),
+                                                         userID_id=userID,
                                                          **deviceData)
                                 userDevice.save()
                         else:
@@ -67,204 +125,44 @@ def addNewUserEquipment(userID, deviceContent, response):
         return response.json(104)
 
 
-def delUserEquipment(userID, id, response):
-    try:
-        deviceValid = Device_Info.objects.filter(userID_id=userID, id=id)
-    except Exception as e:
-        errorInfo = traceback.format_exc()
-        print('查询数据库错误: %s' % errorInfo)
-        return response.json(500, repr(e))
-    else:
-        if deviceValid:
-            try:
-                Device_Info.objects.filter(userID_id=userID, id=id).delete()
-            except Exception as e:
-                errorInfo = traceback.format_exc()
-                print('删除数据库记录错误: %s' % errorInfo)
-                return response.json(176, repr(e))
-            else:
-                return response.json(0)
-        else:
-            UserValid = Device_User.objects.filter(userID=userID)
-            if UserValid.exists():
-                return response.json(172)
-            else:
-                return response.json(104)
-
-
-def showAllUserEquipment(userID, response):
-    try:
-        userValid = Device_User.objects.filter(userID=userID).order_by('-data_joined')
-    except Exception as e:
-        errorInfo = traceback.format_exc()
-        print('查询数据库错误: %s' % errorInfo)
-        return response.json(500, repr(e))
-    else:
-        if not userValid.exists():
-            return response.json(104)
-        own_perm = ModelService.check_permission(userID=userID, permID=30)
-        if own_perm is not True:
-            return response.json(404)
-        qs = Device_Info.objects.all()
-        res = CommonService.qs_to_dict(qs)
-        return response.json(0, res)
-
-
-def showAllUserEquipmentPC(userID, fieldDict, response):
-    try:
-        user_valid = Device_User.objects.filter(userID=userID).order_by('-data_joined')
-    except Exception as e:
-        errorInfo = traceback.format_exc()
-        print('查询数据库错误: %s' % errorInfo)
-        return response.json(500, repr(e))
-    else:
-        if not user_valid:
-            return response.json(104)
-        own_permission = ModelService.check_permission(userID=userID, permID=30)
-        if not own_permission:
-            return response.json(404)
-        page = int(fieldDict['page'])
-        line = int(fieldDict['line'])
-        device_info_query_set = Device_Info.objects.all()
-        device_info_count = device_info_query_set.count()
-        device_info_res = device_info_query_set[(page - 1) * line:page * line]
-        sqlDict = CommonService.qs_to_dict(query_set=device_info_res)
-        sqlDict['count'] = device_info_count
-        return response.json(0, sqlDict)
-
-
-def findEquipmentInfo(content, type, fieldDict):
-    if type == 1:
-        Device_Info_QuerySet = Device_Info.objects.all()
-    if type == 2:
-        searchCondition = content
-        kwargs = CommonService.get_kwargs(data=searchCondition)
-        Device_Info_QuerySet = Device_Info.objects.filter(**kwargs)
-    page = int(fieldDict['page'])
-    line = int(fieldDict['line'])
-    device_info_count = Device_Info_QuerySet.count()
-    res = Device_Info_QuerySet[(page - 1) * line:page * line]
-    send_dict = CommonService.qs_to_dict(query_set=res)
-    for k, v in enumerate(send_dict["datas"]):
-        for val in res:
-            if v['pk'] == val.id:
-                username = ModelService.get_user_name(send_dict["datas"][k]['fields']['userID'])
-                send_dict["datas"][k]['fields']['username'] = username
-                primary = ModelService.get_user_name(send_dict["datas"][k]['fields']['primaryUserID'])
-                send_dict["datas"][k]['fields']['primaryusername'] = primary
-    send_dict['count'] = device_info_count
-    return send_dict
-
-
-#     查询用户设备
 @csrf_exempt
-def queryUserEquipmentInterface(request):
-    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
-    token = request_dict.get('token', None)
-    tko = TokenObject(token)
-    response.lang = tko.lang
-    if tko.code != 0:
-        return response.json(tko.code)
-    userID = tko.userID
-    if not userID:
-        return response.json(104)
-    dvqs = Device_Info.objects.filter(userID_id=userID)
-    uid_list = []
-    for q in dvqs:
-        uid_list.append(q.UID)
-    ubqs = UID_Bucket.objects.filter(uid__in=uid_list). \
-        values('bucket__content', 'status', 'channel', 'endTime', 'uid')
-    ubql = CommonService.qs_to_list(ubqs)
-    res = []
-    for p in dvqs:
-        p.vod = []
-        for dm in ubql:
-            if p.UID == dm['uid']:
-                p.vod.append(dm)
-        res.append(p)
-    resdict = CommonService.qs_to_dict(res)
-    return response.json(0, resdict)
-
-
-@csrf_exempt
-def addNewUserEquipmentInterface(request, *callback_args,
-                                 **callback_kwargs):
-    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)
-    token = request_dict.get('token', None)
-    deviceContent = request_dict.get('content', None)
-    if token is not None and deviceContent is not None:
-        tko = TokenObject(token)
-        response.lang = tko.lang
-        if tko.code == 0:
-            userID = tko.userID
-            if userID is not None:
-                return addNewUserEquipment(userID, deviceContent, response)
-            else:
-                return response.json(309)
-        else:
-            return response.json(tko.code)
-    else:
-        return response.json(444, 'token,content')
-
-
-@csrf_exempt
-def delUserEquipmentInterface(request, *callback_args,
-                              **callback_kwargs):
+def delUserEquipmentInterface(request):
     '''
     删除用户设备
     :param request:
-    :param callback_args: 表示任何多个无名参数，tuple类型
-    :param callback_kwargs: 表示关键字参数，dict类型
     :return:
     '''
     response = ResponseObject()
+    request.encoding = 'utf-8'
     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)
     token = request_dict.get('token', None)
     id = request_dict.get('id', None)
-    if token is not None and id is not None:
-        tko = TokenObject(token)
-        response.lang = tko.lang
-        if tko.code == 0:
-            userID = tko.userID
-            if userID is not None:
-                return delUserEquipment(userID, id, response)
-            else:
-                return response.json(309)
-        else:
-            return response.json(tko.code)
+    if not id:
+        return response.json(444, 'id')
+    tko = TokenObject(token)
+    response.lang = tko.lang
+    if tko.code != 0:
+        return response.json(tko.code)
+    userID = tko.userID
+    try:
+        Device_Info.objects.filter(userID_id=userID, id=id).delete()
+    except Exception as e:
+        errorInfo = traceback.format_exc()
+        print('删除数据库记录错误: %s' % errorInfo)
+        return response.json(176, repr(e))
     else:
-        return response.json(800)
-
+        return response.json(0)
 
 @csrf_exempt
-def modifyUserEquipmentInterface(request, *callback_args,
-                                 **callback_kwargs):
+def modifyUserEquipmentInterface(request):
     '''
     修改用户设备
     :param request:
-    :param callback_args:
-    :param callback_kwargs:
     :return:
     '''
     response = ResponseObject()
@@ -274,6 +172,8 @@ def modifyUserEquipmentInterface(request, *callback_args,
     elif request.method == 'GET':
         request.encoding = 'utf-8'
         request_dict = request.GET
+    else:
+        return response.json(801)
     token = request_dict.get('token', None)
     deviceContent = request_dict.get('content', None)
     id = request_dict.get('id', None)
@@ -287,38 +187,28 @@ def modifyUserEquipmentInterface(request, *callback_args,
     if userID is None:
         return response.json(309)
     try:
-        deviceValid = Device_Info.objects.filter(userID_id=userID, id=id)
+        deviceData = json.loads(deviceContent)
+        Device_Info.objects.filter(userID_id=userID, id=id).update(**deviceData)
     except Exception as e:
-        return response.json(500, repr(e))
+        return response.json(177, repr(e))
     else:
-        if deviceValid.exists():
-            deviceData = json.loads(deviceContent)
-            try:
-                Device_Info.objects.filter(userID_id=userID, id=id).update(**deviceData)
-            except Exception as e:
-                return response.json(177, repr(e))
-            else:
-                qs = Device_Info.objects.filter(userID_id=userID, id=id)
-                res = CommonService.qs_to_dict(qs)
-                return response.json(0, res)
-        else:
-            UserValid = Device_User.objects.filter(userID=userID)
-            if UserValid.exists():
-                return response.json(172)
-            else:
-                return response.json(104)
+        qs = Device_Info.objects.filter(userID_id=userID, id=id)
+        res = CommonService.qs_to_dict(qs)
+        return response.json(0, res)
 
 
 @csrf_exempt
 def showAllUserEquipmentInterface(request, *callback_args, **callback_kwargs):
     request.encoding = 'utf-8'
+    response = ResponseObject()
     if request.method == 'POST':
         fieldDict = request.POST
-    if request.method == 'GET':
+    elif request.method == 'GET':
         fieldDict = request.GET
+    else:
+        return response.json(801)
     token = request.POST.get('token', None)
     type = request.POST.get('type', None)
-    response = ResponseObject()
     tko = TokenObject(token)
     response.lang = tko.lang
     if tko.code != 0:
@@ -326,39 +216,76 @@ def showAllUserEquipmentInterface(request, *callback_args, **callback_kwargs):
     userID = tko.userID
     if not userID:
         return response.json(104)
+    own_perm = ModelService.check_perm(userID=userID, permID=30)
+    if not own_perm:
+        return response.json(404)
     if type == 'PC':
-        return showAllUserEquipmentPC(userID, fieldDict, response)
-    return showAllUserEquipment(userID, response)
+        page = int(fieldDict['page'])
+        line = int(fieldDict['line'])
+        qs = Device_Info.objects.all()
+        count = qs.count()
+        res = qs[(page - 1) * line:page * line]
+        sqlDict = CommonService.qs_to_dict(query_set=res)
+        sqlDict['count'] = count
+        return response.json(0, sqlDict)
+    else:
+        qs = Device_Info.objects.all()
+        res = CommonService.qs_to_dict(qs)
+        return response.json(0, res)
 
 
 @csrf_exempt
 def findEquipmentInfoInterface(request, *callback_args, **callback_kwargs):
+    request.encoding = 'utf-8'
+    response = ResponseObject()
     if request.method == 'GET':
-        request.encoding = 'gb2312'
         fieldDict = request.GET
-    if request.method == 'POST':
-        request.encoding = 'utf-8'
+    elif request.method == 'POST':
         fieldDict = request.POST
+    else:
+        return response.json(801)
     deviceContent = fieldDict.get('content', None)
     token = fieldDict.get('token', None)
-    response = ResponseObject()
-
-    if token != None:
-        tko = TokenObject(token)
-        response.lang = tko.lang
-        if tko.code == 0:
-            if deviceContent:
-                try:
-                    deviceContent = json.loads(deviceContent)
-                except Exception as e:
-                    print(repr(e))
-                    return response.json(10, repr(e))
-                else:
-                    resultDict = findEquipmentInfo(content=deviceContent, type=2, fieldDict=fieldDict)
-            else:
-                resultDict = findEquipmentInfo(content='', type=1, fieldDict=fieldDict)
-            return response.json(0, resultDict)
+    tko = TokenObject(token)
+    response.lang = tko.lang
+    if tko.code != 0:
+        return response.json(tko.code)
+    if deviceContent:
+        try:
+            searchCondition = json.loads(deviceContent)
+        except Exception as e:
+            print(repr(e))
+            return response.json(10, repr(e))
         else:
-            return response.json(tko.code)
+            kwargs = CommonService.get_kwargs(data=searchCondition)
+            qs = Device_Info.objects.filter(**kwargs)
+            page = int(fieldDict['page'])
+            line = int(fieldDict['line'])
+            count = qs.count()
+            res = qs[(page - 1) * line:page * line]
+            send_dict = CommonService.qs_to_dict(query_set=res)
+            for k, v in enumerate(send_dict["datas"]):
+                for val in res:
+                    if v['pk'] == val.id:
+                        username = ModelService.get_user_name(send_dict["datas"][k]['fields']['userID'])
+                        send_dict["datas"][k]['fields']['username'] = username
+                        primary = ModelService.get_user_name(send_dict["datas"][k]['fields']['primaryUserID'])
+                        send_dict["datas"][k]['fields']['primaryusername'] = primary
+            send_dict['count'] = count
+            return response.json(0, send_dict)
     else:
-        return response.json(444, 'token')
+        qs = Device_Info.objects.all()
+        page = int(fieldDict['page'])
+        line = int(fieldDict['line'])
+        count = qs.count()
+        res = qs[(page - 1) * line:page * line]
+        send_dict = CommonService.qs_to_dict(query_set=res)
+        for k, v in enumerate(send_dict["datas"]):
+            for val in res:
+                if v['pk'] == val.id:
+                    username = ModelService.get_user_name(send_dict["datas"][k]['fields']['userID'])
+                    send_dict["datas"][k]['fields']['username'] = username
+                    primary = ModelService.get_user_name(send_dict["datas"][k]['fields']['primaryUserID'])
+                    send_dict["datas"][k]['fields']['primaryusername'] = primary
+        send_dict['count'] = count
+        return response.json(0, send_dict)

Controller/EquipmentOTA.py

@@ -61,7 +61,7 @@ class EquipmentOTA(View):
         eid = request_dict.get('eid', None)
         param_flag = CommonService.get_param_flag(data=[eid])
         if param_flag is True:
-            own_permission = ModelService.check_permission(userID=userID, permID=230)
+            own_permission = ModelService.check_perm(userID=userID, permID=230)
             if own_permission is True:
                 ev = Equipment_Version.objects.filter(eid=eid)
                 if ev.exists():
@@ -86,7 +86,7 @@ class EquipmentOTA(View):
         lang = request_dict.get('lang', None)
         if page is None or line is None:
             return response.json(444, 'page,line')
-        own_permission = ModelService.check_permission(userID=userID, permID=240)
+        own_permission = ModelService.check_perm(userID=userID, permID=240)
         if own_permission is not True:
             return response.json(404)
         if lang is None:
@@ -107,7 +107,7 @@ class EquipmentOTA(View):
         content = request_dict.get('content', None)
         if page is None or line is None or content is None:
             return response.json(444)
-        own_permission = ModelService.check_permission(userID=userID, permID=250)
+        own_permission = ModelService.check_perm(userID=userID, permID=250)
         if own_permission is not True:
             return response.json(404)
         content = json.loads(content)
@@ -126,7 +126,7 @@ class EquipmentOTA(View):
         eid = request_dict.get('eid', None)
         if eid is None:
             return response.json(444,'eid')
-        own_permission = ModelService.check_permission(userID=userID, permID=230)
+        own_permission = ModelService.check_perm(userID=userID, permID=230)
         if own_permission is not True:
             return response.json(404)
         ev = Equipment_Version.objects.filter(eid=eid)

Controller/EquipmentSensor.py

@@ -127,7 +127,7 @@ class EquipmentSensor(View):
         id_list = request_dict.getlist('id', None)
         if len(id_list)>0 and id_list is not None and did is not None:
             is_user = ModelService.check_user_own_device(userID=userID, deviceID=did)
-            is_superadmin = ModelService.check_permission(userID=userID, permID=10)
+            is_superadmin = ModelService.check_perm(userID=userID, permID=10)
             if is_user is True or is_superadmin is True:
                 try:
                     device_info = Device_Info.objects.get(id=did)
@@ -151,7 +151,7 @@ class EquipmentSensor(View):
         name = request_dict.get('name', None)
         if id is not None and status is not None:
             is_user = ModelService.check_user_own_device(userID=userID, deviceID=did)
-            is_superadmin = ModelService.check_permission(userID=userID, permID=50)
+            is_superadmin = ModelService.check_perm(userID=userID, permID=50)
             if is_user is True or is_superadmin is True:
                 try:
                     device_info = Device_Info.objects.get(id=did)
@@ -176,7 +176,7 @@ class EquipmentSensor(View):
         did = request_dict.get('did', None)
         if did is not None:
             is_user = ModelService.check_user_own_device(userID=userID, deviceID=did)
-            is_superadmin = ModelService.check_permission(userID=userID,permID=30)
+            is_superadmin = ModelService.check_perm(userID=userID,permID=30)
             if is_user is True or is_superadmin is True:
                 try:
                     device_info = Device_Info.objects.get(id=did)
@@ -199,7 +199,7 @@ class EquipmentSensor(View):
         page = int(request_dict.get('page', None))
         line = int(request_dict.get('line', None))
         if userID is not None:
-            is_own = ModelService.check_permission(userID=userID, permID=30)
+            is_own = ModelService.check_perm(userID=userID, permID=30)
             if is_own is True:
                 equipment_sensor_queryset = Equipment_Sensor.objects.all()
                 if equipment_sensor_queryset.exists():

Controller/FeedBackInfo.py

@@ -139,7 +139,7 @@ class FeedBackInfo(View):
             order ='-id'
         param_flag = CommonService.get_param_flag(data=[page, line])
         if param_flag is True:
-            check_perm = ModelService.check_permission(userID=userID,permID=30)
+            check_perm = ModelService.check_perm(userID=userID,permID=30)
             if check_perm is True:
                 if status is not None:
                     feedback_info_queryset = Feedback_Info.objects.filter(status=status).order_by(order)
@@ -164,7 +164,7 @@ class FeedBackInfo(View):
         id_list = request_dict.getlist('id', None)
         param_flag = CommonService.get_param_flag(data=[id_list])
         if param_flag is True:
-            check_perm = ModelService.check_permission(userID=userID, permID=10)
+            check_perm = ModelService.check_perm(userID=userID, permID=10)
             if check_perm is True:
                 is_delete = Feedback_Info.objects.filter(id__in=id_list).delete()
                 return response.json(0, {'delete_count': is_delete[0]})
@@ -178,7 +178,7 @@ class FeedBackInfo(View):
         status = request_dict.get('status',None)
         param_flag = CommonService.get_param_flag(data=[id, status])
         if param_flag is True:
-            check_perm = ModelService.check_permission(userID=userID, permID=50)
+            check_perm = ModelService.check_perm(userID=userID, permID=50)
             if check_perm is True:
                 try:
                     feedback_info = Feedback_Info.objects.get(id=id)

Controller/HlsManage.py

@@ -124,7 +124,7 @@ class HlsManage(View):
                     uid = request_dict.get('uid', None)
                     channel = request_dict.get('channel', None)
                     if uid is not None and channel is not None:
-                        own_permission = ModelService.check_permission(userID=userID, permID=30)
+                        own_permission = ModelService.check_perm(userID=userID, permID=30)
                         own_device = ModelService.check_own_device(userID=userID, UID=uid)
                         if own_permission is True or own_device is True:
                             device_meal_queryset = Device_Meal.objects.filter(uid=uid, channel=channel, status=1)

Controller/LogAccess.py

@@ -38,7 +38,7 @@ def LogAccess(request):
                 userID = tko.userID
                 if userID is not None:
                     if page is not None and line is not None:
-                        own_per = ModelService.check_permission(userID=userID, permID=30)
+                        own_per = ModelService.check_perm(userID=userID, permID=30)
                         if own_per is True:
                             query = {}
                             if starttime is not None and starttime != '' and endtime is not None and endtime != '':

Controller/LogManager.py

@@ -140,7 +140,7 @@ class HelpView(TemplateView):
             response.lang = tko.lang
             if tko.code == 0:
                 userID = tko.userID
-                own_permission = ModelService.check_permission(userID=userID, permID=30)
+                own_permission = ModelService.check_perm(userID=userID, permID=30)
                 if own_permission is True:
                     if reInfoType == 'version':
                         return self.readInfo(response)
@@ -197,7 +197,7 @@ def upload_help_chm(request):
         response.lang = tko.lang
         if tko.code == 0:
             userID = tko.userID
-            own_permission = ModelService.check_permission(userID=userID, permID=30)
+            own_permission = ModelService.check_perm(userID=userID, permID=30)
             if own_permission is True:
                 f = request.FILES.get('file', None)
                 path = os.path.join(BASE_DIR, 'static/Help/AnsjerHelp.CHM')

Controller/MealManage.py

@@ -81,7 +81,7 @@ class MealManage(View):
         bucketID = request_dict.get('bucketID', None)
         if not title or not id or not price or not day or not content:
             return response.json(444, 'title,id,price,content,day,bucketID')
-        own_perm = ModelService.check_permission(userID=userID, permID=40)
+        own_perm = ModelService.check_perm(userID=userID, permID=40)
         if own_perm is not True:
             return response.json(404)
         try:
@@ -133,7 +133,7 @@ class MealManage(View):
         bucketID = request_dict.get('bucketID', None)
         if not id or not title or not price or not content or not day:
             return response.json(444, 'id, title, price, content, day')
-        own_perm = ModelService.check_permission(userID=userID, permID=30)
+        own_perm = ModelService.check_perm(userID=userID, permID=30)
         if own_perm is True:
             return response.json(404)
         try:
@@ -160,7 +160,7 @@ class MealManage(View):
         id_list = request_dict.getlist('id', None)
         if not id_list:
             return response.json(444, 'id')
-        own_perm = ModelService.check_permission(userID=userID, permID=10)
+        own_perm = ModelService.check_perm(userID=userID, permID=10)
         if own_perm is not True:
             return response.json(404)
         try:
@@ -178,7 +178,7 @@ class MealManage(View):
         line = int(request_dict.get('line', None))
         if not page or not line:
             return response.json(444, 'page,line')
-        own_perm = ModelService.check_permission(userID=userID, permID=30)
+        own_perm = ModelService.check_perm(userID=userID, permID=30)
         if own_perm is not True:
             return response.json(404)
         qs = Store_Meal.objects.all()

Controller/OTAEquipment.py

@@ -28,7 +28,7 @@ def addNewEquipmentVersion(deviceContent, token, response):
         response.lang = tko.lang
         if tko.code == 0:
             userID = tko.userID
-            own_permission = ModelService.check_permission(userID=userID, permID=220)
+            own_permission = ModelService.check_perm(userID=userID, permID=220)
             if own_permission is True:
                 try:
                     print(deviceContent)
@@ -342,7 +342,7 @@ class getUploadFiletoDirView(TemplateView):
         userID = tko.userID
         if not userID:
             return response.json(104)
-        own_perm = ModelService.check_permission(userID=userID, permID=210)
+        own_perm = ModelService.check_perm(userID=userID, permID=210)
         if not own_perm:
             return response.json(404)
         if fileVersion != None and fileCode != None:
@@ -362,7 +362,7 @@ class getUploadFiletoDirView(TemplateView):
 
         if not User:
             return response.json(104)
-        own_perm = ModelService.check_permission(userID, permID=210)
+        own_perm = ModelService.check_perm(userID, permID=210)
         if own_perm is not True:
             return response.json(404)
         updataFile = fileName.name
@@ -454,7 +454,7 @@ def showAllEquipmentVersion(userID, response):
     userValid = Device_User.objects.filter(userID=userID).order_by('-data_joined')
     if not userValid.exists():
         return response.json(104)
-    own_perm = ModelService.check_permission(userID=userID, permID=240)
+    own_perm = ModelService.check_perm(userID=userID, permID=240)
     if not own_perm:
         return response.json(404)
     qs = Equipment_Version.objects.all()
@@ -533,7 +533,7 @@ class uploadOTAInterfaceView(TemplateView):
         userID = tko.userID
         if not userID:
             return response.json(104)
-        own_permission = ModelService.check_permission(userID=userID, permID=210)
+        own_permission = ModelService.check_perm(userID=userID, permID=210)
         if own_permission is not True:
             return response.json(404)
         return self.upload_ota_file(fileName, response, fileType, language)

Controller/PermissionManager.py

@@ -300,7 +300,7 @@ class queryRoleView(View):
         if 100 in eUser[0].get_role_id():
             role = Roles()
             return role.queryAllRoles(response=response)
-        own_permission = ModelService.check_permission(userID=userID, permID=30)
+        own_permission = ModelService.check_perm(userID=userID, permID=30)
         if own_permission is not True:
             return response.json(404)
         role = Roles()
@@ -386,7 +386,7 @@ class delRoleView(View):
         return self.delRole(userID, int(rid), response)
 
     def delRole(self, userID, rid, response):
-        own_permission = ModelService.check_permission(userID=userID, permID=10)
+        own_permission = ModelService.check_perm(userID=userID, permID=10)
         if own_permission is not True:
             return response.json(404)
         role = Roles()
@@ -470,7 +470,7 @@ class addNewPermsView(View):
         return self.addNewPermission(userID, request_dict, response)
 
     def addNewPermission(self, userID, request_dict, response):
-        own_perm = ModelService.check_permission(userID, 40)
+        own_perm = ModelService.check_perm(userID, 40)
         if own_perm is not True:
             return response.json(404)
         else:
@@ -567,7 +567,7 @@ class queryPermsView(View):
             return self.delPerms(userID, response)
 
     def querAllPermission(self, userID, response):
-        own_perm = ModelService.check_permission(userID, 30)
+        own_perm = ModelService.check_perm(userID, 30)
         if own_perm is not True:
             return response.json(404)
         qs = Permissions.objects.all()

Controller/StreamMedia.py

@@ -74,7 +74,7 @@ class StreamMedia(View):
             response.lang = tko.lang
             if tko.code == 0:
                 userID = tko.userID
-                own_permission = ModelService.check_permission(userID=userID, permID=60)
+                own_permission = ModelService.check_perm(userID=userID, permID=60)
                 if own_permission is not True:
                     operation = request_dict.get('operation', None)
                     if operation == 'add':
@@ -182,7 +182,7 @@ class StreamMedia(View):
         uid = request_dict.get('uid', None)
         channel = request_dict.get('channel', None)
         if uid is not None and channel is not None:
-            own_permission = ModelService.check_permission(userID=userID, permID=30)
+            own_permission = ModelService.check_perm(userID=userID, permID=30)
             own_device = ModelService.check_own_device(userID=userID, UID=uid)
             if own_permission is True or own_device is True:
                 s3 = S3ClassObject()
@@ -205,7 +205,7 @@ class StreamMedia(View):
 
     def get_admin_all_stream(self, request_dict, userID,response):
         # 判断
-        own_permission = ModelService.check_permission(userID=userID, permID=30)
+        own_permission = ModelService.check_perm(userID=userID, permID=30)
         if own_permission is True:
             page = int(request_dict.get('page', None))
             line = int(request_dict.get('line', None))
@@ -224,7 +224,7 @@ class StreamMedia(View):
 
     def get_admin_del_stream(self, request_dict, userID,response):
         # 判断
-        own_permission = ModelService.check_permission(userID=userID, permID=10)
+        own_permission = ModelService.check_perm(userID=userID, permID=10)
         if own_permission is True:
             id_list = request_dict.getlist('id', None)
 
@@ -238,7 +238,7 @@ class StreamMedia(View):
 
     def get_admin_del_video(self, request_dict, userID,response):
         # 判断
-        own_permission = ModelService.check_permission(userID=userID, permID=10)
+        own_permission = ModelService.check_perm(userID=userID, permID=10)
         if own_permission is True:
 
             key_list = request_dict.getlist('key', None)
@@ -287,7 +287,7 @@ class StreamMedia(View):
         return response.json(444)
 
     def get_admin_update_stream(self, userID, request_dict,response):
-        own_permission = ModelService.check_permission(userID=userID, permID=50)
+        own_permission = ModelService.check_perm(userID=userID, permID=50)
         if own_permission is True:
             id = request_dict.get('id', None)
             status = request_dict.get('status', None)
@@ -302,7 +302,7 @@ class StreamMedia(View):
             return response.json(404)
 
     def get_admin_vod_url(self, userID, request_dict,response):
-        own_permission = ModelService.check_permission(userID=userID, permID=30)
+        own_permission = ModelService.check_perm(userID=userID, permID=30)
         if own_permission is True:
             uid = request_dict.get('uid', None)
             channel = request_dict.get('channel', None)
@@ -317,7 +317,7 @@ class StreamMedia(View):
             return response.json(404)
 
     def get_admin_find_stream(self, userID, request_dict,response):
-        own_permission = ModelService.check_permission(userID=userID, permID=20)
+        own_permission = ModelService.check_perm(userID=userID, permID=20)
         if own_permission is True:
             content = request_dict.get('content', None)
             page = int(request_dict.get('page', None))
@@ -341,7 +341,7 @@ class StreamMedia(View):
             return response.json(404)
 
     def get_all_server_json(self, userID,response):
-        own_permission = ModelService.check_permission(userID=userID, permID=20)
+        own_permission = ModelService.check_perm(userID=userID, permID=20)
         if own_permission is True:
             url = NGINX_RTMP_STAT
             res = requests.get(url)
@@ -358,7 +358,7 @@ class StreamMedia(View):
         uid = request_dict.get('uid', None)
         flag_param = CommonService.get_param_flag(data=[channel, status, uid])
         if flag_param is True:
-            own_perm = ModelService.check_permission(userID=userID, permID=40)
+            own_perm = ModelService.check_perm(userID=userID, permID=40)
             if own_perm is True:
                 stream_queryset = Equipment_Stream.objects.filter(uid=uid, channel=channel)
                 if stream_queryset.exists():
@@ -387,7 +387,7 @@ class StreamMedia(View):
             return response.json(444)
 
     def get_admin_hls_vod(self, request_dict, userID,response):
-        own_permission = ModelService.check_permission(userID=userID, permID=30)
+        own_permission = ModelService.check_perm(userID=userID, permID=30)
         if own_permission is True:
             uid = request_dict.get('uid', None)
             channel = request_dict.get('channel', None)
@@ -464,7 +464,7 @@ def Auth_Stream(request, *callback_args,
     channel = request_dict.get('channel', None)
     param_flag = CommonService.get_param_flag(data=[access_token, userID, uid, channel])
     if param_flag is True:
-        own_permission = ModelService.check_permission(userID=userID, permID=60)
+        own_permission = ModelService.check_perm(userID=userID, permID=60)
         if own_permission is True:
             equipment_stream_queryset = Equipment_Stream.objects.filter(userID=userID, uid=uid, channel=channel,
                                                                         status=1, access_token=access_token)
@@ -493,7 +493,7 @@ def Auth_Live(request, *callback_args,
             uid = request_dict.get('uid', None)
             channel = request_dict.get('channel', None)
             if userID is not None and uid is not None and channel is not None:
-                own_permission = ModelService.check_permission(userID=userID, permID=90)
+                own_permission = ModelService.check_perm(userID=userID, permID=90)
                 if own_permission is True:
                     equipment_stream_queryset = Equipment_Stream.objects.filter(userID=userID, uid=uid, channel=channel,
                                                                                 status=1)

Controller/SysManage.py

@@ -38,7 +38,7 @@ def updateLog(request):
     if tko.code != 0:
         return response.json(tko.code)
     userID = tko.userID
-    own_permission = ModelService.check_permission(userID=userID, permID=50)
+    own_permission = ModelService.check_perm(userID=userID, permID=50)
     if own_permission is not True:
         return response.json(404)
     file_path = os.path.join(BASE_DIR, 'static/Help/version.txt')

Controller/UserManger.py

@@ -215,7 +215,7 @@ def delUserInterface(request):
     userValid = Device_User.objects.filter(userID=userID)
     if not userValid.exists():
         return response.json(104)
-    own_perm = ModelService.check_permission(userID=userID, permID=10)
+    own_perm = ModelService.check_perm(userID=userID, permID=10)
     if own_perm is not True:
         return response.json(404)
     delUser = Device_User.objects.filter(userID=delUserID)
@@ -248,7 +248,7 @@ def showAllUserInterface(request):
         if not userValid:
             return response.json(104)
         # 管理员查询
-        own_permission = ModelService.check_permission(userID=userID, permID=30)
+        own_permission = ModelService.check_perm(userID=userID, permID=30)
         if own_permission is not True:
             return response.json(404)
         device_user_queryset = Device_User.objects.all()
@@ -269,7 +269,7 @@ def showAllUserInterface(request):
         sqlDict['count'] = device_user_count
         return response.json(0, sqlDict)
     else:
-        own_permission = ModelService.check_permission(userID=userID, permID=30)
+        own_permission = ModelService.check_perm(userID=userID, permID=30)
         if own_permission is not True:
             return response.json(404)
         qs = Device_User.objects.all().order_by('-data_joined')
@@ -303,7 +303,7 @@ class setUserValidView(View):
         if tko.code != 0:
             return response.json(tko.code)
         superID = tko.userID
-        own_perm = ModelService.check_permission(userID=superID, permID=50)
+        own_perm = ModelService.check_perm(userID=superID, permID=50)
         if own_perm is True or superID != None and superID != eUserID:
             if rid == None:
                 return self.UserValidUpdate(superID, eUserID, isValid, response)
@@ -317,7 +317,7 @@ class setUserValidView(View):
         eUser = Device_User.objects.filter(userID=eUserID)
         if not super.exists() or not eUser.exists():
             return response.json(104)
-        own_permission = ModelService.check_permission(userID=superID, permID=50)
+        own_permission = ModelService.check_perm(userID=superID, permID=50)
         if own_permission is True:
             try:
                 eUser.update(user_isValid=isValid)

Controller/VodBucket.py

@@ -52,7 +52,7 @@ class VodBucketView(View):
         if tko.code != 0:
             return response.json(tko.code)
         userID = tko.userID
-        own_perm = ModelService.check_permission(userID, 50)
+        own_perm = ModelService.check_perm(userID, 50)
         if not own_perm:
             return response.json(404)
         if operation == 'add':
@@ -129,7 +129,7 @@ class UidBucketView(View):
         if tko.code != 0:
             return response.json(tko.code)
         userID = tko.userID
-        own_perm = ModelService.check_permission(userID, 50)
+        own_perm = ModelService.check_perm(userID, 50)
         if not own_perm:
             return response.json(404)
         if operation == 'add':

Model/models.py

@@ -81,16 +81,6 @@ class Permissions(models.Model):
 
 
 class Role(models.Model):
-    # ROLE_TYPES = (
-    #     ('Guests', u'Guests'),
-    #     ('Users', u'Users'),
-    #     ('Admins', u'Admins'),
-    #     ('SysAdmins', u'SysAdmins'),
-    #     ('LOGAdmins', u'LOGAdmins'),
-    #     ('OTAAdmins', u'OTAAdmins'),
-    #     ('DBAAdmins', u'DBAAdmins'),
-    #     ('SuperAdmins', u'SuperAdmins'),
-    # )
     rid = models.SmallIntegerField(primary_key=True, unique=True, verbose_name=u'用户角色组ID')
     roleName = models.CharField(max_length=32,unique=True,
                                 default='User', verbose_name=u'角色名称')
@@ -200,11 +190,11 @@ class Device_User(AbstractBaseUser):
     def __str__(self):
         return self.username
 
-    def get_full_name(self):
-        return self.userEmail
-
-    def get_short_name(self):
-        return self.username
+    # def get_full_name(self):
+    #     return self.userEmail
+    #
+    # def get_short_name(self):
+    #     return self.username
 
     def get_role_id(self):
         rids = []

Service/ModelService.py

@@ -30,7 +30,7 @@ class ModelService:
 
     # 检测权限有无
     @staticmethod
-    def check_permission(userID, permID):
+    def check_perm(userID, permID):
         try:
             perm_list = Device_User.objects.get(userID=userID).role.values_list('permission', flat=True)
             if perm_list: