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

applications/view/__init__.py

@@ -3,7 +3,6 @@ from applications.view.index import register_index_views
 from applications.view.passport import register_passport_views
 from applications.view.rights import register_rights_view
 from applications.view.company.department import register_dept_views
-from applications.view.vip import register_vip_view
 
 
 def init_view(app):
@@ -12,4 +11,3 @@ def init_view(app):
     register_rights_view(app)
     register_passport_views(app)
     register_dept_views(app)
-    register_vip_view(app)

applications/view/admin/dict.py

@@ -3,7 +3,7 @@ from flask import Blueprint, render_template, request, jsonify
 from applications.common.utils.http import table_api, success_api, fail_api
 from applications.common.utils.rights import authorize
 from applications.models import DictType, DictData
-from applications.common.admin import dict_curd
+from applications.view.admin import dict_curd
 
 admin_dict = Blueprint('adminDict', __name__, url_prefix='/admin/dict')
 

applications/view/admin/dict_curd.py

@@ -0,0 +1,145 @@
+from flask import escape
+from applications.extensions import db
+from applications.models import DictType, DictData, DictTypeSchema, DictDataSchema
+from applications.common.curd import model_to_dicts
+
+
+def get_dict(typecode: str):
+    dict_list = []
+    if DictType.query.filter_by(type_code=typecode, enable=1).first():
+        dicts = DictData.query.filter_by(type_code=typecode, enable=1).all()
+        for d in dicts:
+            dict_dict = {"key": d.data_label, "value": d.data_value}
+            dict_list.append(dict_dict)
+    else:
+        return None
+    return dict_list
+
+
+def get_dict_type(page, limit, type_name):
+    dict_all = DictType.query
+    if type_name:
+        dict_all = dict_all.filter(DictType.type_name.like('%' + type_name + '%'))
+    dict_all = dict_all.paginate(page=page,
+                                 per_page=limit,
+                                 error_out=False)
+    count = DictType.query.count()
+    data = model_to_dicts(Schema=DictTypeSchema, model=dict_all.items)
+    return data, count
+
+
+def get_dict_data(page, limit, type_code):
+    dict_all = DictData.query.filter_by(type_code=type_code).paginate(page=page,
+                                                                      per_page=limit,
+                                                                      error_out=False)
+    count = DictType.query.count()
+    dict_dict = model_to_dicts(Schema=DictDataSchema, model=dict_all.items)
+    return dict_dict, count
+
+
+# 增加 dict type
+def save_dict_type(req_json):
+    description = escape(req_json.get("description"))
+    enable = escape(req_json.get("enable"))
+    type_code = escape(req_json.get("typeCode"))
+    type_name = escape(req_json.get("typeName"))
+    d = DictType(type_name=type_name, type_code=type_code, enable=enable, description=description)
+    db.session.add(d)
+    db.session.commit()
+    return d.id
+
+
+# 编辑字典类型
+def update_dict_type(req_json):
+    id = escape(req_json.get("id"))
+    description = escape(req_json.get("description"))
+    enable = escape(req_json.get("enable"))
+    type_code = escape(req_json.get("typeCode"))
+    type_name = escape(req_json.get("typeName"))
+    DictType.query.filter_by(id=id).update({
+        "description": description,
+        "enable": enable,
+        "type_code": type_code,
+        "type_name": type_name
+    })
+    db.session.commit()
+    return
+
+
+def enable_dict_type_status(id):
+    enable = 1
+    res = DictType.query.filter_by(id=id).update({"enable": enable})
+    if res:
+        db.session.commit()
+        return True
+    return False
+
+
+def disable_dict_type_status(id):
+    enable = 0
+    res = DictType.query.filter_by(id=id).update({"enable": enable})
+    if res:
+        db.session.commit()
+        return True
+    return False
+
+
+# 删除字典类型
+def delete_type_by_id(id):
+    type_code = DictType.query.filter_by(id=id).first().type_code
+    DictData.query.filter_by(type_code=type_code).delete()
+    res = DictType.query.filter_by(id=id).delete()
+    db.session.commit()
+    return res
+
+
+# 增加dictdata
+def save_dict_data(req_json):
+    data_label = escape(req_json.get("dataLabel"))
+    data_value = escape(req_json.get("dataValue"))
+    enable = escape(req_json.get("enable"))
+    remark = escape(req_json.get("remark"))
+    type_code = escape(req_json.get("typeCode"))
+    d = DictData(data_label=data_label, data_value=data_value, enable=enable, remark=remark, type_code=type_code)
+    db.session.add(d)
+    db.session.commit()
+    return d.id
+
+
+# 编辑字典数据
+def update_dict_data(req_json):
+    id = req_json.get("dataId")
+    DictData.query.filter_by(id=id).update({
+        "data_label": escape(req_json.get("dataLabel")),
+        "data_value": escape(req_json.get("dataValue")),
+        "enable": escape(req_json.get("enable")),
+        "remark": escape(req_json.get("remark")),
+        "type_code": escape(req_json.get("typeCode"))
+    })
+    db.session.commit()
+    return
+
+
+def enable_dict_data_status(id):
+    enable = 1
+    res = DictData.query.filter_by(id=id).update({"enable": enable})
+    if res:
+        db.session.commit()
+        return True
+    return False
+
+
+def disable_dict_data_status(id):
+    enable = 0
+    res = DictData.query.filter_by(id=id).update({"enable": enable})
+    if res:
+        db.session.commit()
+        return True
+    return False
+
+
+# 删除dictdata
+def delete_data_by_id(id):
+    res = DictData.query.filter_by(id=id).delete()
+    db.session.commit()
+    return res

