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

fix(修复模型名)

Browse Source
This commit is contained in:
zhengxinonly
2022-03-11 21:26:36 +08:00
parent 5333a68416
commit 1e34ef339a
18 changed files with 110 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/rights/department.py
+8 -8
View File
@@ -3,13 +3,13 @@ from flask_restful import Resource, reqparse
from common.utils.http import success_api, fail_api
from extensions import db
from models import DepartmentModels, UserModels
from models import DepartmentModel, UserModel
class DepartmentsResource(Resource):
def get(self):
dept_data = DepartmentModels.query.order_by(DepartmentModels.sort).all()
dept_data = DepartmentModel.query.order_by(DepartmentModel.sort).all()
# TODO dtree 需要返回状态信息
res = {
"status": {"code": 200, "message": "默认"},
@@ -44,7 +44,7 @@ class DepartmentsResource(Resource):
res = parser.parse_args()
dept = DepartmentModels(
dept = DepartmentModel(
parent_id=res.parent_id,
dept_name=res.dept_name,
sort=res.sort,
@@ -62,7 +62,7 @@ class DepartmentsResource(Resource):
class DepartmentResource(Resource):
def get(self, dept_id):
dept = DepartmentModels.query.filter_by(id=dept_id).first()
dept = DepartmentModel.query.filter_by(id=dept_id).first()
dept_data = {
'id': dept.id,
'dept_name': dept.dept_name,
@@ -95,15 +95,15 @@ class DepartmentResource(Resource):
"status": res.status,
"address": res.address
}
res = DepartmentModels.query.filter_by(id=dept_id).update(data)
res = DepartmentModel.query.filter_by(id=dept_id).update(data)
if not res:
return fail_api(message="更新失败")
db.session.commit()
return success_api(message="更新成功")
def delete(self, dept_id):
ret = DepartmentModels.query.filter_by(id=dept_id).delete()
UserModels.query.filter_by(dept_id=dept_id).update({"dept_id": None})
ret = DepartmentModel.query.filter_by(id=dept_id).delete()
UserModel.query.filter_by(dept_id=dept_id).update({"dept_id": None})
db.session.commit()
if ret:
return success_api(message="删除成功")
@@ -112,7 +112,7 @@ class DepartmentResource(Resource):
class DeptEnableResource(Resource):
def put(self, dept_id):
d = DepartmentModels.query.get(dept_id)
d = DepartmentModel.query.get(dept_id)
if d:
d.status = not d.status
db.session.commit()
applications/rights/rights.py
+12 -12
View File
@@ -7,7 +7,7 @@ from flask_restful import Resource, reqparse
from common.utils.http import success_api, fail_api
from extensions import db
from models import RightModels, RoleModels
from models import RightModel, RoleModel
def get_render_config():
@@ -140,15 +140,15 @@ def make_menu_tree():
# 删除权限（目前没有判断父节点自动删除子节点）
def remove_power(power_id):
power = RightModels.query.filter_by(id=power_id).first()
power = RightModel.query.filter_by(id=power_id).first()
role_id_list = []
roles = power.role
for role in roles:
role_id_list.append(role.id)
roles = RoleModels.query.filter(RoleModels.id.in_(role_id_list)).all()
roles = RoleModel.query.filter(RoleModel.id.in_(role_id_list)).all()
for p in roles:
power.role.remove(p)
r = RightModels.query.filter_by(id=power_id).delete()
r = RightModel.query.filter_by(id=power_id).delete()
db.session.commit()
return r
@@ -174,8 +174,8 @@ class RightRightsResource(Resource):
def get(self):
"""获取选择父节点"""
power = RightModels.query.all()
# power_data = marshal(power, RightModels.fields())
power = RightModel.query.all()
# power_data = marshal(power, RightModel.fields())
power_data = [
{
'powerId': item.id,
@@ -206,7 +206,7 @@ class RightPowerResource(Resource):
def post(self, power_id):
res = parser_power.parse_args()
power = RightModels(
power = RightModel(
icon=res.icon,
open_type=res.open_type,
parent_id=res.parent_id,
@@ -228,15 +228,15 @@ class RightPowerResource(Resource):
def delete(self, power_id):
# 删除权限（目前没有判断父节点自动删除子节点）
power = RightModels.query.filter_by(id=power_id).first()
power = RightModel.query.filter_by(id=power_id).first()
role_id_list = []
roles = power.role
for role in roles:
role_id_list.append(role.id)
roles = RoleModels.query.filter(RoleModels.id.in_(role_id_list)).all()
roles = RoleModel.query.filter(RoleModel.id.in_(role_id_list)).all()
for p in roles:
power.role.remove(p)
r = RightModels.query.filter_by(id=power_id).delete()
r = RightModel.query.filter_by(id=power_id).delete()
db.session.commit()
if r:
@@ -257,7 +257,7 @@ class RightPowerResource(Resource):
"url": res.power_url,
"sort": res.sort
}
power = RightModels.query.filter_by(id=power_id).update(data)
power = RightModel.query.filter_by(id=power_id).update(data)
db.session.commit()
if not power:
@@ -268,7 +268,7 @@ class RightPowerResource(Resource):
class RightPowerEnableResource(Resource):
def put(self, right_id):
power = RightModels.query.get(right_id)
power = RightModel.query.get(right_id)
if power:
power.enable = not power.enable
db.session.commit()
applications/rights/roles.py
+16 -16
View File
@@ -2,27 +2,27 @@ from flask_restful import Resource, reqparse, marshal
from common.utils.http import table_api, success_api, fail_api
from extensions import db
from models import RightModels, RoleModels, UserModels
from models import RightModel, RoleModel, UserModel
def remove_role(role_id):
""" 删除角色 """
role = RoleModels.query.filter_by(id=role_id).first()
role = RoleModel.query.filter_by(id=role_id).first()
# 删除该角色的权限
power_id_list = []
for p in role.power:
power_id_list.append(p.id)
powers = RightModels.query.filter(RightModels.id.in_(power_id_list)).all()
powers = RightModel.query.filter(RightModel.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 = UserModels.query.filter(UserModels.id.in_(user_id_list)).all()
users = UserModel.query.filter(UserModel.id.in_(user_id_list)).all()
for u in users:
role.user.remove(u)
r = RoleModels.query.filter_by(id=role_id).delete()
r = RoleModel.query.filter_by(id=role_id).delete()
db.session.commit()
return r
@@ -46,11 +46,11 @@ class RoleRolesResource(Resource):
filters = []
if res.role_name:
filters.append(RoleModels.name.like('%' + res.role_name + '%'))
filters.append(RoleModel.name.like('%' + res.role_name + '%'))
if res.role_code:
filters.append(RoleModels.code.like('%' + res.role_code + '%'))
filters.append(RoleModel.code.like('%' + res.role_code + '%'))
paginate = RoleModels.query.filter(*filters).paginate(page=res.page, per_page=res.limit, error_out=False)
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,
@@ -85,7 +85,7 @@ class RoleRoleResource(Resource):
res = parser.parse_args()
role = RoleModels(
role = RoleModel(
details=res.details,
enable=res.enable,
code=res.role_code,
@@ -116,7 +116,7 @@ class RoleRoleResource(Resource):
"details": res.details
}
role = RoleModels.query.filter_by(id=role_id).update(data)
role = RoleModel.query.filter_by(id=role_id).update(data)
db.session.commit()
if not role:
return fail_api(message="更新角色失败")
@@ -127,7 +127,7 @@ class RoleEnableResource(Resource):
"""启用用户"""
def put(self, role_id):
ret = RoleModels.query.get(role_id)
ret = RoleModel.query.get(role_id)
ret.enable = not ret.enable
db.session.commit()
@@ -141,10 +141,10 @@ class RolePowerResource(Resource):
def get(self, role_id):
# 获取角色权限
role = RoleModels.query.filter_by(id=role_id).first()
role = RoleModel.query.filter_by(id=role_id).first()
# 获取权限列表的 id
check_powers_list = [rp.id for rp in role.power]
powers = RightModels.query.all() # 获取所有的权限
powers = RightModel.query.all() # 获取所有的权限
powers = [{
'powerId': item.id,
'powerName': item.name,
@@ -176,14 +176,14 @@ class RolePowerResource(Resource):
power_list = res.power_ids.split(',')
""" 更新角色权限 """
role = RoleModels.query.filter_by(id=role_id).first()
role = RoleModel.query.filter_by(id=role_id).first()
power_id_list = []
for p in role.power:
power_id_list.append(p.id)
powers = RightModels.query.filter(RightModels.id.in_(power_id_list)).all()
powers = RightModel.query.filter(RightModel.id.in_(power_id_list)).all()
for p in powers:
role.power.remove(p)
powers = RightModels.query.filter(RightModels.id.in_(power_list)).all()
powers = RightModel.query.filter(RightModel.id.in_(power_list)).all()
for p in powers:
role.power.append(p)
db.session.commit()