checkperm

Controller/AccessLog.py

@@ -67,7 +67,7 @@ class AccessLog(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:
                 access_log_queryset = Access_Log.objects.all().order_by(order)
                 if access_log_queryset.exists():
@@ -84,7 +84,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()
@@ -100,7 +100,7 @@ class AccessLog(View):
         starttime = request_dict.get('starttime', None)
         endtime = request_dict.get('endtime', None)
         if page is not None and line is not None:
-            check_perm = ModelService.check_permission(userID=userID, permID=20)
+            check_perm = ModelService.check_perm(userID=userID, permID=20)
             if check_perm is True:
                 try:
                     content = json.loads(content)
@@ -160,7 +160,7 @@ def statisticsPath(request):
         response.lang = tko.lang
         if tko.code == 0:
             userID = tko.userID
-            own_perm = ModelService.check_permission(userID, 10)
+            own_perm = ModelService.check_perm(userID, 10)
             if own_perm is True:
                 paths = TemplateService.log_api()
                 datas = {}
@@ -192,7 +192,7 @@ def deleteSn(request):
         response.lang = tko.lang
         if tko.code == 0:
             userID = tko.userID
-            own_perm = ModelService.check_permission(userID, 10)
+            own_perm = ModelService.check_perm(userID, 10)
             if own_perm is True:
                 dltime = datetime.datetime.now()-datetime.timedelta(days=int(days))
                 # count = Access_Log.objects.filter(time__gte=dltime).count()

Controller/AdminManage.py

@@ -65,7 +65,7 @@ class AdminManage(TemplateView):
 
 
     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)
@@ -85,7 +85,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 True:
             username_list = Device_User.objects.all().values_list('username', flat=True)
             if username_list:
@@ -97,7 +97,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 True:
             allonline = Device_User.objects.all().values('online')
             # 两个变量，分别是在线，离线
@@ -116,7 +116,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')
             # 两个变量，分别是在线，离线