applications/view/admin/file.py

@@ -1,13 +1,14 @@
 import os
-from flask import Blueprint, request, render_template, jsonify, current_app
-
+from flask import Blueprint, request, render_template, jsonify, current_app, make_response
+from flask_restful import Api, Resource
 from applications.common.utils.http import fail_api, success_api, table_api
 from applications.common.utils.rights import authorize
 from applications.extensions import db
 from applications.models import Photo
-from applications.common.admin import file_curd
+from applications.view.admin import file_curd
 
 file_bp = Blueprint('file', __name__, url_prefix='/file')
+file_api = Api(file_bp)
 
 
 #  图片管理
@@ -27,42 +28,36 @@ def table():
     return table_api(data=data, count=count)
 
 
-#   上传
-@file_bp.get('/upload')
-@authorize("admin:file:add", log=True)
-def upload():
-    return render_template('admin/file/photo_add.html')
+@file_api.resource('/upload')
+class Upload(Resource):
+    @authorize("admin:file:add", log=True)
+    def get(self):
+        return make_response(render_template('admin/file/photo_add.html'))
 
+    @authorize("admin:file:add", log=True)
+    def post(self):
+        if 'file' in request.files:
+            photo = request.files['file']
+            mime = request.files['file'].content_type
+            file_url = file_curd.upload_one(photo=photo, mime=mime)
+            res = {
+                "msg": "上传成功",
+                "code": 0,
+                "success": True,
+                "data":
+                    {"src": file_url}
+            }
+            return jsonify(res)
+        return fail_api()
 
-#   上传接口
-@file_bp.post('/upload')
-@authorize("admin:file:add", log=True)
-def upload_api():
-    if 'file' in request.files:
-        photo = request.files['file']
-        mime = request.files['file'].content_type
-        file_url = file_curd.upload_one(photo=photo, mime=mime)
-        res = {
-            "msg": "上传成功",
-            "code": 0,
-            "success": True,
-            "data":
-                {"src": file_url}
-        }
-        return jsonify(res)
-    return fail_api()
-
-
-#    图片删除
-@file_bp.route('/delete', methods=['GET', 'POST'])
-@authorize("admin:file:delete", log=True)
-def delete():
-    _id = request.form.get('id')
-    res = file_curd.delete_photo_by_id(_id)
-    if res:
-        return success_api(msg="删除成功")
-    else:
-        return fail_api(msg="删除失败")
+    @authorize("admin:file:delete", log=True)
+    def delete(self):
+        _id = request.form.get('id')
+        res = file_curd.delete_photo_by_id(_id)
+        if res:
+            return success_api(msg="删除成功")
+        else:
+            return fail_api(msg="删除失败")
 
 
 # 图片批量删除

applications/view/admin/file_curd.py

