wip:(重构接口实现方式2)
This commit is contained in:
@@ -1,4 +1,6 @@
|
||||
from flask_restful import Resource, reqparse, marshal
|
||||
from flask.views import MethodView
|
||||
|
||||
from flask_restful import Resource, reqparse
|
||||
|
||||
from common.utils.http import table_api, success_api, fail_api
|
||||
from extensions import db
|
||||
@@ -33,49 +35,48 @@ def batch_remove_role(role_ids):
|
||||
remove_role(role_id)
|
||||
|
||||
|
||||
class RoleRolesResource(Resource):
|
||||
# 表格数据
|
||||
def get(self):
|
||||
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="")
|
||||
def role_deletes():
|
||||
parser = reqparse.RequestParser()
|
||||
parser.add_argument('ids[]', action='append', dest='ids')
|
||||
|
||||
res = parser.parse_args()
|
||||
res = parser.parse_args()
|
||||
|
||||
filters = []
|
||||
if res.role_name:
|
||||
filters.append(RoleModel.name.like('%' + res.role_name + '%'))
|
||||
if res.role_code:
|
||||
filters.append(RoleModel.code.like('%' + res.role_code + '%'))
|
||||
|
||||
paginate = RoleModel.query.filter(*filters).paginate(page=res.page, per_page=res.limit, error_out=False)
|
||||
|
||||
return table_api(result={'items': [{'id': item.id,
|
||||
'roleName': item.name,
|
||||
'roleCode': item.code,
|
||||
'enable': item.enable,
|
||||
'comment': item.comment,
|
||||
'details': item.details,
|
||||
'sort': item.sort,
|
||||
} for item in paginate.items],
|
||||
'total': paginate.total}
|
||||
, code=0)
|
||||
|
||||
def delete(self):
|
||||
parser = reqparse.RequestParser()
|
||||
parser.add_argument('ids[]', action='append', dest='ids')
|
||||
|
||||
res = parser.parse_args()
|
||||
|
||||
batch_remove_role(res.ids)
|
||||
return success_api(message="批量删除成功")
|
||||
batch_remove_role(res.ids)
|
||||
return success_api(message="批量删除成功")
|
||||
|
||||
|
||||
class RoleRoleResource(Resource):
|
||||
class RoleRoleApi(MethodView):
|
||||
|
||||
def post(self, role_id):
|
||||
def get(self, _id):
|
||||
if not _id:
|
||||
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(RoleModel.name.like('%' + res.role_name + '%'))
|
||||
if res.role_code:
|
||||
filters.append(RoleModel.code.like('%' + res.role_code + '%'))
|
||||
|
||||
paginate = RoleModel.query.filter(*filters).paginate(page=res.page, per_page=res.limit, error_out=False)
|
||||
|
||||
return table_api(result={'items': [{'id': item.id,
|
||||
'roleName': item.name,
|
||||
'roleCode': item.code,
|
||||
'enable': item.enable,
|
||||
'comment': item.comment,
|
||||
'details': item.details,
|
||||
'sort': item.sort,
|
||||
} for item in paginate.items],
|
||||
'total': paginate.total}
|
||||
, code=0)
|
||||
|
||||
def post(self):
|
||||
parser = reqparse.RequestParser()
|
||||
parser.add_argument('details', type=str)
|
||||
parser.add_argument('enable', type=int)
|
||||
@@ -97,7 +98,7 @@ class RoleRoleResource(Resource):
|
||||
return success_api(message="成功")
|
||||
|
||||
# 更新角色
|
||||
def put(self, role_id):
|
||||
def put(self, _id):
|
||||
parser = reqparse.RequestParser()
|
||||
parser.add_argument('roleId', dest='role_id', type=int)
|
||||
parser.add_argument('roleCode', dest='role_code', type=str)
|
||||
@@ -116,32 +117,30 @@ class RoleRoleResource(Resource):
|
||||
"details": res.details
|
||||
}
|
||||
|
||||
role = RoleModel.query.filter_by(id=role_id).update(data)
|
||||
role = RoleModel.query.filter_by(id=_id).update(data)
|
||||
db.session.commit()
|
||||
if not role:
|
||||
return fail_api(message="更新角色失败")
|
||||
return success_api(message="更新角色成功")
|
||||
|
||||
|
||||
class RoleEnableResource(Resource):
|
||||
def role_enable_resource(_id):
|
||||
"""启用用户"""
|
||||
ret = RoleModel.query.get(_id)
|
||||
ret.enable = not ret.enable
|
||||
db.session.commit()
|
||||
|
||||
def put(self, role_id):
|
||||
ret = RoleModel.query.get(role_id)
|
||||
ret.enable = not ret.enable
|
||||
db.session.commit()
|
||||
|
||||
message = "修改成功"
|
||||
if not ret:
|
||||
return fail_api(message="出错啦")
|
||||
return success_api(message=message)
|
||||
message = "修改成功"
|
||||
if not ret:
|
||||
return fail_api(message="出错啦")
|
||||
return success_api(message=message)
|
||||
|
||||
|
||||
class RolePowerResource(Resource):
|
||||
class RolePowerApi(MethodView):
|
||||
|
||||
def get(self, role_id):
|
||||
def get(self, _id):
|
||||
# 获取角色权限
|
||||
role = RoleModel.query.filter_by(id=role_id).first()
|
||||
role = RoleModel.query.filter_by(id=_id).first()
|
||||
# 获取权限列表的 id
|
||||
check_powers_list = [rp.id for rp in role.power]
|
||||
powers = RightModel.query.all() # 获取所有的权限
|
||||
@@ -167,7 +166,7 @@ class RolePowerResource(Resource):
|
||||
}
|
||||
|
||||
# 保存角色权限
|
||||
def put(self, role_id):
|
||||
def put(self, _id):
|
||||
parser = reqparse.RequestParser()
|
||||
parser.add_argument('powerIds', dest='power_ids')
|
||||
parser.add_argument('roleId', dest='role_id')
|
||||
@@ -176,7 +175,7 @@ class RolePowerResource(Resource):
|
||||
power_list = res.power_ids.split(',')
|
||||
|
||||
""" 更新角色权限 """
|
||||
role = RoleModel.query.filter_by(id=role_id).first()
|
||||
role = RoleModel.query.filter_by(id=_id).first()
|
||||
power_id_list = []
|
||||
for p in role.power:
|
||||
power_id_list.append(p.id)
|
||||
@@ -190,10 +189,8 @@ class RolePowerResource(Resource):
|
||||
return success_api(message="授权成功")
|
||||
|
||||
# 角色删除
|
||||
def delete(self, role_id):
|
||||
print(role_id)
|
||||
res = remove_role(role_id)
|
||||
print(res)
|
||||
def delete(self, _id):
|
||||
res = remove_role(_id)
|
||||
if not res:
|
||||
return fail_api(message="角色删除失败")
|
||||
return success_api(message="角色删除成功")
|
||||
|
||||
Reference in New Issue
Block a user