From 7a9f9cb3c34ebc0836720d0f5738bbe70070bbb3 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 05 十二月 2024 14:22:24 +0800
Subject: [PATCH] 增加菜单和路由控制
---
app/api/knowledge.py | 35 +++++++++++++++++------------------
1 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/app/api/knowledge.py b/app/api/knowledge.py
index 91edec0..625d591 100644
--- a/app/api/knowledge.py
+++ b/app/api/knowledge.py
@@ -1,30 +1,29 @@
# coding:utf-8
-from fastapi import APIRouter, Depends
+from fastapi import APIRouter, Depends, Query, HTTPException
from app.api import Response, get_current_user, ResponseList
from app.models import RoleParameter, GroupModel, KnowledgeModel
from app.models.base_model import get_db
from app.models.user_model import UserModel
-
+from app.service.knowledge import get_knowledge_list
+from typing import Optional
knowledge_router = APIRouter()
@knowledge_router.get("/list", response_model=Response)
-async def knowledge_list(role:str, current_user: UserModel = Depends(get_current_user),
- db=Depends(get_db)):
- if role == "admin":
- kld_list = db.query(KnowledgeModel).all()
- else:
- user = db.query(UserModel).filter(UserModel.id == current_user.id).first()
+async def knowledge_list(
+ 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]})
- group_list = [i.id for i in user.groups]
+ start = (page - 1) * num
+ end = start + num
- kld_list = db.query(KnowledgeModel).filter(KnowledgeModel.tenant_id==current_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)
+ if start >= len(getknowledgelist):
+ raise HTTPException(status_code=404, detail="Page not found")
+ print(getknowledgelist)
- data = [kld.to_json() for kld in kld_list]
- return Response(code=200, msg="", data={"rows": data})
\ No newline at end of file
+ return Response(code=200, msg="", data={"rows": getknowledgelist["rows"][start:end]})
\ No newline at end of file
--
Gitblit v1.8.0