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

applications/view/rights/rights_curd.py

@@ -0,0 +1,113 @@
+from applications.extensions import db
+from applications.models.rights.power import Power
+from applications.models import Role
+
+from flask_restful import marshal
+from applications.common.serialization import power_fields
+
+
+def get_power_dict():
+    power = Power.query.all()
+    res = marshal(power, power_fields)
+    return res
+
+
+# 选择父节点
+def select_parent():
+    power = Power.query.all()
+    res = marshal(power, power_fields)
+    res.append({"powerId": 0, "powerName": "顶级权限", "parentId": -1})
+    return res
+
+
+# 增加权限
+def save_power(req):
+    icon = req.get("icon")
+    openType = req.get("openType")
+    parentId = req.get("parentId")
+    powerCode = req.get("powerCode")
+    powerName = req.get("powerName")
+    powerType = req.get("powerType")
+    powerUrl = req.get("powerUrl")
+    sort = req.get("sort")
+    power = Power(
+        icon=icon,
+        open_type=openType,
+        parent_id=parentId,
+        code=powerCode,
+        name=powerName,
+        type=powerType,
+        url=powerUrl,
+        sort=sort,
+        enable=1
+    )
+    r = db.session.add(power)
+    db.session.commit()
+    return r
+
+
+# 根据id查询权限
+def get_power_by_id(id):
+    p = Power.query.filter_by(id=id).first()
+    return p
+
+
+# 更新权限
+def update_power(req_json):
+    id = req_json.get("powerId")
+    data = {
+        "icon": req_json.get("icon"),
+        "open_type": req_json.get("openType"),
+        "parent_id": req_json.get("parentId"),
+        "code": req_json.get("powerCode"),
+        "name": req_json.get("powerName"),
+        "type": req_json.get("powerType"),
+        "url": req_json.get("powerUrl"),
+        "sort": req_json.get("sort")
+    }
+    # print(data)
+    power = Power.query.filter_by(id=id).update(data)
+    db.session.commit()
+    # print(power)
+    return power
+
+
+# 启动权限
+def enable_status(id):
+    enable = 1
+    user = Power.query.filter_by(id=id).update({"enable": enable})
+    if user:
+        db.session.commit()
+        return True
+    return False
+
+
+# 停用权限
+def disable_status(id):
+    enable = 0
+    user = Power.query.filter_by(id=id).update({"enable": enable})
+    if user:
+        db.session.commit()
+        return True
+    return False
+
+
+# 删除权限（目前没有判断父节点自动删除子节点）
+def remove_power(id):
+    power = Power.query.filter_by(id=id).first()
+    role_id_list = []
+    roles = power.role
+    for role in roles:
+        role_id_list.append(role.id)
+    roles = Role.query.filter(Role.id.in_(role_id_list)).all()
+    for p in roles:
+        power.role.remove(p)
+    r = Power.query.filter_by(id=id).delete()
+    db.session.commit()
+    return r
+
+
+# 批量删除权限
+def batch_remove(ids):
+    for _id in ids:
+        remove_power(_id)

applications/view/rights/role.py

@@ -1,10 +1,14 @@
 from flask import Blueprint, render_template, request, jsonify
 from flask_login import login_required
-from applications.common.admin import role_curd
+
+from applications.extensions import db
+from applications.models import Role, Power
+from applications.view.rights import role_curd
 from applications.common.utils.http import table_api, success_api, fail_api
 from applications.common.utils.rights import authorize
+from flask_restful import reqparse, marshal
 
-
+from applications.common.serialization import power_fields
 role_bp = Blueprint('role', __name__, url_prefix='/admin/role')
 
 
@@ -19,17 +23,34 @@ def main():
 @role_bp.get('/data')
 @authorize("admin:role:main", log=True)
 def table():
-    page = request.args.get('page', type=int)
-    limit = request.args.get('limit', type=int)
-    role_name = request.args.get('roleName', type=str)
-    role_code = request.args.get('roleCode', type=str)
-    filters = {}
-    if role_name:
-        filters["name"] = ('%' + role_name + '%')
-    if role_code:
-        filters["code"] = ('%' + role_code + '%')
-    data, count = role_curd.get_role_data_dict(page=page, limit=limit, filters=filters)
-    return table_api(data=data, count=count)
+    parser = reqparse.RequestParser(bundle_errors=True)
+    parser.add_argument('page', type=int, default=1)
+    parser.add_argument('limit', type=int, default=10)
+    parser.add_argument('roleName', type=str, dest='role_name', default="")
+    parser.add_argument('roleCode', type=str, dest='role_code', default="")
+
+    res = parser.parse_args()
+
+    filters = []
+    if res.role_name:
+        filters.append(Role.name.like('%' + res.role_name + '%'))
+    if res.role_code:
+        filters.append(Role.code.like('%' + res.role_code + '%'))
+
+    paginate = Role.query.filter(*filters).paginate(page=res.page, per_page=res.limit, error_out=False)
+
+    return table_api(data=[
+        {
+            'id': item.id,
+            'roleName': item.name,
+            'roleCode': item.code,
+            'enable': item.enable,
+            'remark': item.remark,
+            'details': item.details,
+            'sort': item.sort,
+            'create_at': item.create_time,
+        } for item in paginate.items
+    ], count=paginate.total)
 
 
 # 角色增加
