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

wip:(重构接口实现方式3)

Browse Source
This commit is contained in:
zhengxinonly
2022-05-10 23:43:33 +08:00
parent 7e6aecc99b
commit 0d25b479e5
7 changed files with 117 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/users/__init__.py
+10 -12
View File
@@ -1,16 +1,14 @@
from flask_restful import Api from common import register_api
from .user import UserApi, user_role_resource, user_info
from .profile import UserStatusResource, UserAvatarResource, UserInfoResource, UserPasswordResource
from .user import UserUsersResource, UserUserResource, UserRoleResource
def register_users_api(api_bp): def register_users_api(api_bp):
users_api = Api(api_bp, prefix='/users') api_bp.add_url_rule('/users/user/<int:_id>/<action>',
view_func=user_info,
methods=['PUT'])
users_api.add_resource(UserInfoResource, '/user/<int:user_id>/info') register_api(UserApi, 'users_api', '/users/user/', pk='_id', app=api_bp)
users_api.add_resource(UserStatusResource, '/user/<int:user_id>/status')
users_api.add_resource(UserAvatarResource, '/user/<int:user_id>/avatar') api_bp.add_url_rule('/users/user/<int:_id>/role',
users_api.add_resource(UserPasswordResource, '/user/<int:user_id>/password') view_func=user_role_resource,
users_api.add_resource(UserUsersResource, '/users') methods=['PUT'])
users_api.add_resource(UserUserResource, '/user/<int:user_id>')
users_api.add_resource(UserRoleResource, '/user/<int:user_id>/role')
applications/users/profile.py
+2 -83
View File
@@ -1,91 +1,10 @@
# 个人中心 # 个人中心
from flask import request, jsonify from flask import request, jsonify
from flask_restful import Resource, reqparse from flask.views import MethodView
from flask_restful import reqparse
from common.utils.http import fail_api, success_api from common.utils.http import fail_api, success_api
from extensions import db from extensions import db
from models import UserModel from models import UserModel
class UserStatusResource(Resource):
def put(self, user_id):
# 启用或者禁用用户 enable disable
parser = reqparse.RequestParser()
parser.add_argument('userId', type=int, required=True, dest='user_id')
parser.add_argument('operate', type=int, required=True, dest='operate', choices=[0, 1])
res = parser.parse_args()
if res.operate == 1:
user = UserModel.query.get(user_id)
user.enable = res.operate
message = success_api(message="启动成功")
else:
user = UserModel.query.filter_by(id=res.user_id).update({"enable": res.operate})
message = success_api(message="禁用成功")
if user:
db.session.commit()
else:
return fail_api(message="出错啦")
return message
class UserAvatarResource(Resource):
"""修改头像"""
def put(self, user_id):
url = request.json.get("avatar").get("src")
ret = UserModel.query.get(user_id)
ret.avatar = url
db.session.commit()
if not ret:
return fail_api(message="出错啦")
return success_api(message="修改成功")
class UserInfoResource(Resource):
def put(self, user_id):
parser = reqparse.RequestParser()
parser.add_argument('realName', type=str, dest='real_name')
parser.add_argument('username', type=str)
parser.add_argument('remark', type=str)
parser.add_argument('details', type=str)
res = parser.parse_args()
ret = UserModel.query.get(user_id)
ret.username = res.username
ret.realname = res.real_name
ret.remark = res.details
db.session.commit()
if not ret:
return fail_api(message="出错啦")
return success_api(message="更新成功")
class UserPasswordResource(Resource):
"""前用户密码"""
def put(self, user_id):
parser = reqparse.RequestParser()
parser.add_argument('oldPassword', type=str, required=True, help='旧密码不得为空')
parser.add_argument('newPassword', type=str, required=True, help='新密码不得为空')
parser.add_argument('confirmPassword', type=str, required=True, help='确认密码不能为空')
res = parser.parse_args()
if res.newPassword != res.confirmPassword:
return fail_api(message='确认密码不一致')
""" 修改当前用户密码 """
user = UserModel.query.get(user_id)
is_right = user.validate_password(res.oldPassword)
if not is_right:
return jsonify(success=False, message="旧密码错误")
user.set_password(res.newPassword)
db.session.add(user)
db.session.commit()
return jsonify(success=True, message="更改成功")
applications/users/user.py
+98 -62
View File
@@ -1,6 +1,7 @@
from flask import request from flask import request, jsonify
from flask.views import MethodView
from flask_login import current_user from flask_login import current_user
from flask_restful import Resource, reqparse from flask_restful import reqparse
from sqlalchemy import desc from sqlalchemy import desc
from common.utils.http import fail_api, success_api, table_api from common.utils.http import fail_api, success_api, table_api
@@ -56,10 +57,17 @@ def update_user_role(_id, roles_list):
db.session.commit() db.session.commit()
class UserUsersResource(Resource): def users_delete():
"""用户列表数据操作""" """批量删除"""
ids = request.form.getlist('ids[]')
batch_remove(ids)
return success_api(message="批量删除成功")
def get(self):
class UserApi(MethodView):
"""修改用户数据"""
def get(self, _id):
parser = reqparse.RequestParser() parser = reqparse.RequestParser()
parser.add_argument('page', type=int, default=1) parser.add_argument('page', type=int, default=1)
parser.add_argument('limit', type=int, default=10) parser.add_argument('limit', type=int, default=10)
@@ -127,73 +135,101 @@ class UserUsersResource(Resource):
return success_api(message="增加成功", code=0) return success_api(message="增加成功", code=0)
def delete(self): def delete(self, _id):
"""批量删除"""
ids = request.form.getlist('ids[]')
batch_remove(ids)
return success_api(message="批量删除成功")
class UserUserResource(Resource):
"""修改用户数据"""
def post(self, user_id):
"""新建单个用户"""
parser = reqparse.RequestParser()
parser.add_argument("roleIds", type=str, dest='role_ids')
parser.add_argument("username", type=str, required=True, help="用户名不能为空")
parser.add_argument("realName", type=str, required=True, help="真实姓名不能为空", dest='real_name')
parser.add_argument("password", type=str, required=True, help="密码不得为空")
res = parser.parse_args()
role_ids = res.role_ids.split(',')
if is_user_exists(res.username):
return fail_api(message="用户已经存在")
user = UserModel()
user.username = res.username
user.realname = res.real_name
user.set_password(res.password)
db.session.add(user)
db.session.commit()
""" 增加用户角色 """
user = UserModel.query.filter_by(id=user.id).first()
roles = RoleModel.query.filter(RoleModel.id.in_(role_ids)).all()
for r in roles:
user.role.append(r)
db.session.commit()
return success_api(message="增加成功", code=0)
def delete(self, user_id):
# 删除用户 # 删除用户
res = delete_by_id(user_id) res = delete_by_id(_id)
if not res: if not res:
return fail_api(message="删除失败") return fail_api(message="删除失败")
return success_api(message="删除成功") return success_api(message="删除成功")
class UserRoleResource(Resource): def user_role_resource(_id):
def put(self, user_id): parser = reqparse.RequestParser()
parser.add_argument('roleIds', type=str, dest='role_ids')
parser.add_argument('userId', type=str, dest='user_id')
parser.add_argument('username', type=str)
parser.add_argument('realName', type=str, dest='real_name')
parser.add_argument('deptId', type=str, dest='dept_id')
res = parser.parse_args()
role_ids = res.role_ids.split(',')
# 更新用户数据
UserModel.query.filter_by(id=_id).update({'username': res.username,
'realname': res.real_name,
'dept_id': res.dept_id})
db.session.commit()
update_user_role(_id, role_ids)
return success_api(message="更新成功")
def user_info(_id, action):
if action == 'info':
parser = reqparse.RequestParser() parser = reqparse.RequestParser()
parser.add_argument('roleIds', type=str, dest='role_ids')
parser.add_argument('userId', type=str, dest='user_id')
parser.add_argument('username', type=str)
parser.add_argument('realName', type=str, dest='real_name') parser.add_argument('realName', type=str, dest='real_name')
parser.add_argument('deptId', type=str, dest='dept_id') parser.add_argument('username', type=str)
parser.add_argument('remark', type=str)
parser.add_argument('details', type=str)
res = parser.parse_args() res = parser.parse_args()
role_ids = res.role_ids.split(',')
# 更新用户数据 ret = UserModel.query.get(_id)
UserModel.query.filter_by(id=user_id).update({'username': res.username, ret.username = res.username
'realname': res.real_name, ret.realname = res.real_name
'dept_id': res.dept_id}) ret.remark = res.details
db.session.commit()
if not ret:
return fail_api(message="出错啦")
return success_api(message="更新成功")
elif action == 'status':
parser = reqparse.RequestParser()
parser.add_argument('userId', type=int, required=True, dest='user_id')
parser.add_argument('operate', type=int, required=True, dest='operate', choices=[0, 1])
res = parser.parse_args()
if res.operate == 1:
user = UserModel.query.get(_id)
user.enable = res.operate
message = success_api(message="启动成功")
else:
user = UserModel.query.filter_by(id=res.user_id).update({"enable": res.operate})
message = success_api(message="禁用成功")
if user:
db.session.commit()
else:
return fail_api(message="出错啦")
return message
elif action == 'avatar':
url = request.json.get("avatar").get("src")
ret = UserModel.query.get(_id)
ret.avatar = url
db.session.commit()
if not ret:
return fail_api(message="出错啦")
return success_api(message="修改成功")
elif action == 'password':
parser = reqparse.RequestParser()
parser.add_argument('oldPassword', type=str, required=True, help='旧密码不得为空')
parser.add_argument('newPassword', type=str, required=True, help='新密码不得为空')
parser.add_argument('confirmPassword', type=str, required=True, help='确认密码不能为空')
res = parser.parse_args()
if res.newPassword != res.confirmPassword:
return fail_api(message='确认密码不一致')
""" 修改当前用户密码 """
user = UserModel.query.get(_id)
is_right = user.validate_password(res.oldPassword)
if not is_right:
return jsonify(success=False, message="旧密码错误")
user.set_password(res.newPassword)
db.session.add(user)
db.session.commit() db.session.commit()
update_user_role(user_id, role_ids) return jsonify(success=True, message="更改成功")
else:
return success_api(message="更新成功") return jsonify(success=False, message="操作有误")
templates/admin/file/photo.html
+2 -2
View File
@@ -95,9 +95,9 @@
] ]
table.render({ table.render({
parseData: parserTableData, /* 服务器返回的数据格式与layui 不一致，需要进行转化*/ parseData: parserTableData, /* 服务器返回的数据格式与 layui 不一致，需要进行转化*/
elem: '#tables', elem: '#tables',
url: '/api/v1/file/photos', url: '/api/v1/file/photo',
page: true, page: true,
cols: get_columns(), cols: get_columns(),
skin: 'line', skin: 'line',
templates/admin/users/users.html
+3 -3
View File
@@ -120,7 +120,7 @@
table.render({ table.render({
parseData: parserTableData, parseData: parserTableData,
elem: '#tables', elem: '#tables',
url: '/api/v1/users/users', url: '/api/v1/users/user',
page: true, page: true,
cols: get_columns(), cols: get_columns(),
skin: 'line', skin: 'line',
@@ -134,7 +134,7 @@
dtree.render({ dtree.render({
elem: '#dept-tree', elem: '#dept-tree',
method: 'get', method: 'get',
url: '/api/v1/dept/departments', url: '/api/v1/dept/department',
dataFormat: 'list', dataFormat: 'list',
line: true, line: true,
skin: 'laySimple', skin: 'laySimple',
@@ -256,7 +256,7 @@
let loading = layer.load() let loading = layer.load()
$.ajax({ $.ajax({
url: '/api/v1/users/users', url: '/api/v1/users/user',
data: { ids: ids }, data: { ids: ids },
dataType: 'json', dataType: 'json',
type: 'delete', type: 'delete',
templates/admin/users/users_add.html
+1 -1
View File
@@ -76,7 +76,7 @@
data.field.roleIds = roleIds data.field.roleIds = roleIds
$.ajax({ $.ajax({
url: '/api/v1/users/users', url: '/api/v1/users/user',
data: JSON.stringify(data.field), data: JSON.stringify(data.field),
dataType: 'json', dataType: 'json',
contentType: 'application/json', contentType: 'application/json',
templates/admin/users/users_edit.html
+1 -1
View File
@@ -79,7 +79,7 @@
dtree.renderSelect({ dtree.renderSelect({
elem: '#selectParent', elem: '#selectParent',
url: '/api/v1/dept/departments', url: '/api/v1/dept/department',
method: 'get', method: 'get',
selectInputName: { nodeId: 'deptId', context: 'deptName' }, selectInputName: { nodeId: 'deptId', context: 'deptName' },
skin: 'layui', skin: 'layui',