修改目录结构

applications/view/company/users/__init__.py

@@ -0,0 +1,40 @@
+from flask import Blueprint, request, render_template
+from flask_restful import Api
+
+from applications.common.admin import user_curd
+from applications.common.utils.http import table_api
+from applications.common.utils.rights import authorize
+from applications.models import Role
+
+users_bp = Blueprint('users', __name__, url_prefix='/users')
+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)
+
+
+# 用户增加
+@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)
+
+
+from . import profile
+from . import user_view

applications/view/company/users/profile.py

@@ -0,0 +1,56 @@
+# 个人中心
+from flask import render_template, request, make_response
+from flask_login import login_required, current_user
+from flask_restful import Resource, reqparse
+from applications.common.admin import user_curd
+from applications.common.utils.http import fail_api, success_api
+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()
+    return render_template('admin/user/profile.html', user_info=user_info, user_logs=user_logs)
+
+
+# 修改头像
+@users_bp.get('/avatar')
+@login_required
+def profile():
+    return render_template('admin/user/avatar.html')
+
+
+# 修改头像
+@users_bp.put('/updateAvatar')
+@login_required
+def update_avatar():
+    url = request.json.get("avatar").get("src")
+    if not user_curd.update_avatar(url):
+        return fail_api(msg="出错啦")
+    return success_api(msg="修改成功")
+
+
+# 修改当前用户信息
+@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):
+        return fail_api(msg="出错啦")
+    return success_api(msg="更新成功")
+
+
+@user_api.resource('/editPassword')
+class EditPassword(Resource):
+    """前用户密码"""
+
+    @login_required
+    def get(self):
+        return make_response(render_template('admin/user/edit_password.html'))
+
+    @login_required
+    def put(self):
+        res_json = request.json
+        return user_curd.edit_password(res_json=res_json)

applications/view/company/users/user_view.py

@@ -0,0 +1,108 @@
+from flask import render_template, request, make_response
+from flask_restful import Resource
+from applications.extensions import db
+
+from applications.common.admin import user_curd
+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_api.resource('/')
+class Users(Resource):
+    """用户列表数据操作"""
+
+    @authorize("admin:user:main", log=True)
+    def get(self):
+        return make_response(render_template('admin/user/main.html'))
+
+    @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(',')
+
+        if not username or not real_name or not password:
+            return fail_api(msg="账号姓名密码不得为空")
+
+        if user_curd.is_user_exists(username):
+            return fail_api(msg="用户已经存在")
+
+        _id = user_curd.add_user(username, real_name, password)
+        user_curd.add_user_role(_id, role_ids)
+
+        return success_api(msg="增加成功")
+
+
+@user_api.resource('/<user_id>')
+class CURDUser(Resource):
+    """修改用户数据"""
+
+    @authorize("admin:user:edit", log=True)
+    def get(self, user_id):
+        #  获取编辑用户信息
+        user = User.query.filter_by(id=user_id).first()
+        roles = Role.query.all()
+        checked_roles = []
+        for r in user.role:
+            checked_roles.append(r.id)
+        return make_response(
+            render_template('admin/user/edit_users.html', user=user, roles=roles, checked_roles=checked_roles))
+
+    @authorize("admin:user:remove", log=True)
+    def delete(self, user_id):
+        # 删除用户
+        res = user_curd.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):
+        # 更新用户数据
+        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(id, username, real_name, dept_id)
+        user_curd.update_user_role(_id, role_ids)
+        return success_api(msg="更新成功")
+
+
+# 批量删除
+@users_bp.delete('/batchRemove')
+@authorize("admin:user:remove", log=True)
+def batch_remove():
+    ids = request.form.getlist('ids[]')
+    user_curd.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="数据错误")