@@ -0,0 +1,36 @@
+import os
+from flask import current_app
+from sqlalchemy import desc
+
+from applications.common.utils.upload import photos
+from applications.extensions import db
+from applications.models import Photo, PhotoSchema
+from applications.common.curd import model_to_dicts
+
+
+def get_photo(page, limit):
+    photo = Photo.query.order_by(desc(Photo.create_time)).paginate(page=page, per_page=limit, error_out=False)
+    count = Photo.query.count()
+    data = model_to_dicts(Schema=PhotoSchema, model=photo.items)
+    return data, count
+
+
+def upload_one(photo, mime):
+    filename = photos.save(photo)
+    file_url = photos.url(filename)
+
+    upload_url = current_app.config.get("UPLOADED_PHOTOS_DEST")
+    size = os.path.getsize(upload_url + '/' + filename)
+    photo = Photo(name=filename, href=file_url, mime=mime, size=size)
+    db.session.add(photo)
+    db.session.commit()
+    return file_url
+
+
+def delete_photo_by_id(_id):
+    photo_name = Photo.query.filter_by(id=_id).first().name
+    photo = Photo.query.filter_by(id=_id).delete()
+    db.session.commit()
+    upload_url = current_app.config.get("UPLOADED_PHOTOS_DEST")
+    os.remove(upload_url + '/' + photo_name)
+    return photo

applications/view/company/department/__init__.py

@@ -5,7 +5,7 @@ from applications.common.utils.http import success_api, fail_api
 from applications.common.utils.rights import authorize
 from applications.common.utils.validate import check_data
 from applications.models import DeptSchema
-from applications.common.admin import dept_curd as dept_curd
+from applications.view.company.department import dept_curd as dept_curd
 
 dept_bp = Blueprint('dept', __name__, url_prefix='/dept')
 

applications/view/company/department/dept_curd.py

@@ -0,0 +1,88 @@
+from applications.extensions import db
+from applications.models import Dept, DeptSchema
+from applications.models import User
+from applications.common.curd import model_to_dicts
+
+
+def get_dept_dict():
+    dept = Dept.query.order_by(Dept.sort).all()
+    res = model_to_dicts(Schema=DeptSchema, model=dept)
+    return res
+
+
+def save_dept(req):
+    address = req.get("address")
+    deptName = req.get("deptName")
+    email = req.get("email")
+    leader = req.get("leader")
+    parentId = req.get("parentId")
+    phone = req.get("phone")
+    sort = req.get("sort")
+    status = req.get("status")
+    dept = Dept(
+        parent_id=parentId,
+        dept_name=deptName,
+        sort=sort,
+        leader=leader,
+        phone=phone,
+        email=email,
+        status=status,
+        address=address
+    )
+    r = db.session.add(dept)
+    db.session.commit()
+    return r
+
+
+def get_dept_by_id(_id):
+    """根据 id 获取部门"""
+    d = Dept.query.filter_by(id=_id).first()
+    return d
+
+
+def enable_status(_id):
+    """ 启用权限 """
+    enable = 1
+    d = Dept.query.filter_by(id=_id).update({"status": enable})
+    if d:
+        db.session.commit()
+        return True
+    return False
+
+
+def disable_status(_id):
+    """ 停用权限 """
+    enable = 0
+    d = Dept.query.filter_by(id=_id).update({"status": enable})
+    if d:
+        db.session.commit()
+        return True
+    return False
+
+
+def update_dept(json):
+    """ 更新部门信息 """
+    _id = json.get("deptId"),
+    data = {
+        "dept_name": json.get("deptName"),
+        "sort": json.get("sort"),
+        "leader": json.get("leader"),
+        "phone": json.get("phone"),
+        "email": json.get("email"),
+        "status": json.get("status"),
+        "address": json.get("address")
+    }
+    d = Dept.query.filter_by(id=_id).update(data)
+    if not d:
+        return False
+    db.session.commit()
+    return True
+
+
+def remove_dept(_id):
+    d = Dept.query.filter_by(id=_id).delete()
+    if not d:
+        return False
+    User.query.filter_by(dept_id=_id).update({"dept_id": None})
+    db.session.commit()
+    return True

applications/view/company/users/__init__.py

@@ -1,7 +1,6 @@
 from flask import Blueprint, request, render_template
 from flask_restful import Api
 
-from applications.common.admin import user_curd
 from applications.common.utils.http import table_api
 from applications.common.utils.rights import authorize
 from applications.models import Role
@@ -36,5 +35,5 @@ def add():
     return render_template('admin/user/add.html', roles=roles)
 
 
-from . import profile
+from . import profile, user_curd
 from . import user_view

applications/view/company/users/profile.py

@@ -1,10 +1,11 @@
 # 个人中心
 from flask import render_template, request, make_response
 from flask_login import login_required, current_user
