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

applications/view/rights/_utils.py

@@ -3,8 +3,11 @@ from collections import OrderedDict
 
 from flask import current_app
 from flask_login import current_user
+from flask_restful import marshal
 
-from applications.models import PowerSchema
+from applications.common.serialization import power_fields
+from applications.extensions import db
+from applications.models import PowerSchema, Power, Role, User
 
 
 def get_render_config():
@@ -115,3 +118,65 @@ def make_menu_tree():
 
     return menu_dict.get(0)
 
+
+# 选择父节点
+def select_power_dict():
+    power = Power.query.all()
+    res = marshal(power, power_fields)
+    res.append({"powerId": 0, "powerName": "顶级权限", "parentId": -1})
+    return res
+
+
+def get_power_dict():
+    power = Power.query.all()
+    res = marshal(power, power_fields)
+    return res
+
+
+# 删除权限（目前没有判断父节点自动删除子节点）
+def remove_power(power_id):
+    power = Power.query.filter_by(id=power_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=power_id).delete()
+    db.session.commit()
+    return r
+
+
+# 批量删除权限
+def batch_remove_power(ids):
+    for _id in ids:
+        remove_power(_id)
+
+
+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_role(ids):
+    """ 批量删除 """
+    for _id in ids:
+        remove_role(_id)

applications/view/rights/right.py

@@ -1,11 +1,22 @@
 from flask import render_template, request, jsonify, make_response
 from flask_restful import Resource, reqparse
 
-from . import rights_bp, rights_api, right_curd
+from . import rights_bp, rights_api
+from ._utils import select_power_dict, get_power_dict, batch_remove_power
 from ...common.utils.http import success_api, fail_api
 from ...common.utils.rights import authorize
 from ...extensions import db
-from ...models import Power
+from ...models import Power, Role
+
+parser_power = reqparse.RequestParser(bundle_errors=True)
+parser_power.add_argument('icon', type=str)
+parser_power.add_argument('openType', type=str, dest='open_type')
+parser_power.add_argument('parentId', type=str, dest='parent_id')
+parser_power.add_argument('powerCode', type=str, dest='power_code')
+parser_power.add_argument('powerName', type=str, dest='power_name')
+parser_power.add_argument('powerType', type=str, dest='power_type')
+parser_power.add_argument('powerUrl', type=str, dest='power_url')
+parser_power.add_argument('sort', type=int, dest='sort')
 
 
 @rights_bp.get('/')
@@ -17,32 +28,19 @@ def index():
 @rights_bp.get('/data')
 @authorize("admin:power:main", log=True)
 def data():
-    power_data = right_curd.get_power_dict()
+    power_data = get_power_dict()
+
     res = {
         "data": power_data
     }
     return jsonify(res)
 
 
-@rights_api.resource('/power')
-class AddRight(Resource):
-    @authorize("admin:power:add", log=True)
-    def get(self):
-        """获取增加视图"""
-        return make_response(render_template('admin/rights/add.html'))
-
-    @authorize("admin:power:add", log=True)
-    def post(self):
-        req = request.json
-        right_curd.save_power(req)
-        return success_api(msg="成功")
-
-
 @rights_bp.get('/selectParent')
 @authorize("admin:power:main", log=True)
 def select_parent():
     """获取选择父节点"""
