From c0d11dac469251c71b036c757c788615285c9683 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 15 十一月 2024 10:57:10 +0800
Subject: [PATCH] 毕昇对话历史只返回了一条修正，按时间正序排列吧，json乱码修正
---
app/api/group.py | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/app/api/group.py b/app/api/group.py
index 4d0826e..51c607c 100644
--- a/app/api/group.py
+++ b/app/api/group.py
@@ -1,21 +1,21 @@
from fastapi import APIRouter, Depends
-from win32ctypes.pywin32.pywintypes import datetime
+from datetime import datetime
from app.api import Response, get_current_user
from app.models.base_model import get_db
-from app.models.group_model import GroupModel, GroupData, GroupUsers
+from app.models.group_model import GroupModel, GroupData, GroupUsers, GroupResource
from app.models.user import PageParameter
from app.models.user_model import UserModel
from app.service.group import create_group, group_list, edit_group_data, delete_group_data, get_group_users, \
- save_user_to_group
+ save_user_to_group, save_group_resource
group_router = APIRouter()
-@group_router.post("/group_list", response_model=Response)
-async def user_group_list(paras: PageParameter, current_user: UserModel = Depends(get_current_user),
+@group_router.get("/list", response_model=Response)
+async def user_group_list(current:int, pageSize:int, keyword="", current_user: UserModel = Depends(get_current_user),
db=Depends(get_db)):
- return Response(code=200, msg="", data=await group_list(db, paras.page_size, paras.page_index, paras.keyword))
+ return Response(code=200, msg="", data=await group_list(db, pageSize, current, keyword, current_user.permission, current_user.id))
@group_router.post("/add_group", response_model=Response)
@@ -25,13 +25,13 @@
db_group = db.query(GroupModel).filter(GroupModel.group_name == group.group_name).first()
if db_group:
return Response(code=200, msg="group already created")
- is_create = await create_group(db, group.group_name, group.group_description)
+ is_create = await create_group(db, group.group_name, group.group_description, current_user.id)
if not is_create:
return Response(code=200, msg="group create failure", data={})
return Response(code=200, msg="group create successfully", data={"group_name": group.group_name})
-@group_router.post("/edit_group", response_model=Response)
+@group_router.put("/edit_group", response_model=Response)
async def edit_group(group: GroupData, current_user: UserModel = Depends(get_current_user), db=Depends(get_db)):
if not group.group_name:
return Response(code=400, msg="The group_name cannot be empty!")
@@ -46,7 +46,7 @@
return Response(code=200, msg="group edit successfully", data={"group_name": group.group_name})
-@group_router.post("/edit_group_status", response_model=Response)
+@group_router.put("/edit_group_status", response_model=Response)
async def edit_group_status(group: GroupData, current_user: UserModel = Depends(get_current_user), db=Depends(get_db)):
if group.group_status not in ["0", "1"]:
return Response(code=400, msg="The status cannot be {}!".format(group.group_status))
@@ -60,12 +60,12 @@
return Response(code=200, msg="group status edit successfully", data={"group_name": group.group_name})
-@group_router.post("/delete_group", response_model=Response)
-async def delete_group(group: GroupData, current_user: UserModel = Depends(get_current_user), db=Depends(get_db)):
- db_group = db.query(GroupModel).filter(GroupModel.id == group.id).first()
+@group_router.delete("/delete_group/{groupId}", response_model=Response)
+async def delete_group(groupId, current_user: UserModel = Depends(get_current_user), db=Depends(get_db)):
+ db_group = db.query(GroupModel).filter(GroupModel.id == groupId).first()
if not db_group:
return Response(code=200, msg="group does not exist")
- is_edit = await delete_group_data(db, group.id)
+ is_edit = await delete_group_data(db, groupId)
if not is_edit:
return Response(code=200, msg="group delete failure", data={})
return Response(code=200, msg="group delete successfully", data={})
@@ -89,3 +89,15 @@
if not is_success:
return Response(code=500, msg="save user to group failure", data={})
return Response(code=200, msg="success", data={})
+
+
+@group_router.put("/group_resource", response_model=Response)
+async def group_resource(group_resource: GroupResource, current_user: UserModel = Depends(get_current_user),
+ db=Depends(get_db)):
+ db_group = db.query(GroupModel).filter(GroupModel.id == group_resource.id).first()
+ if not db_group:
+ return Response(code=200, msg="group does not exist")
+ is_success = await save_group_resource(db, current_user.id, group_resource.id, group_resource.agents, group_resource.dialogs, group_resource.knowledges)
+ if not is_success:
+ return Response(code=500, msg="save user to group failure", data={})
+ return Response(code=200, msg="success", data={})
--
Gitblit v1.8.0