|
@@ -4,6 +4,8 @@ from django.views.generic import View
|
|
|
# from . import models
|
|
|
from .models import User, Menu
|
|
|
from django.core.serializers import serialize
|
|
|
+from rest_framework.views import APIView
|
|
|
+from api.serializers import *
|
|
|
import json
|
|
|
|
|
|
# Create your views here.
|
|
@@ -159,23 +161,32 @@ class getUserList(View):
|
|
|
return JsonResponse({'code': 1, 'type': 'error', 'message': 'no role,create role'}, json_dumps_params={"ensure_ascii": False})
|
|
|
|
|
|
|
|
|
-class addUser(View):
|
|
|
+class addUser(APIView):
|
|
|
+ serialize_class = UserSerializer
|
|
|
+
|
|
|
def post(self, request):
|
|
|
- data = json.loads(request.body)
|
|
|
- menuIdList = data.pop('menus')
|
|
|
- menus = Menu.objects.all().filter(id__in=menuIdList)
|
|
|
- # print(menus)
|
|
|
- # data.menus = menus
|
|
|
- print(data)
|
|
|
- print('--------------data------------')
|
|
|
- if User.objects.all().filter(username=data.get('username')):
|
|
|
- return JsonResponse({'code': 1, 'type': 'error', 'message': '该角色名已被占用'}, json_dumps_params={"ensure_ascii": False})
|
|
|
- else:
|
|
|
+ res = json.loads(request.body)
|
|
|
+ userSer = UserSerializer(data=res)
|
|
|
+ if userSer.is_valid():
|
|
|
+ res = json.loads(request.body)
|
|
|
+ menuIdList = res.pop('menus')
|
|
|
+ menus = Menu.objects.all().filter(id__in=menuIdList)
|
|
|
data['token'] = data.get('username') + 'token'
|
|
|
userObj = User.objects.create(**data)
|
|
|
userObj.menus.set(menus)
|
|
|
-
|
|
|
return JsonResponse({'code': 0, 'result': {'data': '角色创建成功'}}, json_dumps_params={"ensure_ascii": False})
|
|
|
+ else:
|
|
|
+ print(userSer.errors)
|
|
|
+ return JsonResponse({'code': 1, 'type': 'error', 'message': '字段校验未通过', "result": userSer.errors}, json_dumps_params={"ensure_ascii": False})
|
|
|
+
|
|
|
+ # if User.objects.all().filter(username=data.get('username')):
|
|
|
+ # return JsonResponse({'code': 1, 'type': 'error', 'message': '该角色名已被占用'}, json_dumps_params={"ensure_ascii": False})
|
|
|
+ # else:
|
|
|
+ # data['token'] = data.get('username') + 'token'
|
|
|
+ # userObj = User.objects.create(**data)
|
|
|
+ # userObj.menus.set(menus)
|
|
|
+
|
|
|
+ # return JsonResponse({'code': 0, 'result': {'data': '角色创建成功'}}, json_dumps_params={"ensure_ascii": False})
|
|
|
|
|
|
|
|
|
class editUser(View):
|