-    power_data = right_curd.select_parent()
+    power_data = select_power_dict()
     res = {
         "status": {"code": 200, "message": "默认"},
         "data": power_data
@@ -51,57 +49,6 @@ def select_parent():
     return jsonify(res)
 
 
-@rights_api.resource('/power/<int:power_id>')
-class RightsURD(Resource):
-    @authorize("admin:power:edit", log=True)
-    def get(self, power_id):
-        power = right_curd.get_power_by_id(power_id)
-        icon = str(power.icon).split()
-        if len(icon) == 2:
-            icon = icon[1]
-        else:
-            icon = None
-        return make_response(render_template('admin/rights/edit.html', power=power, icon=icon))
-
-    @authorize("admin:power:remove", log=True)
-    def delete(self, power_id):
-        r = right_curd.remove_power(power_id)
-        if r:
-            return success_api(msg="删除成功")
-        else:
-            return fail_api(msg="删除失败")
-
-    @authorize("admin:power:edit", log=True)
-    def put(self, power_id):
-        parser = reqparse.RequestParser(bundle_errors=True)
-        parser.add_argument('icon', type=str)
-        parser.add_argument('openType', type=str, dest='open_type')
-        parser.add_argument('parentId', type=str, dest='parent_id')
-        parser.add_argument('powerCode', type=str, dest='power_code')
-        parser.add_argument('powerName', type=str, dest='power_name')
-        parser.add_argument('powerType', type=str, dest='power_type')
-        parser.add_argument('powerUrl', type=str, dest='power_url')
-        parser.add_argument('sort', type=int, dest='sort')
-
-        res = parser.parse_args()
-        data = {
-            "icon": res.icon,
-            "open_type": res.open_type,
-            "parent_id": res.parent_id,
-            "code": res.power_code,
-            "name": res.power_name,
-            "type": res.power_type,
-            "url": res.power_url,
-            "sort": res.sort
-        }
-        power = Power.query.filter_by(id=power_id).update(data)
-        db.session.commit()
-
-        if not power:
-            return fail_api(msg="更新权限失败")
-        return success_api(msg="更新权限成功")
-
-
 # 启用权限
 @rights_bp.put('/enable')
 @authorize("admin:power:edit", log=True)
@@ -124,7 +71,91 @@ def enable():
 # 批量删除
 @rights_bp.delete('/batchRemove')
 @authorize("admin:power:remove", log=True)
-def batch_remove():
+def batch_remove_view():
     ids = request.form.getlist('ids[]')
-    right_curd.batch_remove(ids)
+    batch_remove_power(ids)
     return success_api(msg="批量删除成功")
+
+
+@rights_api.resource('/power')
+class AddRight(Resource):
+    @authorize("admin:power:add", log=True)
+    def get(self):
+        """获取增加视图"""
+        return make_response(render_template('admin/rights/add.html'))
+
+    @authorize("admin:power:add", log=True)
+    def post(self):
+        res = parser_power.parse_args()
+        power = Power(
+            icon=res.icon,
+            open_type=res.open_type,
+            parent_id=res.parent_id,
+            code=res.power_code,
+            name=res.power_name,
+            type=res.power_type,
+            url=res.power_url,
+            sort=res.sort,
+            enable=1
+        )
+        try:
+            db.session.add(power)
+            db.session.commit()
+        except Exception as e:
+            print(e)
+            return fail_api(msg='数据提交失败')
+
+        return success_api(msg="成功")
+
+
+@rights_api.resource('/power/<int:power_id>')
+class RightsURD(Resource):
+    @authorize("admin:power:edit", log=True)
+    def get(self, power_id):
+        power = Power.query.filter_by(id=power_id).first()
+        icon = str(power.icon).split()
+        if len(icon) == 2:
+            icon = icon[1]
+        else:
+            icon = None
+        return make_response(render_template('admin/rights/edit.html', power=power, icon=icon))
+
+    @authorize("admin:power:remove", log=True)
+    def delete(self, power_id):
+        # 删除权限（目前没有判断父节点自动删除子节点）
+        power = Power.query.filter_by(id=power_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=power_id).delete()
+        db.session.commit()
+
+        if r:
+            return success_api(msg="删除成功")
+        else:
+            return fail_api(msg="删除失败")
+
+    @authorize("admin:power:edit", log=True)
+    def put(self, power_id):
+
+        res = parser_power.parse_args()
+        data = {
+            "icon": res.icon,
+            "open_type": res.open_type,
+            "parent_id": res.parent_id,
+            "code": res.power_code,
+            "name": res.power_name,
+            "type": res.power_type,
+            "url": res.power_url,
+            "sort": res.sort
+        }
+        power = Power.query.filter_by(id=power_id).update(data)
+        db.session.commit()
+
+        if not power:
+            return fail_api(msg="更新权限失败")
+        return success_api(msg="更新权限成功")

applications/view/rights/right_curd.py

@@ -1,113 +0,0 @@
-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,18 +1,24 @@
-from flask import Blueprint, render_template, request, jsonify
+from flask import Blueprint, render_template, request, jsonify, make_response
 from flask_login import login_required
 
+from flask_restful import Resource, Api, reqparse
+
 from applications.extensions import db
 from applications.models import Role, Power
-from applications.view.rights import role_curd
+# 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
+
+from ._utils import remove_role, batch_remove_role
+
 role_bp = Blueprint('role', __name__, url_prefix='/admin/role')
+role_api = Api(role_bp)
 
 
-# 用户管理
+# 角色而管理
 @role_bp.get('/')
 @authorize("admin:role:main", log=True)
 def main():
@@ -53,120 +59,137 @@ def table():
     ], count=paginate.total)
 
 
