使用flask-restful实现数据校验与序列化3
This commit is contained in:
zhengxinonly
@@ -1,9 +1,9 @@
|
||||
from flask import Blueprint, request, render_template
|
||||
from flask_restful import Api
|
||||
from flask_restful import Api, reqparse
|
||||
|
||||
from applications.common.utils.http import table_api
|
||||
from applications.common.utils.rights import authorize
|
||||
from applications.models import Role
|
||||
from applications.models import Role, User, Dept
|
||||
|
||||
users_bp = Blueprint('users', __name__, url_prefix='/users')
|
||||
user_api = Api(users_bp)
|
||||
@@ -13,27 +13,48 @@ user_api = Api(users_bp)
|
||||
@users_bp.get('/data')
|
||||
@authorize("admin:user:main", log=True)
|
||||
def data():
|
||||
page = request.args.get('page', type=int)
|
||||
limit = request.args.get('limit', type=int)
|
||||
real_name = request.args.get('realName', type=str)
|
||||
username = request.args.get('username', type=str)
|
||||
dept_id = request.args.get('deptId', type=int)
|
||||
filters = {}
|
||||
if real_name:
|
||||
filters["realname"] = ('%' + real_name + '%')
|
||||
if username:
|
||||
filters["username"] = ('%' + username + '%')
|
||||
user_data, count = user_curd.get_user_data_dict(page=page, limit=limit, filters=filters, deptId=dept_id)
|
||||
return table_api(data=user_data, count=count)
|
||||
parser = reqparse.RequestParser()
|
||||
parser.add_argument('page', type=int, default=1)
|
||||
parser.add_argument('limit', type=int, default=10)
|
||||
parser.add_argument('realName', type=str, dest='real_name')
|
||||
parser.add_argument('username', type=str)
|
||||
parser.add_argument('deptId', type=int, dest='dept_id', default=0)
|
||||
|
||||
res = parser.parse_args()
|
||||
|
||||
filters = []
|
||||
|
||||
if res.real_name:
|
||||
filters.append(User.realname.like('%' + res.real_name + '%'))
|
||||
if res.username:
|
||||
filters.append(User.username.like('%' + res.username + '%'))
|
||||
if res.dept_id:
|
||||
filters.append(User.dept_id == res.dept_id)
|
||||
|
||||
paginate = User.query.filter(*filters).paginate(page=res.page,
|
||||
per_page=res.limit,
|
||||
error_out=False)
|
||||
|
||||
dept_name = lambda dept_id: Dept.query.filter_by(id=dept_id).first().dept_name
|
||||
user_data = [{
|
||||
'id': item.id,
|
||||
'username': item.username,
|
||||
'realname': item.realname,
|
||||
'enable': item.enable,
|
||||
'create_at': item.create_at,
|
||||
'update_at': item.update_at,
|
||||
'dept': dept_name(item.dept_id),
|
||||
} for item in paginate.items]
|
||||
|
||||
return table_api(data=user_data, count=paginate.total)
|
||||
|
||||
|
||||
# 用户增加
|
||||
@users_bp.get('/add')
|
||||
@authorize("admin:user:add", log=True)
|
||||
def add():
|
||||
roles = Role.query.all()
|
||||
return render_template('admin/user/add.html', roles=roles)
|
||||
@users_bp.get('/')
|
||||
@authorize("admin:user:main", log=True)
|
||||
def get():
|
||||
return render_template('admin/user/main.html')
|
||||
|
||||
|
||||
from . import profile, user_curd
|
||||
from . import profile, _utils
|
||||
from . import user_view
|
||||
|
||||
@@ -0,0 +1,55 @@
|
||||
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
|
||||
from applications.models import Role
|
||||
from applications.models import AdminLog
|
||||
|
||||
|
||||
|
||||
def get_current_user_logs():
|
||||
""" 获取当前用户日志 """
|
||||
log = AdminLog.query.filter_by(url='/passport/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 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 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()
|
||||
@@ -1,18 +1,21 @@
|
||||
# 个人中心
|
||||
from flask import render_template, request, make_response
|
||||
from flask import render_template, request, make_response, jsonify
|
||||
from flask_login import login_required, current_user
|
||||
from flask_restful import Resource
|
||||
from flask_restful import Resource, reqparse
|
||||
from sqlalchemy import desc
|
||||
|
||||
from applications.common.utils.http import fail_api, success_api
|
||||
from applications.extensions import db
|
||||
from applications.models import User
|
||||
from applications.view.company.users import users_bp, user_api, user_curd
|
||||
from applications.models import User, AdminLog
|
||||
from applications.view.company.users import users_bp, user_api
|
||||
|
||||
|
||||
@users_bp.get('/center')
|
||||
@login_required
|
||||
def center():
|
||||
user_info = current_user
|
||||
user_logs = user_curd.get_current_user_logs()
|
||||
user_logs = AdminLog.query.filter_by(url='/passport/login').filter_by(uid=current_user.id).order_by(
|
||||
desc(AdminLog.create_time)).limit(10)
|
||||
return render_template('admin/user/profile.html', user_info=user_info, user_logs=user_logs)
|
||||
|
||||
|
||||
@@ -36,8 +39,18 @@ class Avatar(Resource):
|
||||
@users_bp.put('/updateInfo')
|
||||
@login_required
|
||||
def update_info():
|
||||
res_json = request.json
|
||||
if not user_curd.update_current_user_info(req_json=res_json):
|
||||
|
||||
parser = reqparse.RequestParser()
|
||||
parser.add_argument('realname', type=str, dest='real_name')
|
||||
parser.add_argument('remark', type=str)
|
||||
parser.add_argument('details', type=str)
|
||||
|
||||
res = parser.parse_args()
|
||||
|
||||
ret = User.query.filter_by(
|
||||
id=current_user.id).update({"realname": res.real_name,
|
||||
"remark": res.details})
|
||||
if not ret:
|
||||
return fail_api(msg="出错啦")
|
||||
return success_api(msg="更新成功")
|
||||
|
||||
@@ -52,5 +65,22 @@ class EditPassword(Resource):
|
||||
|
||||
@login_required
|
||||
def put(self):
|
||||
res_json = request.json
|
||||
return user_curd.edit_password(res_json=res_json)
|
||||
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(msg='确认密码不一致')
|
||||
|
||||
""" 修改当前用户密码 """
|
||||
is_right = current_user.validate_password(res.oldPassword)
|
||||
if not is_right:
|
||||
return jsonify(success=False, msg="旧密码错误")
|
||||
current_user.set_password(res.newPassword)
|
||||
db.session.add(current_user)
|
||||
db.session.commit()
|
||||
|
||||
return jsonify(success=True, msg="更改成功")
|
||||
|
||||
@@ -1,161 +0,0 @@
|
||||
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()
|
||||
@@ -1,39 +1,51 @@
|
||||
from flask import render_template, request, make_response
|
||||
from flask_restful import Resource
|
||||
from flask_restful import Resource, reqparse
|
||||
from applications.extensions import db
|
||||
|
||||
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, user_curd
|
||||
from applications.view.company.users import user_api, users_bp, _utils
|
||||
|
||||
|
||||
@user_api.resource('/')
|
||||
@user_api.resource('/add')
|
||||
class Users(Resource):
|
||||
"""用户列表数据操作"""
|
||||
|
||||
@authorize("admin:user:main", log=True)
|
||||
@authorize("admin:user:add", log=True)
|
||||
def get(self):
|
||||
return make_response(render_template('admin/user/main.html'))
|
||||
roles = Role.query.all()
|
||||
return make_response(render_template('admin/user/add.html', roles=roles))
|
||||
|
||||
@authorize("admin:user:add", log=True)
|
||||
def post(self):
|
||||
"""新建单个用户"""
|
||||
req_json = request.json
|
||||
a = req_json.get("roleIds")
|
||||
username = req_json.get('username')
|
||||
real_name = req_json.get('realName')
|
||||
password = req_json.get('password')
|
||||
role_ids = a.split(',')
|
||||
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="密码不得为空")
|
||||
|
||||
if not username or not real_name or not password:
|
||||
return fail_api(msg="账号姓名密码不得为空")
|
||||
res = parser.parse_args()
|
||||
|
||||
if user_curd.is_user_exists(username):
|
||||
role_ids = res.role_ids.split(',')
|
||||
|
||||
if _utils.is_user_exists(res.username):
|
||||
return fail_api(msg="用户已经存在")
|
||||
|
||||
_id = user_curd.add_user(username, real_name, password)
|
||||
user_curd.add_user_role(_id, role_ids)
|
||||
user = User()
|
||||
user.username = res.username
|
||||
user.realname = res.real_name
|
||||
user.set_password(res.password)
|
||||
db.session.add(user)
|
||||
db.session.commit()
|
||||
|
||||
""" 增加用户角色 """
|
||||
user = User.query.filter_by(id=user.id).first()
|
||||
roles = Role.query.filter(Role.id.in_(role_ids)).all()
|
||||
for r in roles:
|
||||
user.role.append(r)
|
||||
db.session.commit()
|
||||
|
||||
return success_api(msg="增加成功")
|
||||
|
||||
@@ -56,23 +68,32 @@ class CURDUser(Resource):
|
||||
@authorize("admin:user:remove", log=True)
|
||||
def delete(self, user_id):
|
||||
# 删除用户
|
||||
res = user_curd.delete_by_id(user_id)
|
||||
res = _utils.delete_by_id(user_id)
|
||||
if not res:
|
||||
return fail_api(msg="删除失败")
|
||||
return success_api(msg="删除成功")
|
||||
|
||||
@authorize("admin:user:edit", log=True)
|
||||
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(',')
|
||||
|
||||
# 更新用户数据
|
||||
req_json = request.json
|
||||
a = req_json.get("roleIds")
|
||||
_id = req_json.get("userId")
|
||||
username = req_json.get('username')
|
||||
real_name = req_json.get('realName')
|
||||
dept_id = req_json.get('deptId')
|
||||
role_ids = a.split(',')
|
||||
user_curd.update_user(user_id, username, real_name, dept_id)
|
||||
user_curd.update_user_role(_id, role_ids)
|
||||
User.query.filter_by(id=user_id).update({'username': res.username,
|
||||
'realname': res.real_name,
|
||||
'dept_id': res.dept_id})
|
||||
db.session.commit()
|
||||
|
||||
_utils.update_user_role(user_id, role_ids)
|
||||
|
||||
return success_api(msg="更新成功")
|
||||
|
||||
|
||||
@@ -81,27 +102,28 @@ class CURDUser(Resource):
|
||||
@authorize("admin:user:remove", log=True)
|
||||
def batch_remove():
|
||||
ids = request.form.getlist('ids[]')
|
||||
user_curd.batch_remove(ids)
|
||||
_utils.batch_remove(ids)
|
||||
return success_api(msg="批量删除成功")
|
||||
|
||||
|
||||
@users_bp.put('/enable')
|
||||
def user_enable():
|
||||
# 启用或者禁用用户 enable disable
|
||||
user_id = request.json.get('userId')
|
||||
operate = request.json.get('operate')
|
||||
user_id = int(user_id)
|
||||
operate = int(operate)
|
||||
if user_id:
|
||||
if operate == 1:
|
||||
user = User.query.filter_by(id=user_id).update({"enable": operate})
|
||||
message = success_api(msg="启动成功")
|
||||
else:
|
||||
user = User.query.filter_by(id=user_id).update({"enable": operate})
|
||||
message = success_api(msg="禁用成功")
|
||||
if user:
|
||||
db.session.commit()
|
||||
else:
|
||||
return fail_api(msg="出错啦")
|
||||
return message
|
||||
return fail_api(msg="数据错误")
|
||||
|
||||
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 = User.query.filter_by(id=res.user_id).update({"enable": res.operate})
|
||||
message = success_api(msg="启动成功")
|
||||
else:
|
||||
user = User.query.filter_by(id=res.user_id).update({"enable": res.operate})
|
||||
message = success_api(msg="禁用成功")
|
||||
if user:
|
||||
db.session.commit()
|
||||
else:
|
||||
return fail_api(msg="出错啦")
|
||||
return message
|
||||
|
||||
Reference in New Issue
Block a user