From ac9373fd6f0db53c983d87c4790cb627e82759e9 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 25 二月 2025 17:25:39 +0800
Subject: [PATCH] merge
---
app/service/user.py | 206 +++++++++++++++++++++++++++++++--------------------
1 files changed, 124 insertions(+), 82 deletions(-)
diff --git a/app/service/user.py b/app/service/user.py
index 09a82ad..d11683e 100644
--- a/app/service/user.py
+++ b/app/service/user.py
@@ -1,21 +1,15 @@
import time
+import uuid
from datetime import datetime
-
from app.api import pwd_context
-from app.api.dialog import dialog_list
-from app.config.config import settings
-from app.config.const import RAGFLOW, BISHENG, DIFY, USER_STATSU_DELETE
-from app.models import RoleModel, GroupModel, AgentType, role_resource_table, DialogModel, OrganizationModel
+from app.config.const import RAGFLOW, BISHENG, DIFY, USER_STATSU_DELETE, ROLE_STATUS_ON, DEPT_STATUS_ON, \
+ Dialog_STATSU_ON
+from app.models import RoleModel, GroupModel, AgentType, role_resource_table, DialogModel, OrganizationModel, \
+ ResourceModel
from app.models.menu_model import WebMenuModel, MenuCapacityModel
from app.models.user_model import UserModel, UserAppModel
from Log import logger
-from app.service.auth import UserAppDao
-from app.service.bisheng import BishengService
-from app.service.v2.app_register import AppRegisterDao
-from app.service.difyService import DifyService
-from app.service.ragflow import RagflowService
-from app.service.service_token import get_ragflow_token, get_bisheng_token, get_new_token, get_dify_token
-from app.utils.password_handle import generate_password
+
async def get_user_list(db, page_index: int, page_size: int, keyword: str, role_key: str, user_id):
@@ -54,10 +48,13 @@
async def create_user(db, user_name, email, phone, login_name, password, roles, groups, user_id):
try:
- app_register = AppRegisterDao(db).get_apps()
+
register_dict = {}
token = ""
- app_password = generate_password()
+
+ """
+ app_password = await generate_password()
+ app_register = AppRegisterDao(db).get_apps()
for app in app_register:
if app["id"] == RAGFLOW:
service = RagflowService(settings.fwr_base_url)
@@ -78,34 +75,39 @@
except Exception as e:
logger.error(e)
return False
-
+ """
# 瀛樺偍鐢ㄦ埛淇℃伅
hashed_password = pwd_context.hash(password)
-
+ sync_flag = str(uuid.uuid4())
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)
- pwd = user_model.encrypted_password(app_password)
+ phone=phone, login_name=login_name,sync_flag=sync_flag)
+ # pwd = user_model.encrypted_password(app_password)
+ # user_model.password = pwd
user_model.roles = [db.get(RoleModel, roleId) for roleId in roles]
- user_model.password = pwd
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)
+ """
u_id = user_model.id
+ user_app_dao = UserAppDao(db)
for k, v in register_dict.items():
- await UserAppDao(db).update_and_insert_data(v.get("name"), pwd, v.get("email"), u_id, str(v.get("id")), k)
+ await user_app_dao.update_and_insert_data(v.get("name"), pwd, v.get("email"), u_id, str(v.get("id")), k)
+ """
except Exception as e:
logger.error(e)
# db.rollback()
- return False
- return True
+ return ''
+ return sync_flag
async def edit_user_data(db, user_id, email, phone, login_name, roles, groups):
try:
+ print(121221)
+ print(roles)
user = db.query(UserModel).filter(UserModel.id == user_id).first()
user.email = email
user.phone = phone
@@ -115,6 +117,7 @@
user.roles = [db.get(RoleModel, roleId) for roleId in roles]
# user.groups = [db.get(GroupModel, groupId) for groupId in groups]
db.commit()
+ print(4343)
except Exception as e:
logger.error(e)
db.rollback()
@@ -168,6 +171,8 @@
user = db.query(UserModel).filter(UserModel.id==user_id,UserModel.status !=USER_STATSU_DELETE).first()
await role_resource(role_set, roles, permissions, user.roles)
for ogt in user.organizations:
+ if ogt.status != DEPT_STATUS_ON:
+ continue
dept.append(ogt.to_json())
if ogt.roles:
await role_resource(role_set, roles, permissions, user.roles)
@@ -185,11 +190,11 @@
async def role_resource(role_set, role_list, permissions, roles):
for role in roles:
- if role.id not in role_set:
+ if role.id not in role_set and role.status == ROLE_STATUS_ON:
role_set.add(role.id)
role_list.append(role.to_dict())
for r in role.resources:
- if r.resource_type_id == "1":
+ if r.resource_type_id == "1" and r.status==DEPT_STATUS_ON:
permissions.add(r.perms)
@@ -198,43 +203,73 @@
role_set = set()
dept_set = set()
user = db.query(UserModel).filter_by(id=user_id).first()
+ parent_resource = db.query(ResourceModel).filter(ResourceModel.status == DEPT_STATUS_ON, ResourceModel.resource_id == None).first()
parent_id = ""
-
- async def role_resource(role_set, permissions, roles):
- nonlocal parent_id
- for role in roles:
- if role.id not in role_set:
- role_set.add(role.id)
-
- for r in role.resources:
- if r.resource_type_id != "1":
- if not r.resource_id:
- parent_id = r.id
- continue
- permissions[r.id] = r.to_router_dict()
-
- await role_resource(role_set, permissions, user.roles)
- for ogt in user.organizations:
- if ogt.roles:
- await role_resource(role_set, permissions, user.roles)
- parent_ogt = ogt.parent
- while parent_ogt:
- if parent_ogt.id not in dept_set:
- await role_resource(role_set, permissions, parent_ogt.roles)
- dept_set.add(parent_ogt.id)
- parent_ogt = parent_ogt.parent
- else:
- break
+ print(user_id)
+ if parent_resource:
+ parent_id = parent_resource.id
tmp_dit = {}
- for permission in permissions.values():
- tmp_dit[permission["parentId"]] = tmp_dit.get(permission["parentId"], []) + [permission]
+ if user.permission == "admin":
+ dept_list = db.query(ResourceModel).filter(ResourceModel.status==DEPT_STATUS_ON, ResourceModel.resource_type_id != "1").all()
+ for dept in dept_list:
+ permissions[dept.id] = dept
+ else:
+ async def role_resource(role_set, permissions, roles):
+ nonlocal parent_id
+ for role in roles:
+ print(role.name)
+ if role.id not in role_set and role.status == ROLE_STATUS_ON:
+ role_set.add(role.id)
+ for r in role.resources:
+ if r.resource_type_id != "1" and r.status==DEPT_STATUS_ON:
+ permissions[r.id] = r
+
+ await role_resource(role_set, permissions, user.roles)
+ for ogt in user.organizations:
+ print(ogt.name)
+ if ogt.status != DEPT_STATUS_ON:
+ continue
+ print(ogt.name)
+ if ogt.roles:
+ print(9877)
+ await role_resource(role_set, permissions,ogt.roles)
+ parent_ogt = ogt.parent
+ while parent_ogt:
+ if parent_ogt.id not in dept_set:
+ await role_resource(role_set, permissions, parent_ogt.roles)
+ dept_set.add(parent_ogt.id)
+ parent_ogt = parent_ogt.parent
+ else:
+ break
+ # print(permissions.keys())
+ def get_parent(parent, permissions):
+ # print(parent.id)
+ # nonlocal permissions
+ if parent.id not in permissions:
+
+ permissions[parent.id] = parent # .to_router_dict()
+ # print(permissions.keys())
+ parent = parent.parent
+ if parent:
+ get_parent(parent, permissions)
+ # permission_list = []
+ for permission in list(permissions.values()):
+ if permission.parent:
+ get_parent(permission.parent, permissions)
+
+ permission_list = [p.to_router_dict() for p in permissions.values()]
+ for permission in permission_list:
+ tmp_dit[permission["parentId"]] = tmp_dit.get(permission["parentId"], []) + [permission]
+ # print(permissions.keys())
def get_child(parent_id):
- res = permissions[parent_id]
+ # if parent_id in tmp_dit:
+ res = permissions[parent_id].to_router_dict()
res["children"] = [get_child(i["id"]) for i in tmp_dit.get(parent_id, [])]
return res
-
- return {"routers": [get_child(i["id"]) for i in tmp_dit.get(parent_id, [])]}
+ select_list = [get_child(i["id"]) for i in tmp_dit.get(parent_id, [])]
+ sorted_permission_list = sorted(select_list, key=lambda x: x['seq'], reverse=True)
+ return {"routers": sorted_permission_list}
async def get_user_menus(db, user_id):
@@ -243,12 +278,17 @@
res = []
# print(user_id)
user = db.query(UserModel).filter_by(id=user_id).first()
- for group in user.groups:
- for dialog in group.dialogs:
- dialog_list.append(dialog.id)
+ if user.permission == "admin":
+ dialog_list = [i.id for i in db.query(DialogModel).filter(DialogModel.status==Dialog_STATSU_ON).all()]
+ else:
+ for group in user.groups:
+ for dialog in group.dialogs:
+ dialog_list.append(dialog.id)
+
+
# print(dialog_list)
menu_list = db.query(WebMenuModel.id, WebMenuModel.title, WebMenuModel.describe, WebMenuModel.icon, WebMenuModel.desc,WebMenuModel.rank,
- WebMenuModel.img, MenuCapacityModel.capacity_id, MenuCapacityModel.capacity_type, MenuCapacityModel.chat_id.label("agentId")).outerjoin(
+ WebMenuModel.img, MenuCapacityModel.capacity_id, MenuCapacityModel.capacity_type, MenuCapacityModel.chat_id.label("agentId"), MenuCapacityModel.chat_type).outerjoin(
MenuCapacityModel, WebMenuModel.id == MenuCapacityModel.menu_id).outerjoin(
DialogModel, MenuCapacityModel.capacity_id == DialogModel.id).filter(DialogModel.status=="1").all()
@@ -264,14 +304,16 @@
break
else:
res.append({
- 'id': menus[0].id,
- 'title': menus[0].title,
+ 'menuId': menus[0].id,
+ 'name': menus[0].title,
'icon': menus[0].icon,
'img': menus[0].img,
'desc': menus[0].desc,
'dialog': menus[0].describe,
- 'agentId': menus[0].agentId,
- 'rank': menus[0].rank
+ 'id': menus[0].agentId,
+ 'rank': menus[0].rank,
+ 'agent_type': menus[0].capacity_type,
+ 'type': menus[0].chat_type
})
return sorted(res, key=lambda x: x['rank'], reverse=True)
@@ -285,8 +327,8 @@
knowledge_dict = {}
user = db.query(UserModel).filter_by(id=user_id).first()
parent_id = ""
- # print(111111111111111)
- async def role_resource(role_set, permissions, roles):
+
+ async def role_resource_type(role_set, permissions, roles, type):
nonlocal parent_id
for role in roles:
if role.id not in role_set:
@@ -294,36 +336,36 @@
for r in role.resources:
if r.resource_type_id != "1":
- if not r.resource_id:
- parent_id = r.id
- continue
- permissions[r.id] = r.to_router_dict()
+ permission_dict = r.to_router_dict()
+ permission_dict["type"] = type
+ permissions[r.id] = permission_dict
- await role_resource(role_set, permissions, user.roles)
+ await role_resource_type(role_set, permissions, user.roles, "user")
for ogt in user.organizations:
if ogt.roles:
- await role_resource(role_set, permissions, user.roles)
+ await role_resource_type(role_set, permissions, ogt.roles, "org")
parent_ogt = ogt.parent
while parent_ogt:
if parent_ogt.id not in dept_set:
- await role_resource(role_set, permissions, parent_ogt.roles)
+ await role_resource_type(role_set, permissions, parent_ogt.roles, "org")
dept_set.add(parent_ogt.id)
parent_ogt = parent_ogt.parent
else:
break
- tmp_dit = {}
- for permission in permissions.values():
- tmp_dit[permission["parentId"]] = tmp_dit.get(permission["parentId"], []) + [permission]
+ # tmp_dit = {}
+ # for permission in permissions.values():
+ # tmp_dit[permission["parentId"]] = tmp_dit.get(permission["parentId"], []) + [permission]
+ #
+ # def get_child(parent_id):
+ # res = permissions[parent_id]
+ # res["children"] = [get_child(i["id"]) for i in tmp_dit.get(parent_id, [])]
+ # return res
- def get_child(parent_id):
- res = permissions[parent_id]
- res["children"] = [get_child(i["id"]) for i in tmp_dit.get(parent_id, [])]
- return res
-
- res["menus"] = [get_child(i["id"]) for i in tmp_dit.get(parent_id, [])]
+ # res["menus"] = [get_child(i["id"]) for i in tmp_dit.get(parent_id, [])]
+ res["menus"] = list(permissions.values())
for group in user.groups:
for klg in group.knowledges:
knowledge_dict[klg.id] = klg.to_json()
@@ -337,7 +379,7 @@
async def get_user_dept(db, user_id):
res = {}
user = db.query(UserModel).filter_by(id=user_id).first()
- res["rows"] = [i.to_dict() for i in user.organizations]
+ res["rows"] = [i.to_dict() for i in user.organizations if i.status == DEPT_STATUS_ON]
return res
--
Gitblit v1.8.0