Merge branch 'pzb' of ssh://192.168.136.45:10022/SERVER/AnsjerServer into test

Ansjer/urls.py

@@ -38,6 +38,8 @@ urlpatterns = [
     url(r'^equipment/delete', EquipmentManager.deleteInterface),
     url(r'^equipment/add', EquipmentManager.addInterface),
     url(r'^equipment/admin_add', EquipmentManager.admin_addInterface),
+    url(r'^equipment/admin_modify', EquipmentManager.admin_modifyInterface),
+
 
     url(r'^equipment/query', EquipmentManager.queryInterface),
 

Controller/EquipmentManager.py

@@ -422,6 +422,53 @@ def admin_addInterface(request):
     else:
         sqlDict = CommonService.qs_to_dict([userDevice])
         return response.json(0, sqlDict)
+
+# 超级管理员修改设备
+def admin_modifyInterface(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(444)
+    token = request_dict.get('token', None)
+    deviceContent = request_dict.get('content', None)
+    username = request_dict.get('username', None)
+    if not username:
+        return response.json(444, 'username')
+    id = request_dict.get('id', None)
+    print (deviceContent)
+    if not deviceContent or not id:
+        return response.json(444, 'content,id')
+    tko = TokenObject(token)
+    response.lang = tko.lang
+    if tko.code != 0:
+        return response.json(tko.code)
+    userID = tko.userID
+    if userID is None:
+        return response.json(309)
+    own_perm = ModelService.check_perm(userID, 50)
+    # 权限判断
+    if own_perm is not True:
+        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)
+        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)
+
 # 新删除设备
 def deleteInterface(request):
     '''