-from flask_restful import Resource, reqparse
-from applications.common.admin import user_curd
+from flask_restful import Resource
 from applications.common.utils.http import fail_api, success_api
-from applications.view.company.users import users_bp, user_api
+from applications.extensions import db
+from applications.models import User
+from applications.view.company.users import users_bp, user_api, user_curd
 
 
 @users_bp.get('/center')
@@ -15,21 +16,20 @@ def center():
     return render_template('admin/user/profile.html', user_info=user_info, user_logs=user_logs)
 
 
-# 修改头像
-@users_bp.get('/avatar')
-@login_required
-def profile():
-    return render_template('admin/user/avatar.html')
+@user_api.resource('/avatar')
+class Avatar(Resource):
+    """修改头像"""
 
+    def get(self):
+        return make_response(render_template('admin/user/avatar.html'))
 
-# 修改头像
-@users_bp.put('/updateAvatar')
-@login_required
-def update_avatar():
-    url = request.json.get("avatar").get("src")
-    if not user_curd.update_avatar(url):
-        return fail_api(msg="出错啦")
-    return success_api(msg="修改成功")
+    def put(self):
+        url = request.json.get("avatar").get("src")
+        ret = User.query.filter_by(id=current_user.id).update({"avatar": url})
+        db.session.commit()
+        if not ret:
+            return fail_api(msg="出错啦")
+        return success_api(msg="修改成功")
 
 
 # 修改当前用户信息

applications/view/company/users/user_curd.py

@@ -0,0 +1,161 @@
+from flask import jsonify
+from flask_login import current_user
+from sqlalchemy import and_, desc
+from applications.extensions import db
+from applications.models import User, UserSchema
+from applications.models import Role
+from applications.models import AdminLog
+
+# 获取用户的 sqlalchemy 对象分页器
+from applications.common.curd import model_to_dicts
+
+
+def get_user_data(page, limit, filters, deptId):
+    if deptId:
+        user = User.query.filter_by(dept_id=deptId).filter(
+            and_(*[getattr(User, k).like(v) for k, v in filters.items()])).paginate(page=page,
+                                                                                    per_page=limit,
+                                                                                    error_out=False)
+    else:
+        user = User.query.filter(and_(*[getattr(User, k).like(v) for k, v in filters.items()])).paginate(page=page,
+                                                                                                         per_page=limit,
+                                                                                                         error_out=False)
+    count = User.query.count()
+    return user, count
+
+
+def get_user_data_dict(page, limit, filters, deptId):
+    """ 获取用户的dict数据分页器 """
+    user, count = get_user_data(page, limit, filters, deptId)
+    data = model_to_dicts(Schema=UserSchema, model=user.items)
+    return data, count
+
+
+def get_user_by_name(username):
+    """ 通过名称获取用户 """
+    return User.query.filter_by(username=username).first()
+
+
+def get_current_user_logs():
+    """ 获取当前用户日志 """
+    log = AdminLog.query.filter_by(url='/admin/login').filter_by(uid=current_user.id).order_by(
+        desc(AdminLog.create_time)).limit(10)
+    return log
+
+
+def is_user_exists(username):
+    """ 判断用户是否存在 """
+    res = User.query.filter_by(username=username).count()
+    return bool(res)
+
+
+def add_user(username, real_name, password):
+    """ 增加用户 """
+    user = User()
+    user.username = username
+    user.realname = real_name
+    user.set_password(password)
+    db.session.add(user)
+    db.session.commit()
+    return user.id
+
+
+def add_user_role(_id, roles_list):
+    """ 增加用户角色 """
+    user = User.query.filter_by(id=_id).first()
+    roles = Role.query.filter(Role.id.in_(roles_list)).all()
+    for r in roles:
+        user.role.append(r)
+    db.session.commit()
+
+
+def update_avatar(url):
+    """ 更新用户头像 """
+    r = User.query.filter_by(id=current_user.id).update({"avatar": url})
+    db.session.commit()
+    return r
+
+
+def update_user(_id, username, realname, deptId):
+    """ 更新用户信息 """
+    user = User.query.filter_by(id=_id).update({'username': username, 'realname': realname, 'dept_id': deptId})
+    db.session.commit()
+    return user
+
+
+def update_current_user_info(req_json):
+    """ 更新当前用户信息 """
+    r = User.query.filter_by(id=current_user.id).update(
+        {"realname": req_json.get("realName"), "remark": req_json.get("details")})
+    db.session.commit()
+    return r
+
+
+def edit_password(res_json):
+    """ 修改当前用户密码 """
+    if res_json.get("newPassword") == '':
+        return jsonify(success=False, msg="新密码不得为空")
+    if res_json.get("newPassword") != res_json.get("confirmPassword"):
+        return jsonify(success=False, msg="俩次密码不一样")
+    user = current_user
+    is_right = user.validate_password(res_json.get("oldPassword"))
+    if not is_right:
+        return jsonify(success=False, msg="旧密码错误")
+    user.set_password(res_json.get("newPassword"))
+    db.session.add(user)
+    db.session.commit()
+    return jsonify(success=True, msg="更改成功")
+
+
+def delete_by_id(_id):
+    """ 删除用户 """
+    user = User.query.filter_by(id=_id).first()
+    roles_id = []
+    for role in user.role:
+        roles_id.append(role.id)
+    roles = Role.query.filter(Role.id.in_(roles_id)).all()
+    for r in roles:
+        user.role.remove(r)
+    res = User.query.filter_by(id=_id).delete()
+    db.session.commit()
+    return res
+
+
+def enable_status(_id):
+    """ 启用用户 """
+    enable = 1
+    user = User.query.filter_by(id=_id).update({"enable": enable})
+    if user:
+        db.session.commit()
+        return True
+    return False
+
+
+def disable_status(_id):
+    """ 停用用户 """
+    enable = 0
+    user = User.query.filter_by(id=_id).update({"enable": enable})
+    if user:
+        db.session.commit()
+        return True
+    return False
+
+
+def batch_remove(ids):
+    """ 批量删除 """
+    for _id in ids:
+        delete_by_id(_id)
+
+
+def update_user_role(_id, roles_list):
+    user = User.query.filter_by(id=_id).first()
+    roles_id = []
+    for role in user.role:
+        roles_id.append(role.id)
+    roles = Role.query.filter(Role.id.in_(roles_id)).all()
+    for r in roles:
+        user.role.remove(r)
+    roles = Role.query.filter(Role.id.in_(roles_list)).all()
+    for r in roles:
+        user.role.append(r)
+    db.session.commit()

