Browse Source

修改了设备的编辑接口,过滤掉修改为重复的设备UID

pzb 6 years ago
parent
commit
b4531b2e2d
1 changed files with 44 additions and 15 deletions
  1. 44 15
      Controller/EquipmentManager.py

+ 44 - 15
Controller/EquipmentManager.py

@@ -453,25 +453,54 @@ def admin_modifyInterface(request):
     if userID is None:
     if userID is None:
         return response.json(309)
         return response.json(309)
     own_perm = ModelService.check_perm(userID, 50)
     own_perm = ModelService.check_perm(userID, 50)
+
     # 权限判断
     # 权限判断
     if own_perm is not True:
     if own_perm is not True:
         return response.json(404)
         return response.json(404)
-    # 查询id
-    user = Device_User.objects.filter(Q(username=username) | Q(phone=username) | Q(userEmail=username))
-    if user.exists():
-        user_dict = CommonService.qs_to_dict(user)
-        userID = user_dict.get('datas')[0].get('pk')
-    try:
-        deviceData = json.loads(deviceContent)
-        # 更改的时间
-        update_time = timezone.localtime(timezone.now())
-        Device_Info.objects.filter(userID_id=userID, id=id).update(update_time=update_time,**deviceData)
-    except Exception as e:
-        return response.json(177, repr(e))
+
+    deviceData = json.loads(deviceContent)
+    print (deviceData['UID'])
+    dValid = Device_Info.objects.filter(userID_id=userID, UID=deviceData['UID'])
+    if dValid.exists():
+        dValid_dict = CommonService.qs_to_dict(dValid)
+        print (dValid_dict.get('datas')[0].get('pk'))
+        if dValid_dict.get('datas')[0].get('pk') == id :
+            print ('可以编辑')
+        else:
+            return response.json(174)
+        # 查询id
+        user = Device_User.objects.filter(Q(username=username) | Q(phone=username) | Q(userEmail=username))
+        if user.exists():
+            user_dict = CommonService.qs_to_dict(user)
+            userID = user_dict.get('datas')[0].get('pk')
+        try:
+
+            # 更改的时间
+            update_time = timezone.localtime(timezone.now())
+            Device_Info.objects.filter(userID_id=userID, id=id).update(update_time=update_time,**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:
     else:
-        qs = Device_Info.objects.filter(userID_id=userID, id=id)
-        res = CommonService.qs_to_dict(qs)
-        return response.json(0, res)
+        # 查询id
+        user = Device_User.objects.filter(Q(username=username) | Q(phone=username) | Q(userEmail=username))
+        if user.exists():
+            user_dict = CommonService.qs_to_dict(user)
+            userID = user_dict.get('datas')[0].get('pk')
+        try:
+
+            # 更改的时间
+            update_time = timezone.localtime(timezone.now())
+            Device_Info.objects.filter(userID_id=userID, id=id).update(update_time=update_time, **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)
 
 
 # 新删除设备
 # 新删除设备
 def deleteInterface(request):
 def deleteInterface(request):