@@ -143,7 +143,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):
     http://192.168.136.45:8077/adminManage/manage?token=test&operation=getStatisAccess&timestamp=1528773308
     '''
     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 True:
             time_stamp = int(request_dict.get('timestamp', None))
             times = datetime.datetime.fromtimestamp(time_stamp)
@@ -188,7 +188,7 @@ class AdminManage(TemplateView):
             return response.json(404)
 
     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 True:
             uid_list = Device_Info.objects.all().values_list('UID', flat=True)
             if uid_list:
@@ -206,7 +206,7 @@ def getUserIds(request):
         response.lang = tko.lang
         if tko.code == 0:
             userID = tko.userID
-            own_perm = ModelService.check_permission(userID,30)
+            own_perm = ModelService.check_perm(userID,30)
             if own_perm is True:
                 # userID_list = Device_User.objects.all().values_list('userID', flat=True)
                 dn = Device_User.objects.all().values('userID', 'username')
@@ -242,9 +242,9 @@ def search_user_by_content(request):
         response.lang = tko.lang
         if tko.code == 0:
             userID = tko.userID
-            own_perm = ModelService.check_permission(userID,30)
+            own_perm = ModelService.check_perm(userID,30)
             if own_perm is True:
-                check_perm = ModelService.check_permission(userID=userID, permID=20)
+                check_perm = ModelService.check_perm(userID=userID, permID=20)
                 if check_perm is True:
                     try:
                         content = json.loads(content)

Controller/AppInfo.py

@@ -83,7 +83,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 True:
             appBundleId = request_dict.get('appBundleId', None)
             appName = request_dict.get('appName', None)
@@ -144,7 +144,7 @@ class AppInfo(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))
@@ -163,7 +163,7 @@ class AppInfo(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 own_perm is True:
             id = request_dict.get('id', None)
             appBundleId = request_dict.get('appBundleId', None)
@@ -201,7 +201,7 @@ class AppInfo(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_list = request_dict.getlist('id', None)
             if id_list :

Controller/DeviceLog.py

@@ -72,7 +72,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

@@ -70,7 +70,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))
@@ -102,7 +102,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:
@@ -114,7 +114,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

@@ -79,7 +79,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)
@@ -127,7 +127,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))
@@ -152,7 +152,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)
@@ -174,7 +174,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

@@ -196,7 +196,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)
@@ -215,7 +215,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

@@ -136,7 +136,7 @@ def showAllUserEquipment(userID, response):
 
     else:
         if userValid.exists():
-            # own_permission = ModelService.check_permission(userID=userID,permID=30)
+            # own_permission = ModelService.check_perm(userID=userID,permID=30)
             if userValid[0].is_superuser != 100 and userValid[0].is_superuser != 1:
                 return response.json(612)
             else:
@@ -156,7 +156,7 @@ def showAllUserEquipmentPC(userID, fieldDict, response):
         return response.json(500, repr(e))
     else:
         if user_valid:
-            own_permission = ModelService.check_permission(userID=userID, permID=30)
+            own_permission = ModelService.check_perm(userID=userID, permID=30)
             if own_permission:
                 page = int(fieldDict['page'])
                 line = int(fieldDict['line'])

Controller/EquipmentOTA.py

@@ -62,7 +62,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():
@@ -87,7 +87,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:
@@ -108,7 +108,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)
@@ -127,7 +127,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

@@ -128,7 +128,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)
@@ -152,7 +152,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)
@@ -177,7 +177,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)
@@ -200,7 +200,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

@@ -140,7 +140,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)
@@ -165,7 +165,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]})
@@ -179,7 +179,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

@@ -125,7 +125,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

@@ -39,7 +39,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

@@ -141,7 +141,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)
@@ -199,7 +199,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

@@ -71,7 +71,7 @@ class MealManage(View):
             return response.json(444, '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 not True:
             return response.json(404)
         title = request_dict.get('title', None)
@@ -121,7 +121,7 @@ class MealManage(View):
         return response.json(0, res)
 
     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 True:
             id = request_dict.get('id', None)
             title = request_dict.get('title', None)
@@ -158,7 +158,7 @@ class MealManage(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_list = request_dict.getlist('id', None)
             param_flag = CommonService.get_param_flag(data=[id_list])
@@ -178,7 +178,7 @@ class MealManage(View):
             return response.json(404)
 
     def find(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/OTAEquipment.py

@@ -29,7 +29,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)
@@ -222,35 +222,32 @@ def getUpdataFileUrlInterface(request):
     else:
         return response.json(801)
     code = request_dict.get('code', None)
-    # http_host = request.META.get('HTTP_HOST', None)
-    if code:
-        equipmentValid = Equipment_Version.objects.filter(code=code, status=1,lang='en').order_by('-data_joined')
-        # 判断是否有版本存在
-        if equipmentValid.exists():
-            equipment = equipmentValid[0]
-            file_path = equipment.filePath
-            urls = []
-            if file_path:
-                if file_path.find('static/Upgrade/') != -1:
-                    path = file_path.replace('static/Upgrade/', '').replace('\\', '/')
-                    url = SERVER_DOMAIN + 'OTA/downloads/' + path + '?time=' + str(time.time())
-                    urls.append(url)
-                if file_path.find('static/otapack') != -1:
-                    url = SERVER_DOMAIN + 'OTA/downloadsPack/' + file_path + '?time=' + str(time.time())
-                    urls.append(url)
-            if len(urls) > 0:
-                return response.json(0, {
-                    "urlCount": len(urls),
-                    "url": urls,
-                    "fileSize": equipment.fileSize,
-                    "Description": equipment.Description,
-                })
-            else:
-                return response.json(901)
-        else:
-            return response.json(902)
-    else:
+    if not code:
         return response.json(800)
+    equipmentValid = Equipment_Version.objects.filter(code=code, status=1, lang='en').order_by('-data_joined')
+    # 判断是否有版本存在
+    if not equipmentValid.exists():
+        return response.json(902)
+    equipment = equipmentValid[0]
+    file_path = equipment.filePath
+    urls = []
+    if file_path:
+        if file_path.find('static/Upgrade/') != -1:
+            path = file_path.replace('static/Upgrade/', '').replace('\\', '/')
+            url = SERVER_DOMAIN + 'OTA/downloads/' + path + '?time=' + str(time.time())
+            urls.append(url)
+        if file_path.find('static/otapack') != -1:
+            url = SERVER_DOMAIN + 'OTA/downloadsPack/' + file_path + '?time=' + str(time.time())
+            urls.append(url)
+    if len(urls) > 0:
+        return response.json(0, {
+            "urlCount": len(urls),
+            "url": urls,
+            "fileSize": equipment.fileSize,
+            "Description": equipment.Description,
+        })
+    else:
+        return response.json(901)
 
 
 @csrf_exempt
@@ -343,22 +340,18 @@ class getUploadFiletoDirView(TemplateView):
             tko = TokenObject(token)
             tko.valid()
             response.lang = tko.lang
-            if tko.code == 0:
-                userID = tko.userID
-                if userID is not None:
-                    own_permission = ModelService.check_permission(userID=userID, permID=210)
-                    if own_permission is True:
-                        if fileVersion != None and fileCode != None:
-                            return self.getUploadFiletoDir(userID, fileType, fileName, response, fileCode,
-                                                           fileVersion=fileVersion)
-                        else:
-                            return self.getUploadFiletoDir(userID, fileType, fileName, response)
-                    else:
-                        return response.json(404)
+            if tko.code != 0:
+                return response.json(tko.code)
+            userID = tko.userID
+            own_perm = ModelService.check_perm(userID=userID, permID=210)
+            if own_perm is True:
+                if fileVersion != None and fileCode != None:
+                    return self.getUploadFiletoDir(userID, fileType, fileName, response, fileCode,
+                                                   fileVersion=fileVersion)
                 else:
-                    return response.json(309)
+                    return self.getUploadFiletoDir(userID, fileType, fileName, response)
             else:
-                return response.json(tko.code)
+                return response.json(404)
         else:
             return response.json(800)
 
@@ -369,44 +362,35 @@ class getUploadFiletoDirView(TemplateView):
         :param fileName: File name of upgrade file.
         :return: filePath
         """
-        try:
-            User = Device_User.objects.filter(userID=userID)
-        except Exception as e:
-            errorInfo = traceback.format_exc()
-            print('查询数据库错误: %s' % errorInfo)
-            return response.json(500, {'details': repr(e)})
-        else:
-            if not User:
-                return response.json(113)
-            own_perm = ModelService.check_permission(userID, permID=210)
-            if own_perm is not True:
-                return response.json(605)
-            updataFile = fileName.name
-            updataFile = updataFile.replace(' ', '+')
-            versionIndex = updataFile.find('.', updataFile.find('.', updataFile.find('.') + 1) + 1)
-            codeIndex = versionIndex + 12
-
-            if codeIndex != -1 and versionIndex != -1:
-                fileVersion = len(updataFile[1: versionIndex]) > 0 and updataFile[1: versionIndex] or None
-                fileCode = len(updataFile[versionIndex + 1: codeIndex]) > 0 and \
-                           updataFile[versionIndex + 1: codeIndex] or None
-                if fileCode is not None and fileVersion is not None:
-                    return self.getDir(fileType, fileName, fileCode, fileVersion, response)
-                else:
-                    fileCode = kwargs.get('fileCode', None)
-                    fileVersion = kwargs.get('fileVersion', None)
-                    print(fileCode, fileVersion)
-                    if fileCode != None and fileVersion != None:
-                        return self.getDir(fileType, fileName, fileCode, fileVersion)
-                    else:
-                        return response.json(903)
+        own_perm = ModelService.check_perm(userID, permID=210)
+        if own_perm is not True:
+            return response.json(605)
+        updataFile = fileName.name
+        updataFile = updataFile.replace(' ', '+')
+        versionIndex = updataFile.find('.', updataFile.find('.', updataFile.find('.') + 1) + 1)
+        codeIndex = versionIndex + 12
+
+        if codeIndex != -1 and versionIndex != -1:
+            fileVersion = len(updataFile[1: versionIndex]) > 0 and updataFile[1: versionIndex] or None
+            fileCode = len(updataFile[versionIndex + 1: codeIndex]) > 0 and \
+                       updataFile[versionIndex + 1: codeIndex] or None
+            if fileCode is not None and fileVersion is not None:
+                return self.getDir(fileType, fileName, fileCode, fileVersion, response)
             else:
                 fileCode = kwargs.get('fileCode', None)
                 fileVersion = kwargs.get('fileVersion', None)
+                print(fileCode, fileVersion)
                 if fileCode != None and fileVersion != None:
-                    return self.getDir(fileType, fileName, fileCode, fileVersion, response)
+                    return self.getDir(fileType, fileName, fileCode, fileVersion)
                 else:
                     return response.json(903)
+        else:
+            fileCode = kwargs.get('fileCode', None)
+            fileVersion = kwargs.get('fileVersion', None)
+            if fileCode != None and fileVersion != None:
+                return self.getDir(fileType, fileName, fileCode, fileVersion, response)
+            else:
+                return response.json(903)
 
     def getDir(self, fileType, fileName, fileCode, fileVersion, response):
         try:
@@ -474,7 +458,7 @@ def showAllEquipmentVersion(userID, response):
         return response.json(500)
     else:
         if userValid:
-            own_permission = ModelService.check_permission(userID=userID, permID=240)
+            own_permission = ModelService.check_perm(userID=userID, permID=240)
             if own_permission:
                 sqlJSON = serializers.serialize('json', Equipment_Version.objects.all())  # .order_by('-data_joined'))
                 sqlList = json.loads(sqlJSON)
@@ -582,7 +566,7 @@ class uploadOTAInterfaceView(TemplateView):
             if tko.code == 0:
                 userID = tko.userID
                 if userID is not None:
-                    own_permission = ModelService.check_permission(userID=userID, permID=210)
+                    own_permission = ModelService.check_perm(userID=userID, permID=210)
                     if own_permission is True:
                         return self.upload_ota_file(fileName, response, fileType, language)
                     else:

Controller/PermissionManager.py

@@ -307,7 +307,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 True:
             role = Roles()
             return role.queryAllRoles(response=response)
@@ -412,7 +412,7 @@ class delRoleView(View):
             return response.json(444,'token,rid')
 
     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 True:
             role = Roles()
             return role.delRoles(rid=rid,response=response)
@@ -517,7 +517,7 @@ class addNewPermsView(View):
     def addNewPermission(self, userID, request_dict,response):
         user_valid = Device_User.objects.filter(userID=userID).order_by('-data_joined')
         if user_valid:# 判断是否为超级管理员
-            own_perm = ModelService.check_permission(userID,40)
+            own_perm = ModelService.check_perm(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(612)
@@ -628,7 +628,7 @@ class queryPermsView(View):
             return response.json(800)
 
     def querAllPermission(self, userID,response):
-        own_perm = ModelService.check_permission(userID,30)
+        own_perm = ModelService.check_perm(userID,30)
         if own_perm is True:
             qs = Permissions.objects.all()
             res = CommonService.qs_to_dict(qs)

Controller/StreamMedia.py

@@ -75,7 +75,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':
@@ -183,7 +183,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()
@@ -206,7 +206,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))
@@ -225,7 +225,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)
 
@@ -239,7 +239,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)
@@ -288,7 +288,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)
@@ -303,7 +303,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)
@@ -318,7 +318,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))
@@ -342,7 +342,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)
@@ -359,7 +359,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():
@@ -388,7 +388,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)
@@ -465,7 +465,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)
@@ -495,7 +495,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):
         response.lang = tko.lang
         if tko.code == 0:
             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 True:
                 file_path = os.path.join(BASE_DIR,'static/Help/version.txt')
                 try:

Controller/UserManger.py

@@ -243,7 +243,7 @@ def delUserInterface(request):
                     return response.json(500, repr(e))
                 else:
                     if userValid:
-                        own_perm = ModelService.check_permission(userID=userID, permID=10)
+                        own_perm = ModelService.check_perm(userID=userID, permID=10)
                         if userValid[0].is_superuser == 100 or own_perm is True:
                             try:
                                 delUser = Device_User.objects.filter(userID=delUserID)
@@ -285,7 +285,7 @@ def showAllUserPC(userID, line, page, response):
     else:
         if userValid:
             # 管理员查询
-            own_permission = ModelService.check_permission(userID=userID, permID=30)
+            own_permission = ModelService.check_perm(userID=userID, permID=30)
             if own_permission is True:
                 device_user_queryset = Device_User.objects.all()
                 device_user_count = device_user_queryset.count()
@@ -319,7 +319,7 @@ def showAllUser(userID, response):
         return response.json(500, repr(e))
     else:
         if userValid:
-            own_permission = ModelService.check_permission(userID=userID, permID=30)
+            own_permission = ModelService.check_perm(userID=userID, permID=30)
             if own_permission is True:
                 sqlJSON = serializers.serialize('json', Device_User.objects.all().order_by('-data_joined'))
                 sqlList = json.loads(sqlJSON)
@@ -394,7 +394,7 @@ class setUserValidView(View):
             response.lang = tko.lang
             if tko.code == 0:
                 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)
@@ -414,7 +414,7 @@ class setUserValidView(View):
             return response.json(615)
         if not eUser.exists():
             return response.json(616)
-        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':

Service/ModelService.py

@@ -44,7 +44,7 @@ class ModelService:
 
     # 检测权限有无
     @staticmethod
-    def check_permission(userID, permID):
+    def check_perm(userID, permID):
         try:
             device_user_query_set = Device_User.objects.get(userID=userID)
             if device_user_query_set: