bwadmin/pear-admin-flask
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

'wip(semantic):调整模板api接口'

Browse Source
This commit is contained in:
zhengxinonly
2021-09-12 18:16:02 +08:00
parent b9c449ad57
commit 550f99e468
30 changed files with 259 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/api/rights/department.py
+8 -8
View File
@@ -49,7 +49,7 @@ class Departments(Resource):
db.session.add(dept)
db.session.commit()
return success_api(msg="成功")
return success_api(message="成功")
class Department(Resource):
@@ -67,7 +67,7 @@ class Department(Resource):
'address': dept.address,
}
# return make_response(render_template('department/edit.html', dept=dept))
return jsonify(success=True, msg='ok', dept=dept_data)
return dict(success=True, message='ok', dept=dept_data)
@authorize("admin:dept:edit", log=True)
def put(self, dept_id):
@@ -92,9 +92,9 @@ class Department(Resource):
}
res = CompanyDepartment.query.filter_by(id=dept_id).update(data)
if not res:
return fail_api(msg="更新失败")
return fail_api(message="更新失败")
db.session.commit()
return success_api(msg="更新成功")
return success_api(message="更新成功")
@authorize("admin:dept:remove", log=True)
def delete(self, dept_id):
@@ -102,8 +102,8 @@ class Department(Resource):
CompanyUser.query.filter_by(dept_id=dept_id).update({"dept_id": None})
db.session.commit()
if ret:
return success_api(msg="删除成功")
return fail_api(msg="删除失败")
return success_api(message="删除成功")
return fail_api(message="删除失败")
class DeptEnable(Resource):
@@ -114,5 +114,5 @@ class DeptEnable(Resource):
d.status = not d.status
db.session.commit()
message = '修改成功'
return success_api(msg=message)
return fail_api(msg="出错啦")
return success_api(message=message)
return fail_api(message="出错啦")
applications/api/rights/rights.py
+10 -10
View File
@@ -166,13 +166,13 @@ class RightRights(Resource):
"data": power_data
}
return jsonify(res)
return res
@authorize("admin:power:remove", log=True)
def delete(self):
ids = request.form.getlist('ids[]')
batch_remove_power(ids)
return success_api(msg="批量删除成功")
return success_api(message="批量删除成功")
class RightPower(Resource):
@@ -196,9 +196,9 @@ class RightPower(Resource):
db.session.commit()
except Exception as e:
print(e)
return fail_api(msg='数据提交失败')
return fail_api(message='数据提交失败')
return success_api(msg="成功")
return success_api(message="成功")
@authorize("admin:power:remove", log=True)
def delete(self, power_id):
@@ -215,9 +215,9 @@ class RightPower(Resource):
db.session.commit()
if r:
return success_api(msg="删除成功")
return success_api(message="删除成功")
else:
return fail_api(msg="删除失败")
return fail_api(message="删除失败")
@authorize("admin:power:edit", log=True)
def put(self, power_id):
@@ -237,8 +237,8 @@ class RightPower(Resource):
db.session.commit()
if not power:
return fail_api(msg="更新权限失败")
return success_api(msg="更新权限成功")
return fail_api(message="更新权限失败")
return success_api(message="更新权限成功")
class RightPowerEnable(Resource):
@@ -250,9 +250,9 @@ class RightPowerEnable(Resource):
power.enable = not power.enable
db.session.commit()
message = "修改成功"
return success_api(msg=message)
return success_api(message=message)
else:
return fail_api(msg="出错啦")
return fail_api(message="出错啦")
class AdminConfigs(Resource):
applications/api/rights/roles.py
+20 -26
View File
@@ -57,18 +57,16 @@ class RoleRoles(Resource):
paginate = RightsRole.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_at,
} for item in paginate.items
], count=paginate.total, code=0)
return table_api(result={'items': [{'id': item.id,
'roleName': item.name,
'roleCode': item.code,
'enable': item.enable,
'remark': item.remark,
'details': item.details,
'sort': item.sort,
'create_at': str(item.create_at), } for item in paginate.items],
'total': paginate.total}
, code=0)
@authorize("admin:role:remove", log=True)
@login_required
@@ -79,7 +77,7 @@ class RoleRoles(Resource):
res = parser.parse_args()
batch_remove_role(res.ids)
return success_api(msg="批量删除成功")
return success_api(message="批量删除成功")
class RoleRole(Resource):
@@ -104,7 +102,7 @@ class RoleRole(Resource):
)
db.session.add(role)
db.session.commit()
return success_api(msg="成功")
return success_api(message="成功")
# 更新角色
@authorize("admin:role:edit", log=True)
@@ -130,8 +128,8 @@ class RoleRole(Resource):
role = RightsRole.query.filter_by(id=role_id).update(data)
db.session.commit()
if not role:
return fail_api(msg="更新角色失败")
return success_api(msg="更新角色成功")
return fail_api(message="更新角色失败")
return success_api(message="更新角色成功")
class RoleEnable(Resource):
@@ -145,8 +143,8 @@ class RoleEnable(Resource):
message = "修改成功"
if not ret:
return fail_api(msg="出错啦")
return success_api(msg=message)
return fail_api(message="出错啦")
return success_api(message=message)
class RolePower(Resource):
@@ -158,20 +156,16 @@ class RolePower(Resource):
# 获取权限列表的 id
check_powers_list = [rp.id for rp in role.power]
powers = RightsPower.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 = {
return {
"data": powers,
"status": {"code": 200, "message": "默认"}
}
return jsonify(res)
# 保存角色权限
@authorize("admin:role:edit", log=True)
@@ -195,7 +189,7 @@ class RolePower(Resource):
for p in powers:
role.power.append(p)
db.session.commit()
return success_api(msg="授权成功")
return success_api(message="授权成功")
# 角色删除
@authorize("admin:role:remove", log=True)
@@ -204,5 +198,5 @@ class RolePower(Resource):
res = remove_role(role_id)
print(res)
if not res:
return fail_api(msg="角色删除失败")
return success_api(msg="角色删除成功")
return fail_api(message="角色删除失败")
return success_api(message="角色删除成功")