-# 角色增加
-@role_bp.get('/add')
-@authorize("admin:role:add", log=True)
-@login_required
-def add():
-    return render_template('admin/role/add.html')
+@role_api.resource('/add')
+class AddRole(Resource):
+    @authorize("admin:role:add", log=True)
+    def get(self):
+        return make_response(render_template('admin/role/add.html'))
+
+    @authorize("admin:role:add", log=True)
+    def post(self):
+        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="成功")
 
 
-# 角色增加
-@role_bp.post('/save')
-@authorize("admin:role:add", log=True)
-def save():
-    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="成功")
-
-
-# 角色授权
+# 角色授权操作
 @role_bp.get('/power/<int:_id>')
 @authorize("admin:role:power", log=True)
 def power(_id):
     return render_template('admin/role/power.html', id=_id)
 
 
-# 获取角色权限
-@role_bp.get('/getRolePower/<int:_id>')
-@authorize("admin:role:main", log=True)
-def 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": "默认"}
-    }
-    return jsonify(res)
+@role_api.resource('/role_power/<int:role_id>')
+class RolePower(Resource):
+
+    @authorize("admin:role:main", log=True)
+    def get(self, role_id):
+        # 获取角色权限
+        role = Role.query.filter_by(id=role_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": "默认"}
+        }
+        return jsonify(res)
+
+    # 保存角色权限
+    @authorize("admin:role:edit", log=True)
+    def put(self, role_id):
+        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 = Role.query.filter_by(id=role_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()
+        return success_api(msg="授权成功")
+
+    # 角色删除
+    @authorize("admin:role:remove", log=True)
+    def delete(self, role_id):
+        print(role_id)
+        res = remove_role(role_id)
+        print(res)
+        if not res:
+            return fail_api(msg="角色删除失败")
+        return success_api(msg="角色删除成功")
 
 
-# 保存角色权限
-@role_bp.put('/saveRolePower')
-@authorize("admin:role:edit", log=True)
-def save_role_power():
-    parser = reqparse.RequestParser()
-    parser.add_argument('powerIds', dest='power_ids')
-    parser.add_argument('roleId', dest='role_id')
+@role_api.resource('/edit/<int:role_id>')
+class EditRole(Resource):
 
-    res = parser.parse_args()
-    power_list = res.power_ids.split(',')
+    # 角色编辑
+    @authorize("admin:role:edit", log=True)
+    def get(self, role_id):
+        role = Role.query.filter_by(id=role_id).first()
+        return make_response(render_template('admin/role/edit.html', role=role))
 
-    role_curd.update_role_power(_id=res.role_id, power_list=power_list)
-    return success_api(msg="授权成功")
+    # 更新角色
+    @authorize("admin:role:edit", log=True)
+    def put(self, role_id):
+        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()
 
-# 角色编辑
-@role_bp.get('/edit/<int:_id>')
-@authorize("admin:role:edit", log=True)
-def edit(_id):
-    role = Role.query.filter_by(id=_id).first()
-    return render_template('admin/role/edit.html', role=role)
+        data = {
+            "code": res.role_code,
+            "name": res.role_name,
+            "sort": res.sort,
+            "enable": res.enable,
+            "details": res.details
+        }
 
-
-# 更新角色
-@role_bp.put('/update')
-@authorize("admin:role:edit", log=True)
-def update():
-    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="更新角色成功")
+        role = Role.query.filter_by(id=role_id).update(data)
+        db.session.commit()
+        if not role:
+            return fail_api(msg="更新角色失败")
+        return success_api(msg="更新角色成功")
 
 
 # 启用用户
@@ -175,35 +198,16 @@ def update():
 def enable():
     parser = reqparse.RequestParser()
     parser.add_argument('roleId', dest='role_id', required=True, type=int)
+    parser.add_argument('operate', required=True, type=int)
+
     res = parser.parse_args()
-    ret = Role.query.filter_by(id=res.role_id).update({"enable": 1})
+    ret = Role.query.filter_by(id=res.role_id).update({"enable": res.operate})
     db.session.commit()
+
+    message = "启动成功" if res.operate else "禁用成功"
     if not ret:
         return fail_api(msg="出错啦")
-    return success_api(msg="启动成功")
-
-
-# 禁用用户
-@role_bp.put('/disable')
-@authorize("admin:role:edit", log=True)
-def dis_enable():
-    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="禁用成功")
-
-
-# 角色删除
-@role_bp.delete('/remove/<int:_id>')
-@authorize("admin:role:remove", log=True)
-def remove(_id):
-    res = role_curd.remove_role(_id)
-    if not res:
-        return fail_api(msg="角色删除失败")
-    return success_api(msg="角色删除成功")
+    return success_api(msg=message)
 
 
 # 批量删除
@@ -216,5 +220,5 @@ def batch_remove():
 
     res = parser.parse_args()
 
-    role_curd.batch_remove(res.ids)
+    batch_remove_role(res.ids)
     return success_api(msg="批量删除成功")

applications/view/rights/role_curd.py

@@ -1,74 +0,0 @@
-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)