From f910ec0bb7338257c115bfe559573823b856a20e Mon Sep 17 00:00:00 2001 From: zstar <65890619+zstar1003@users.noreply.github.com> Date: Sat, 17 May 2025 12:15:00 +0800 Subject: [PATCH 1/7] =?UTF-8?q?refactor(=E4=BC=9A=E8=AF=9D=E7=AE=A1?= =?UTF-8?q?=E7=90=86):=20=E7=A7=BB=E9=99=A4=E5=AF=B9=E8=AF=9D=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E5=86=97=E4=BD=99=E6=8E=A5=E5=8F=A3=EF=BC=8C=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=89=8D=E7=AB=AF=E6=BB=9A=E5=8A=A8=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/routes/conversation/routes.py | 17 ----- .../server/services/conversation/service.py | 73 +------------------ .../web/src/pages/conversation/index.vue | 51 ++++++++----- 3 files changed, 36 insertions(+), 105 deletions(-) diff --git a/management/server/routes/conversation/routes.py b/management/server/routes/conversation/routes.py index ac750f6..00d0c48 100644 --- a/management/server/routes/conversation/routes.py +++ b/management/server/routes/conversation/routes.py @@ -44,20 +44,3 @@ def get_messages(conversation_id): except Exception as e: # 错误处理 return jsonify({"code": 500, "message": f"获取消息列表失败: {str(e)}"}), 500 - - -@conversation_bp.route("/", methods=["GET"]) -def get_conversation(conversation_id): - """获取特定对话的详细信息""" - try: - # 调用服务函数获取对话详情 - conversation = get_conversation_detail(conversation_id) - - if not conversation: - return jsonify({"code": 404, "message": "对话不存在"}), 404 - - # 返回符合前端期望格式的数据 - return jsonify({"code": 0, "data": conversation, "message": "获取对话详情成功"}) - except Exception as e: - # 错误处理 - return jsonify({"code": 500, "message": f"获取对话详情失败: {str(e)}"}), 500 diff --git a/management/server/services/conversation/service.py b/management/server/services/conversation/service.py index b1d886e..dcff44d 100644 --- a/management/server/services/conversation/service.py +++ b/management/server/services/conversation/service.py @@ -23,8 +23,6 @@ def get_conversations_by_user_id(user_id, page=1, size=20, sort_by="update_time" # 直接使用user_id作为tenant_id tenant_id = user_id - print(f"查询用户ID: {user_id}, 租户ID: {tenant_id}") - # 查询总记录数 count_sql = """ SELECT COUNT(*) as total @@ -34,7 +32,7 @@ def get_conversations_by_user_id(user_id, page=1, size=20, sort_by="update_time" cursor.execute(count_sql, (tenant_id,)) total = cursor.fetchone()["total"] - print(f"查询到总记录数: {total}") + # print(f"查询到总记录数: {total}") # 计算分页偏移量 offset = (page - 1) * size @@ -59,8 +57,8 @@ def get_conversations_by_user_id(user_id, page=1, size=20, sort_by="update_time" LIMIT %s OFFSET %s """ - print(f"执行查询: {query}") - print(f"参数: tenant_id={tenant_id}, size={size}, offset={offset}") + # print(f"执行查询: {query}") + # print(f"参数: tenant_id={tenant_id}, size={size}, offset={offset}") cursor.execute(query, (tenant_id, size, offset)) results = cursor.fetchall() @@ -200,68 +198,3 @@ def get_messages_by_conversation_id(conversation_id, page=1, size=30): traceback.print_exc() return None, 0 - - -def get_conversation_detail(conversation_id): - """ - 获取特定对话的详细信息 - - 参数: - conversation_id (str): 对话ID - - 返回: - dict: 对话详情 - """ - try: - conn = mysql.connector.connect(**DB_CONFIG) - cursor = conn.cursor(dictionary=True) - - # 查询对话信息 - query = """ - SELECT c.*, d.name as dialog_name, d.icon as dialog_icon - FROM conversation c - LEFT JOIN dialog d ON c.dialog_id = d.id - WHERE c.id = %s - """ - cursor.execute(query, (conversation_id,)) - result = cursor.fetchone() - - if not result: - print(f"未找到对话ID: {conversation_id}") - return None - - # 格式化对话详情 - conversation = { - "id": result["id"], - "name": result.get("name", ""), - "dialogId": result.get("dialog_id", ""), - "dialogName": result.get("dialog_name", ""), - "dialogIcon": result.get("dialog_icon", ""), - "createTime": result["create_date"].strftime("%Y-%m-%d %H:%M:%S") if result.get("create_date") else "", - "updateTime": result["update_date"].strftime("%Y-%m-%d %H:%M:%S") if result.get("update_date") else "", - "messages": result.get("message", []), - } - - # 打印调试信息 - print(f"获取到对话详情: ID={conversation_id}") - print(f"消息数量: {len(conversation['messages']) if conversation['messages'] else 0}") - - # 关闭连接 - cursor.close() - conn.close() - - return conversation - - except mysql.connector.Error as err: - print(f"数据库错误: {err}") - # 更详细的错误日志 - import traceback - - traceback.print_exc() - return None - except Exception as e: - print(f"未知错误: {e}") - import traceback - - traceback.print_exc() - return None diff --git a/management/web/src/pages/conversation/index.vue b/management/web/src/pages/conversation/index.vue index c4bf074..f15d7f2 100644 --- a/management/web/src/pages/conversation/index.vue +++ b/management/web/src/pages/conversation/index.vue @@ -1,11 +1,8 @@