@@ -44,8 +65,24 @@ def add():
 @role_bp.post('/save')
 @authorize("admin:role:add", log=True)
 def save():
-    req = request.json
-    role_curd.add_role(req=req)
+    parser = reqparse.RequestParser()
+    parser.add_argument('details', type=str)
+    parser.add_argument('enable', type=int)
+    parser.add_argument('roleCode', type=str, dest='role_code')
+    parser.add_argument('roleName', type=str, dest='role_name')
+    parser.add_argument('sort', type=int)
+
+    res = parser.parse_args()
+
+    role = Role(
+        details=res.details,
+        enable=res.enable,
+        code=res.role_code,
+        name=res.role_name,
+        sort=res.sort
+    )
+    db.session.add(role)
+    db.session.commit()
     return success_api(msg="成功")
 
 
@@ -60,7 +97,19 @@ def power(_id):
 @role_bp.get('/getRolePower/<int:_id>')
 @authorize("admin:role:main", log=True)
 def get_role_power(_id):
-    powers = role_curd.get_role_power(_id)
+    role = Role.query.filter_by(id=_id).first()
+    # 获取权限列表的 id
+    check_powers_list = [rp.id for rp in role.power]
+    powers = Power.query.all()  # 获取所有的权限
+    # power_schema = PowerSchema2(many=True)  # 用已继承 ma.ModelSchema 类的自定制类生成序列化类
+    # 将所有的权限生产可序列化对象 json
+    # powers = power_schema.dump(powers)  # 生成可序列化对象
+    powers = marshal(powers, power_fields)
+    for i in powers:
+        if int(i.get("powerId")) in check_powers_list:
+            i["checkArr"] = "1"
+        else:
+            i["checkArr"] = "0"
     res = {
         "data": powers,
         "status": {"code": 200, "message": "默认"}
@@ -72,11 +121,14 @@ def get_role_power(_id):
 @role_bp.put('/saveRolePower')
 @authorize("admin:role:edit", log=True)
 def save_role_power():
-    req_form = request.form
-    power_ids = req_form.get("powerIds")
-    power_list = power_ids.split(',')
-    role_id = req_form.get("roleId")
-    role_curd.update_role_power(_id=role_id, power_list=power_list)
+    parser = reqparse.RequestParser()
+    parser.add_argument('powerIds', dest='power_ids')
+    parser.add_argument('roleId', dest='role_id')
+
+    res = parser.parse_args()
+    power_list = res.power_ids.split(',')
+
+    role_curd.update_role_power(_id=res.role_id, power_list=power_list)
     return success_api(msg="授权成功")
 
 
@@ -84,7 +136,7 @@ def save_role_power():
 @role_bp.get('/edit/<int:_id>')
 @authorize("admin:role:edit", log=True)
 def edit(_id):
-    role = role_curd.get_role_by_id(_id)
+    role = Role.query.filter_by(id=_id).first()
     return render_template('admin/role/edit.html', role=role)
 
 
@@ -92,8 +144,27 @@ def edit(_id):
 @role_bp.put('/update')
 @authorize("admin:role:edit", log=True)
 def update():
-    res = role_curd.update_role(request.json)
-    if not res:
+    parser = reqparse.RequestParser()
+    parser.add_argument('roleId', dest='role_id', type=int)
+    parser.add_argument('roleCode', dest='role_code', type=str)
+    parser.add_argument('roleName', dest='role_name', type=str)
+    parser.add_argument('sort', type=int)
+    parser.add_argument('enable', type=int)
+    parser.add_argument('details', type=str)
+
+    res = parser.parse_args()
+
+    data = {
+        "code": res.role_code,
+        "name": res.role_name,
+        "sort": res.sort,
+        "enable": res.enable,
+        "details": res.details
+    }
+
+    role = Role.query.filter_by(id=res.role_id).update(data)
+    db.session.commit()
+    if not role:
         return fail_api(msg="更新角色失败")
     return success_api(msg="更新角色成功")
 
@@ -102,27 +173,27 @@ def update():
 @role_bp.put('/enable')
 @authorize("admin:role:edit", log=True)
 def enable():
-    id = request.json.get('roleId')
-    # print(id)
-    if id:
-        res = role_curd.enable_status(id)
-        if not res:
-            return fail_api(msg="出错啦")
-        return success_api(msg="启动成功")
-    return fail_api(msg="数据错误")
+    parser = reqparse.RequestParser()
+    parser.add_argument('roleId', dest='role_id', required=True, type=int)
+    res = parser.parse_args()
+    ret = Role.query.filter_by(id=res.role_id).update({"enable": 1})
+    db.session.commit()
+    if not ret:
+        return fail_api(msg="出错啦")
+    return success_api(msg="启动成功")
 
 
 # 禁用用户
 @role_bp.put('/disable')
 @authorize("admin:role:edit", log=True)
 def dis_enable():
-    _id = request.json.get('roleId')
-    if _id:
-        res = role_curd.disable_status(_id)
-        if not res:
-            return fail_api(msg="出错啦")
-        return success_api(msg="禁用成功")
-    return fail_api(msg="数据错误")
+    parser = reqparse.RequestParser()
+    parser.add_argument('roleId', dest='role_id', required=True, type=int)
+    res = parser.parse_args()
+    ret = role_curd.disable_status(res.role_id)
+    if not ret:
+        return fail_api(msg="出错啦")
+    return success_api(msg="禁用成功")
 
 
 # 角色删除
@@ -140,6 +211,10 @@ def remove(_id):
 @authorize("admin:role:remove", log=True)
 @login_required
 def batch_remove():
-    ids = request.form.getlist('ids[]')
-    role_curd.batch_remove(ids)
+    parser = reqparse.RequestParser()
+    parser.add_argument('ids[]', action='append', dest='ids')
+
+    res = parser.parse_args()
+
+    role_curd.batch_remove(res.ids)
     return success_api(msg="批量删除成功")

applications/view/rights/role_curd.py

@@ -0,0 +1,74 @@
+from sqlalchemy import and_
+
+from applications.extensions import db
+from applications.models import Role, RoleSchema
+from applications.models.rights.power import Power
+from applications.models import User
+
+# 获取角色对象
+from applications.common.curd import model_to_dicts
+
+
+def get_role_data(page, limit, filters):
+    print(page, limit, filters)
+    role = Role.query.filter(
+        and_(*[getattr(Role, k).like(v) for k, v in filters.items()])
+    ).paginate(page=page, error_out=False)
+    count = Role.query.count()
+    return role, count
+
+
+def get_role_data_dict(page, limit, filters):
+    """ 获取角色dict """
+    role, count = get_role_data(page, limit, filters)
+    data = model_to_dicts(Schema=RoleSchema, model=role.items)
+    return data, count
+
+
+def get_role_by_id(_id):
+    """ 通过id获取角色 """
+    r = Role.query.filter_by(id=_id).first()
+    return r
+
+
+def update_role_power(_id, power_list):
+    """ 更新角色权限 """
+    role = Role.query.filter_by(id=_id).first()
+    power_id_list = []
+    for p in role.power:
+        power_id_list.append(p.id)
+    powers = Power.query.filter(Power.id.in_(power_id_list)).all()
+    for p in powers:
+        role.power.remove(p)
+    powers = Power.query.filter(Power.id.in_(power_list)).all()
+    for p in powers:
+        role.power.append(p)
+    db.session.commit()
+
+
+def remove_role(_id):
+    """ 删除角色 """
+    role = Role.query.filter_by(id=_id).first()
+    # 删除该角色的权限
+    power_id_list = []
+    for p in role.power:
+        power_id_list.append(p.id)
+
+    powers = Power.query.filter(Power.id.in_(power_id_list)).all()
+    for p in powers:
+        role.power.remove(p)
+    user_id_list = []
+    for u in role.user:
+        user_id_list.append(u.id)
+    users = User.query.filter(User.id.in_(user_id_list)).all()
+    for u in users:
+        role.user.remove(u)
+    r = Role.query.filter_by(id=id).delete()
+    db.session.commit()
+    return r
+
+
+def batch_remove(ids):
+    """ 批量删除 """
+    for _id in ids:
+        remove_role(_id)

applications/view/rights/view.py

@@ -1,8 +1,7 @@
 from flask import render_template, request, jsonify, make_response
-from flask_restful import Resource, reqparse
+from flask_restful import Resource
 
-from . import rights_bp, rights_api
-from ...common.admin import rights_curd
+from . import rights_bp, rights_api, rights_curd
 from ...common.utils.http import success_api, fail_api
 from ...common.utils.rights import authorize
 
@@ -98,7 +97,7 @@ def enable():
 @authorize("admin:power:edit", log=True)
 def dis_enable():
     _id = request.json.get('powerId')
-    if id:
+    if _id:
         res = rights_curd.disable_status(_id)
         if not res:
             return fail_api(msg="出错啦")
@@ -113,11 +112,3 @@ def batch_remove():
     ids = request.form.getlist('ids[]')
     rights_curd.batch_remove(ids)
     return success_api(msg="批量删除成功")
-
-
-"""
-    https://developer.aliyun.com/article/778501
-    四位权限值： 增删改查
-    八位部门值： 流量 接待&转化 讲师 运营 1111 1111
-    四位公司值： 
-"""