From a791022ff1311e1fb76930c398d6ff91036d0456 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期三, 11 十二月 2024 17:57:52 +0800
Subject: [PATCH] 新增加标签功能
---
app/service/dialog.py | 46 +++++++++++++++++++++++++++++-----------------
1 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/app/service/dialog.py b/app/service/dialog.py
index d78fbbe..623477a 100644
--- a/app/service/dialog.py
+++ b/app/service/dialog.py
@@ -1,43 +1,55 @@
from datetime import datetime
-from app.models import KnowledgeModel, GroupModel, DialogModel, ConversationModel, group_dialog_table
+from sqlalchemy import or_
+
+from app.models import KnowledgeModel, GroupModel, DialogModel, ConversationModel, group_dialog_table, LabelWorkerModel, \
+ LabelModel
from app.models.user_model import UserModel
from Log import logger
-async def get_dialog_list(db, user_id, keyword, page_size, page_index):
+async def get_dialog_list(db, user_id, keyword, label, status, page_size, page_index):
user = db.query(UserModel).filter(UserModel.id == user_id).first()
if user is None:
return {"rows": []}
- if user.permission == "admin":
- query = db.query(DialogModel)
+ query = db.query(DialogModel)
+ id_list = []
+ if label:
+ id_list = [i.object_id for i in db.query(LabelWorkerModel).filter(LabelWorkerModel.label_id==label).all()]
+ if user.permission != "admin":
+ dia_list = [j.id for i in user.groups for j in i.dialogs if not label or j.id in id_list]
+ query = query.filter(or_(DialogModel.tenant_id == user_id, DialogModel.id.in_(dia_list)))
else:
- group_list = [i.id for i in user.groups]
- query = db.query(DialogModel)
- query = query.filter(DialogModel.tenant_id == user_id)
- query = query.union(
- db.query(DialogModel).join(
- group_dialog_table,
- DialogModel.id == group_dialog_table.c.dialog_id
- ).filter(
- group_dialog_table.c.group_id.in_(group_list)
- )
- )
+ if label:
+ query = query.filter(or_(DialogModel.id.in_(id_list)))
+
if keyword:
query = query.filter(DialogModel.name.like('%{}%'.format(keyword)))
+
+ if status:
+ print(status)
+ query = query.filter(DialogModel.status == status)
total = query.count()
if page_size:
query = query.limit(page_size).offset((page_index - 1) * page_size)
rows = []
user_id_set = set()
+ dialog_id_set = set()
+ label_dict = {}
for kld in query.all():
user_id_set.add(kld.tenant_id)
+ dialog_id_set.add(kld.id)
rows.append(kld.to_json())
- print(rows)
- user_dict = {i.id: i.to_dict() for i in db.query(UserModel).filter(UserModel.id.in_(user_id_set)).all()}
+ user_dict = {str(i.id): i.to_dict() for i in db.query(UserModel).filter(UserModel.id.in_(user_id_set)).all()}
+ for i in db.query(LabelModel.id, LabelModel.name, LabelWorkerModel.object_id).outerjoin(LabelWorkerModel,
+ LabelModel.id == LabelWorkerModel.label_id).filter(
+ LabelWorkerModel.object_id.in_(dialog_id_set)).all():
+
+ label_dict[i.object_id] = label_dict.get(i.object_id, []) +[{"labelId": i.id, "labelName": i.name}]
for r in rows:
r["user"] = user_dict.get(r["user_id"], {})
+ r["label"] = label_dict.get(r["id"], [])
return {"total": total, "rows": rows}
--
Gitblit v1.8.0