修改PC获取数据

Controller/PctestController.py

@@ -150,17 +150,30 @@ class PcTest(View):
 
     def deviceadd(self, request_dict, userID, response):
         devicename = request_dict.get('devicename', None)
+        functions= request_dict.get('functions', None)
         param_flag = CommonService.get_param_flag(
             data=[devicename])
         if param_flag is not True:
             return response.json(444)
-        job_qs = PctestdeviceModel.objects.filter(devicename=devicename)
-        if job_qs.exists():
+        device_qs = PctestdeviceModel.objects.filter(devicename=devicename)
+        if device_qs.exists():
+            return response.json(174)
+
+        PctestdeviceModel.objects.create(devicename=devicename)
+
+        function_list = PctestfunctionModel.objects.filter(id__in=functions.split(','))
+
+        # 判断设备与此职能是否有关联，避免重复添加
+        device_function_list = PctestModel.objects.filter(device_id=device_qs[0].id, function__in=function_list)
+        if device_function_list.exists():
             return response.json(174)
         else:
-            PctestdeviceModel.objects.create(devicename=devicename)
+            for fun in function_list:
+                PctestModel.objects.create(device_id=device_qs[0].id, function_id=fun.id)
             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'])
@@ -291,7 +304,7 @@ class PcTest(View):
             return response.json(0)
 
     def staffquery(self, request_dict, userID, response):
-        user_list = PctestuserModel.objects.filter(id__gt=1).values('id', 'username', 'job__jobname')
+        user_list = PctestuserModel.objects.filter(id__gt=1).values('id', 'username', 'job__jobname', 'job__jobcode')
         users_list = []
         for i in user_list:
             users_list.append(i)