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

2021-06-27 19:27:08 +08:00
parent e9bd8a17a0
commit e3dd5458ad
23 changed files with 517 additions and 1202 deletions
@@ -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="更新权限成功")