From e80ffb7f9be04226d2a6ea9566612b06df85e580 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期三, 13 十一月 2024 17:58:14 +0800
Subject: [PATCH] 参数修改
---
app/service/user.py | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 114 insertions(+), 4 deletions(-)
diff --git a/app/service/user.py b/app/service/user.py
index 472c77a..792b9ea 100644
--- a/app/service/user.py
+++ b/app/service/user.py
@@ -1,11 +1,121 @@
-from app.models.user_model import UserModel
-from app.Log import logger
+from datetime import datetime
-async def get_user_list(db, page_size: int, page_index: int, keyword: str):
- logger.error("ffffffff")
+from app.api import pwd_context
+from app.config.config import settings
+from app.models import RoleModel, GroupModel
+from app.models.user_model import UserModel
+from Log import logger
+from app.service.bisheng import BishengService
+from app.service.ragflow import RagflowService
+
+
+async def get_user_list(db, page_index: int, page_size: int, keyword: str, role_key:str, user_id):
query = db.query(UserModel)
+ if role_key != "admin":
+ query.filter(UserModel.creator==user_id)
if keyword:
query = query.filter(UserModel.group_name.like('%{}%'.format(keyword)))
users = query.order_by(UserModel.id.desc()).limit(page_size).offset(
(page_index - 1) * page_size).all()
return {"total": query.count(), "rows": [user.to_json() for user in users]}
+
+
+async def edit_user_status(db, status: str, user_id: int):
+ try:
+ db.query(UserModel).filter(UserModel.id == user_id).update({"status":status})
+ db.commit()
+ except Exception as e:
+ logger.error(e)
+ db.rollback()
+ return False
+ return True
+
+
+async def delete_user_data(db, user_id: str):
+ try:
+ db.query(UserModel).filter(UserModel.id == user_id).delete()
+ db.commit()
+ except Exception as e:
+ logger.error(e)
+ db.rollback()
+ return False
+ return True
+
+
+async def create_user(db, user_name, email, phone, login_name, password, roles, groups, user_id):
+ try:
+ bisheng_service = BishengService(settings.sgb_base_url)
+ ragflow_service = RagflowService(settings.fwr_base_url)
+
+ # 娉ㄥ唽鍒版瘯鏄�
+ try:
+ bisheng_info = await bisheng_service.register(user_name, password)
+ except Exception as e:
+ logger.error(f"Failed to register with Bisheng: {str(e)}")
+ return False
+
+ # 娉ㄥ唽鍒皉agflow
+ try:
+ ragflow_info = await ragflow_service.register(user_name, password)
+ except Exception as e:
+ logger.error(f"Failed to register with Ragflow: {str(e)}")
+ return False
+
+ # 瀛樺偍鐢ㄦ埛淇℃伅
+ hashed_password = pwd_context.hash(password)
+ user_model = UserModel(username=user_name, hashed_password=hashed_password, email=email,ragflow_id=ragflow_info.get("id"),bisheng_id=bisheng_info.get("user_id"),
+ phone=phone,login_name=login_name)
+
+ user_model.roles = [db.get(RoleModel, roleId) for roleId in roles]
+ if groups:
+ user_model.groups = [db.get(GroupModel, groupId) for groupId in groups]
+ user_model.creator = user_id
+ db.add(user_model)
+ db.commit()
+ db.refresh(user_model)
+ except Exception as e:
+ logger.error(e)
+ db.rollback()
+ return False
+ return True
+
+
+async def edit_user_data(db, user_id, email, phone, login_name, roles, groups):
+ try:
+ user = db.query(UserModel).filter(UserModel.id == user_id).first()
+ user.email = email
+ user.phone = phone
+ user.login_name = login_name
+ user.email = email
+ user.updated_at = datetime.now()
+ user.roles = [db.get(RoleModel, roleId) for roleId in roles]
+ user.groups = [db.get(GroupModel, groupId) for groupId in groups]
+ db.commit()
+ except Exception as e:
+ logger.error(e)
+ db.rollback()
+ return False
+ return True
+
+
+async def edit_user_pwd(db, user_id, password="000000"):
+ try:
+ #TODO
+ hashed_password = pwd_context.hash(password)
+ user = db.query(UserModel).filter(UserModel.id == user_id).first()
+ user.hashed_password = hashed_password
+ db.commit()
+ except Exception as e:
+ logger.error(e)
+ db.rollback()
+ return False
+ return True
+
+
+async def get_user_info(db, page_size: int, page_index: int, keyword: str):
+ query = db.query(UserModel)
+ if keyword:
+ query = query.filter(UserModel.group_name.like('%{}%'.format(keyword)))
+ users = query.order_by(UserModel.id.desc()).limit(page_size).offset(
+ (page_index - 1) * page_size).all()
+ return {"total": query.count(), "rows": [user.to_json() for user in users]}
\ No newline at end of file
--
Gitblit v1.8.0