继续è°workflowï:调整目录结构

applications/common/admin/user_curd.py

@@ -24,73 +24,75 @@ def get_user_data(page, limit, filters, deptId):
     return user, count
 
 
-# 获取用户的dict数据分页器
 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, realName, password):
-    user = User(username=username, realname=realName)
+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()
+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})
+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"):
@@ -105,48 +107,48 @@ def edit_password(res_json):
     return jsonify(success=True, msg="更改成功")
 
 
-# 删除用户
-def delete_by_id(id):
-    user = User.query.filter_by(id=id).first()
+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()
+    res = User.query.filter_by(id=_id).delete()
     db.session.commit()
     return res
 
 
-# 启用用户
-def enable_status(id):
+def enable_status(_id):
+    """ 启用用户 """
     enable = 1
-    user = User.query.filter_by(id=id).update({"enable": enable})
+    user = User.query.filter_by(id=_id).update({"enable": enable})
     if user:
         db.session.commit()
         return True
     return False
 
 
-# 停用用户
-def disable_status(id):
+def disable_status(_id):
+    """ 停用用户 """
     enable = 0
-    user = User.query.filter_by(id=id).update({"enable": enable})
+    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)
+    """ 批量删除 """
+    for _id in ids:
+        delete_by_id(_id)
 
 
-def update_user_role(id, roles_list):
-    user = User.query.filter_by(id=id).first()
+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)