修改PC权限

修改PC上传S3接口

Controller/PcInfo.py

@@ -215,6 +215,7 @@ class PcInfo(View):
         explain = request_dict.get('explain', '')
         is_update = request_dict.get('is_update', None)
         is_open = request_dict.get('is_open', None)
+        filetype  =  request_dict.get('filetype', None)
         # logger.info('文件名字：')
         # logger.info(file_name)
         param_flag = CommonService.get_param_flag(
@@ -239,6 +240,12 @@ class PcInfo(View):
                 download_link = '{pc_name}/{pc_version}_{bundle_version}_{pc_test}_{file_name}'.format(
                     pc_name=pc_name, pc_version=pc_version, bundle_version=bundle_version,
                     pc_test=pc_test, file_name=file_name)
+
+                if filetype:
+                    download_link = '{pc_name}/{filetype}/{pc_version}_{bundle_version}_{pc_test}_{file_name}'.format(
+                        pc_name=pc_name, filetype=filetype, pc_version=pc_version, bundle_version=bundle_version,
+                        pc_test=pc_test, file_name=file_name)
+
                 response_url = aws_s3_guonei.generate_presigned_url(
                     ClientMethod='put_object',
                     Params={

Controller/PctestController.py

@@ -131,12 +131,12 @@ class PcTest(View):
             return response.json(0)
 
     def jobquery(self, request_dict, userID, response):
-        user_qs = PctestuserModel.objects.filter(id=userID).values('job')
-        job_qs = PctestjobModel.objects.filter(id=user_qs[0]['job'])
-
-        if job_qs[0].id == 1:
-            job_qs = PctestjobModel.objects.filter()
-
+        # user_qs = PctestuserModel.objects.filter(id=userID).values('job')
+        # job_qs = PctestjobModel.objects.filter(id=user_qs[0]['job'])
+        #
+        # if job_qs[0].id == 1:
+        #     job_qs = PctestjobModel.objects.filter()
+        job_qs = PctestjobModel.objects.filter()
         device_qs = PctestjobdeviceModel.objects.filter(job__in=job_qs).values('device')
 
         data = CommonService.qs_to_list(job_qs.values('id', 'jobname', 'jobcode'))
@@ -162,13 +162,14 @@ class PcTest(View):
             return response.json(0)
 
     def devicequery(self, request_dict, userID, response):
-        user_qs = PctestuserModel.objects.filter(id=userID).values('job')
-        job_qs = PctestjobModel.objects.filter(id=user_qs[0]['job'])
-
-        if job_qs[0].id == 1:
-            device_qs = PctestjobdeviceModel.objects.filter().values('device')
-        else:
-            device_qs = PctestjobdeviceModel.objects.filter(job__in=job_qs).values('device')
+        # user_qs = PctestuserModel.objects.filter(id=userID).values('job')
+        # job_qs = PctestjobModel.objects.filter(id=user_qs[0]['job'])
+        #
+        # if job_qs[0].id == 1:
+        #     device_qs = PctestjobdeviceModel.objects.filter().values('device')
+        # else:
+        #     device_qs = PctestjobdeviceModel.objects.filter(job__in=job_qs).values('device')
+        device_qs = PctestjobdeviceModel.objects.filter().values('device')
 
         function_qs = PctestModel.objects.filter(device__in=device_qs)
 
@@ -336,25 +337,25 @@ class PcTest(View):
             job_qs = PctestjobModel.objects.filter(id=user_qs[0]['job'])
             user_qs = user_qs.values('id', 'username')
 
-            device_qs = PctestjobdeviceModel.objects.filter(job__in=job_qs).values('device')
-
-            function_qs = PctestModel.objects.filter(device__in=device_qs)
+            # device_qs = PctestjobdeviceModel.objects.filter(job__in=job_qs).values('device')
+            #
+            # function_qs = PctestModel.objects.filter(device__in=device_qs)
 
 
             data = user_qs[0]
             data['jobs'] = CommonService.qs_to_list(job_qs.values('id', 'jobname', 'jobcode'))
 
-            i = 0
-            for jobs in data['jobs']:
-
-                data['jobs'][i]['devices'] = CommonService.qs_to_list(device_qs.filter(job__id=jobs['id']).values('device__id', 'device__devicename'))
-
-                j = 0
-                for devices in jobs['devices']:
-                    data['jobs'][i]['devices'][j]['functions'] = CommonService.qs_to_list(function_qs.filter(device__id=devices['device__id']).values('function__id','function__functionname','function__functioncode'))
-                    j = j+1
-
-                i = i+1
+            # i = 0
+            # for jobs in data['jobs']:
+            #
+            #     data['jobs'][i]['devices'] = CommonService.qs_to_list(device_qs.filter(job__id=jobs['id']).values('device__id', 'device__devicename'))
+            #
+            #     j = 0
+            #     for devices in jobs['devices']:
+            #         data['jobs'][i]['devices'][j]['functions'] = CommonService.qs_to_list(function_qs.filter(device__id=devices['device__id']).values('function__id','function__functionname','function__functioncode'))
+            #         j = j+1
+            #
+            #     i = i+1
 
 
             fullinfo.append(data)