使用flask-restful实现数据校验与序列化3

applications/view/company/users/user_view.py

@@ -1,39 +1,51 @@
 from flask import render_template, request, make_response
-from flask_restful import Resource
+from flask_restful import Resource, reqparse
 from applications.extensions import db
 
 from applications.common.utils.http import fail_api, success_api
 from applications.common.utils.rights import authorize
 from applications.models import User, Role
-from applications.view.company.users import user_api, users_bp, user_curd
+from applications.view.company.users import user_api, users_bp, _utils
 
 
-@user_api.resource('/')
+@user_api.resource('/add')
 class Users(Resource):
     """用户列表数据操作"""
 
-    @authorize("admin:user:main", log=True)
+    @authorize("admin:user:add", log=True)
     def get(self):
-        return make_response(render_template('admin/user/main.html'))
+        roles = Role.query.all()
+        return make_response(render_template('admin/user/add.html', roles=roles))
 
     @authorize("admin:user:add", log=True)
     def post(self):
         """新建单个用户"""
-        req_json = request.json
-        a = req_json.get("roleIds")
-        username = req_json.get('username')
-        real_name = req_json.get('realName')
-        password = req_json.get('password')
-        role_ids = a.split(',')
+        parser = reqparse.RequestParser()
+        parser.add_argument("roleIds", type=str, dest='role_ids')
+        parser.add_argument("username", type=str, required=True, help="用户名不能为空")
+        parser.add_argument("realName", type=str, required=True, help="真实姓名不能为空", dest='real_name')
+        parser.add_argument("password", type=str, required=True, help="密码不得为空")
 
-        if not username or not real_name or not password:
-            return fail_api(msg="账号姓名密码不得为空")
+        res = parser.parse_args()
 
-        if user_curd.is_user_exists(username):
+        role_ids = res.role_ids.split(',')
+
+        if _utils.is_user_exists(res.username):
             return fail_api(msg="用户已经存在")
 
-        _id = user_curd.add_user(username, real_name, password)
-        user_curd.add_user_role(_id, role_ids)
+        user = User()
+        user.username = res.username
+        user.realname = res.real_name
+        user.set_password(res.password)
+        db.session.add(user)
+        db.session.commit()
+
+        """ 增加用户角色 """
+        user = User.query.filter_by(id=user.id).first()
+        roles = Role.query.filter(Role.id.in_(role_ids)).all()
+        for r in roles:
+            user.role.append(r)
+        db.session.commit()
 
         return success_api(msg="增加成功")
 
@@ -56,23 +68,32 @@ class CURDUser(Resource):
     @authorize("admin:user:remove", log=True)
     def delete(self, user_id):
         # 删除用户
-        res = user_curd.delete_by_id(user_id)
+        res = _utils.delete_by_id(user_id)
         if not res:
             return fail_api(msg="删除失败")
         return success_api(msg="删除成功")
 
     @authorize("admin:user:edit", log=True)
     def put(self, user_id):
+
+        parser = reqparse.RequestParser()
+        parser.add_argument('roleIds', type=str, dest='role_ids')
+        parser.add_argument('userId', type=str, dest='user_id')
+        parser.add_argument('username', type=str)
+        parser.add_argument('realName', type=str, dest='real_name')
+        parser.add_argument('deptId', type=str, dest='dept_id')
+
+        res = parser.parse_args()
+        role_ids = res.role_ids.split(',')
+
         # 更新用户数据
-        req_json = request.json
-        a = req_json.get("roleIds")
-        _id = req_json.get("userId")
-        username = req_json.get('username')
-        real_name = req_json.get('realName')
-        dept_id = req_json.get('deptId')
-        role_ids = a.split(',')
-        user_curd.update_user(user_id, username, real_name, dept_id)
-        user_curd.update_user_role(_id, role_ids)
+        User.query.filter_by(id=user_id).update({'username': res.username,
+                                                 'realname': res.real_name,
+                                                 'dept_id': res.dept_id})
+        db.session.commit()
+
+        _utils.update_user_role(user_id, role_ids)
+
         return success_api(msg="更新成功")
 
 
@@ -81,27 +102,28 @@ class CURDUser(Resource):
 @authorize("admin:user:remove", log=True)
 def batch_remove():
     ids = request.form.getlist('ids[]')
-    user_curd.batch_remove(ids)
+    _utils.batch_remove(ids)
     return success_api(msg="批量删除成功")
 
 
 @users_bp.put('/enable')
 def user_enable():
     # 启用或者禁用用户 enable disable
-    user_id = request.json.get('userId')
-    operate = request.json.get('operate')
-    user_id = int(user_id)
-    operate = int(operate)
-    if user_id:
-        if operate == 1:
-            user = User.query.filter_by(id=user_id).update({"enable": operate})
-            message = success_api(msg="启动成功")
-        else:
-            user = User.query.filter_by(id=user_id).update({"enable": operate})
-            message = success_api(msg="禁用成功")
-        if user:
-            db.session.commit()
-        else:
-            return fail_api(msg="出错啦")
-        return message
-    return fail_api(msg="数据错误")
+
+    parser = reqparse.RequestParser()
+    parser.add_argument('userId', type=int, required=True, dest='user_id')
+    parser.add_argument('operate', type=int, required=True, dest='operate', choices=[0, 1])
+
+    res = parser.parse_args()
+
+    if res.operate == 1:
+        user = User.query.filter_by(id=res.user_id).update({"enable": res.operate})
+        message = success_api(msg="启动成功")
+    else:
+        user = User.query.filter_by(id=res.user_id).update({"enable": res.operate})
+        message = success_api(msg="禁用成功")
+    if user:
+        db.session.commit()
+    else:
+        return fail_api(msg="出错啦")
+    return message