From b224c081c0e21dad51f0f628d5c1fbfd4245cddd Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 14 Aug 2025 15:08:59 +0800
Subject: [PATCH] refactor(websocket): 重构 WebSocket 相关代码

---
 src/main/java/cc/mrbird/febs/ai/service/impl/AiMemberTalkServiceImpl.java |   26 +++++++++++++++++++-------
 1 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/ai/service/impl/AiMemberTalkServiceImpl.java b/src/main/java/cc/mrbird/febs/ai/service/impl/AiMemberTalkServiceImpl.java
index db3d4ba..96ceed5 100644
--- a/src/main/java/cc/mrbird/febs/ai/service/impl/AiMemberTalkServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/ai/service/impl/AiMemberTalkServiceImpl.java
@@ -7,8 +7,11 @@
 import cc.mrbird.febs.ai.req.ai.AiRequest;
 import cc.mrbird.febs.ai.req.memberTalk.ApiMemberTalkAnswerDto;
 import cc.mrbird.febs.ai.req.memberTalk.ApiMemberTalkDto;
+import cc.mrbird.febs.ai.req.memberTalk.ApiMemberTalkItemPageDto;
 import cc.mrbird.febs.ai.res.ai.AiResponse;
+import cc.mrbird.febs.ai.res.memberTalk.ApiMemberTalkItemVo;
 import cc.mrbird.febs.ai.res.memberTalk.ApiMemberTalkVo;
+import cc.mrbird.febs.ai.res.product.ApiProductVo;
 import cc.mrbird.febs.ai.service.AiMemberTalkItemService;
 import cc.mrbird.febs.ai.service.AiMemberTalkService;
 import cc.mrbird.febs.ai.service.AiProductRoleLinkService;
@@ -19,8 +22,10 @@
 import cc.mrbird.febs.common.utils.LoginUserUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -86,8 +91,6 @@
         apiMemberTalkVo.setMemberTalkId(aiMemberTalk.getId());
         apiMemberTalkVo.setType(1);
         apiMemberTalkVo.setContext(aiResponse.getResContext());
-        apiMemberTalkVo.setReport(aiResponse.getReport());
-
         return new FebsResponse().success().data(apiMemberTalkVo);
     }
 
@@ -207,11 +210,13 @@
 
         String format = StrUtil.format(ANSWER_FORMAT, aiMemberTalkItem.getContext(), reqContext);
         log.info("format:{}",format);
-        AiResponse aiResponse = aiService.start(aiProductRoleLink.getProductRoleId(), format);
-//        AiResponse aiResponse = aiService.start(aiProductRoleLink.getProductRoleId(), reqContext);
+//        AiResponse aiResponse = aiService.start(aiProductRoleLink.getProductRoleId(), format);
+        AiResponse aiResponse = aiService.start(aiProductRoleLink.getProductRoleId(), reqContext);
+        String context = null;
         if(aiResponse.getCode().equals("200")){
             Date nowTime = new Date();
-            aiMemberTalkItemService.add(memberUuid,aiMemberTalk.getId(),3,aiResponse.getResContext(),nowTime);
+            context = String.valueOf(JSONUtil.parse(aiResponse.getReport()));
+            aiMemberTalkItemService.add(memberUuid,aiMemberTalk.getId(),3, context,nowTime);
             this.updateTimeUpdate(nowTime,aiMemberTalk.getId());
         }else{
             throw new FebsException(aiResponse.getDescription());
@@ -219,8 +224,7 @@
         ApiMemberTalkVo apiMemberTalkVo = new ApiMemberTalkVo();
         apiMemberTalkVo.setMemberTalkId(aiMemberTalk.getId());
         apiMemberTalkVo.setType(3);
-        apiMemberTalkVo.setContext(aiResponse.getResContext());
-        apiMemberTalkVo.setReport(aiResponse.getReport());
+        apiMemberTalkVo.setContext(context);
         return new FebsResponse().success().data(apiMemberTalkVo);
     }
     @Override
@@ -233,4 +237,12 @@
         aiMemberTalkMapper.insert(aiMemberTalk);
         return aiMemberTalk;
     }
+
+    @Override
+    public FebsResponse historyPage(ApiMemberTalkItemPageDto dto) {
+
+        String memberUuid = LoginUserUtil.getLoginUser().getMemberUuid();
+        dto.setMemberUuid(memberUuid);
+        return aiMemberTalkItemService.historyPage(dto);
+    }
 }

--
Gitblit v1.9.1