From c272f86e0d0243737849bbd73627debdb5867dc3 Mon Sep 17 00:00:00 2001
From: xuyonghao <898441624@qq.com>
Date: 星期四, 05 十二月 2024 11:34:44 +0800
Subject: [PATCH] 获取知识库列表
---
app/api/knowledge.py | 19 ++++++-------------
app/service/knowledge.py | 32 ++++++++++++++++----------------
2 files changed, 22 insertions(+), 29 deletions(-)
diff --git a/app/api/knowledge.py b/app/api/knowledge.py
index 625d591..c0e97ab 100644
--- a/app/api/knowledge.py
+++ b/app/api/knowledge.py
@@ -11,19 +11,12 @@
@knowledge_router.get("/list", response_model=Response)
async def knowledge_list(
+ current: int,
+ pageSize: int,
current_user: UserModel = Depends(get_current_user),
- page: Optional[int] = Query(None, description="Page number", gt=0),
- num: Optional[int] = Query(18, description="Number of items per page", gt=0),
db=Depends(get_db)):
- getknowledgelist = await get_knowledge_list(db, current_user.id)
- if page is None:
- return Response(code=200, msg="", data={"rows": getknowledgelist["rows"][0:num]})
+ if current and not pageSize:
+ return ResponseList(code=400, msg="缂哄皯鍙傛暟")
+ getknowledgelist = await get_knowledge_list(db, current_user.id, pageSize, current)
- start = (page - 1) * num
- end = start + num
-
- if start >= len(getknowledgelist):
- raise HTTPException(status_code=404, detail="Page not found")
- print(getknowledgelist)
-
- return Response(code=200, msg="", data={"rows": getknowledgelist["rows"][start:end]})
\ No newline at end of file
+ return Response(code=200, msg="", data={"rows": getknowledgelist})
diff --git a/app/service/knowledge.py b/app/service/knowledge.py
index c0121fa..043db0f 100644
--- a/app/service/knowledge.py
+++ b/app/service/knowledge.py
@@ -1,26 +1,26 @@
-from app.models import KnowledgeModel, GroupModel
+from app.models import KnowledgeModel, group_knowledge_table
from app.models.user_model import UserModel
from Log import logger
-async def get_knowledge_list(db, user_id):
+async def get_knowledge_list(db, user_id, page_size, page_index):
user = db.query(UserModel).filter(UserModel.id == user_id).first()
if user is None:
return {"rows": []}
if user.permission == "admin":
- kld_list = db.query(KnowledgeModel).all()
+ query = db.query(KnowledgeModel)
else:
- user = db.query(UserModel).filter(UserModel.id == user_id).first()
-
group_list = [i.id for i in user.groups]
-
- kld_list = db.query(KnowledgeModel).filter(KnowledgeModel.tenant_id == user_id).all()
- kld_set = set([i.id for i in kld_list])
- for group in db.query(GroupModel).filter(GroupModel.id.in_(group_list)).all():
- for k in group.knowledges:
- if k.id not in kld_set:
- kld_list.append(k)
- kld_set.add(k.id)
-
- return {"rows": [kld.to_json() for kld in kld_list]}
-
+ query = db.query(KnowledgeModel)
+ query = query.filter(KnowledgeModel.tenant_id == user_id)
+ query = query.union(
+ db.query(KnowledgeModel).join(
+ group_knowledge_table,
+ KnowledgeModel.id == group_knowledge_table.c.knowledge_id
+ ).filter(
+ group_knowledge_table.c.group_id.in_(group_list)
+ )
+ )
+ if page_size:
+ query = query.limit(page_size).offset((page_index - 1) * page_size)
+ return {"rows": [kld.to_json() for kld in query.all()]}
--
Gitblit v1.8.0