applications/view/company/users/user_view.py

@@ -2,11 +2,10 @@ from flask import render_template, request, make_response
 from flask_restful import Resource
 from applications.extensions import db
 
-from applications.common.admin import user_curd
 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
+from applications.view.company.users import user_api, users_bp, user_curd
 
 
 @user_api.resource('/')

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
-    四位公司值： 
-"""

applications/view/vip/__init__.py

@@ -1,58 +0,0 @@
-from flask import Blueprint, render_template, make_response, Flask, request
-from flask_restful import Resource, Api, reqparse
-from sqlalchemy import desc
-
-from applications.common.utils.http import table_api
-from applications.models import VipMember
-
-vip_bp = Blueprint('vip', __name__, url_prefix='/vip')
-vip_api = Api(vip_bp)
-
-
-def register_vip_view(app: Flask):
-    app.register_blueprint(vip_bp)
-
-
-@vip_api.resource('/member')
-class Member(Resource):
-    def get(self):
-        return make_response(render_template('admin/vip/main.html'))
-
-    def post(self):
-        pass
-
-
-#   用户分页查询
-@vip_bp.get('/data')
-def data():
-    parse = reqparse.RequestParser()
-    parse.add_argument('page', type=int, default=1)
-    parse.add_argument('limit', type=int, default=10)
-    parse.add_argument('wx', type=str, default="")
-    parse.add_argument('username', type=str, default="")
-
-    res = parse.parse_args()
-
-    filters = []
-    if res.username:
-        filters.append(VipMember.username.like('%{}%'.format(res.username)))
-
-    if res.wx:
-        filters.append(VipMember.wx.like('%{}%'.format(res.wx)))
-
-    paginate = VipMember.query.filter(*filters).paginate(
-        page=res.page, per_page=res.limit)
-
-    return table_api(data=[
-        {
-            'id': item.id,
-            'username': item.username,
-            'mobile': item.mobile,
-            'id_card': item.id_card,
-            'wx': item.wx,
-            'qq': item.qq,
-            'account': item.account,
-            'number': '{:0>2}{:0>4}'.format(item.phase, item.id),
-            'create_at': item.update_at,
-            'phase': item.phase,
-        } for item in paginate.items], count=paginate.total)