From a1d01d25e2c5f48bc51557da55f40e8748d94532 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 03 Sep 2025 11:02:41 +0800
Subject: [PATCH] feat(ai): 优化对话输入方式并添加思考内容
---
src/main/java/cc/mrbird/febs/ai/service/impl/AiMemberTalkServiceImpl.java | 87 ++++++++++++++++++++++++++++++++-----------
1 files changed, 65 insertions(+), 22 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 96ceed5..4885a94 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
@@ -1,17 +1,16 @@
package cc.mrbird.febs.ai.service.impl;
+import cc.mrbird.febs.ai.enumerates.AiTypeEnum;
import cc.mrbird.febs.ai.entity.AiMemberTalk;
import cc.mrbird.febs.ai.entity.AiMemberTalkItem;
import cc.mrbird.febs.ai.entity.AiProductRoleLink;
import cc.mrbird.febs.ai.mapper.AiMemberTalkMapper;
+import cc.mrbird.febs.ai.req.ai.AiMessage;
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.req.memberTalk.*;
import cc.mrbird.febs.ai.res.ai.AiResponse;
-import cc.mrbird.febs.ai.res.memberTalk.ApiMemberTalkItemVo;
+import cc.mrbird.febs.ai.res.memberTalk.ApiMemberTalkReloadVo;
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;
@@ -25,13 +24,15 @@
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;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import reactor.core.publisher.Flux;
import java.util.Date;
+import java.util.List;
import java.util.function.Consumer;
/**
@@ -57,6 +58,7 @@
}
@Override
+ @Transactional
public FebsResponse start(ApiMemberTalkDto dto) {
String memberUuid = LoginUserUtil.getLoginUser().getMemberUuid();
@@ -80,18 +82,42 @@
aiMemberTalk = this.add(memberUuid,productId,nowTime);
}
- AiResponse aiResponse = aiService.start(aiProductRoleLink.getProductRoleId(),"<strong>\"生成题目\"</strong>");
- if(aiResponse.getCode().equals("200")){
- aiMemberTalkItemService.add(memberUuid,aiMemberTalk.getId(),1,aiResponse.getResContext(),nowTime);
- this.updateTimeUpdate(nowTime,aiMemberTalk.getId());
- }else{
- throw new FebsException(aiResponse.getDescription());
- }
+ List<AiMessage> aiMessageDtoList = aiMemberTalkItemService.getQuestionUpDownContext(aiMemberTalk.getId(),AiTypeEnum.QUESTION.getCode());
+
+ AiResponse aiResponse = aiService.start(aiMessageDtoList,AiTypeEnum.QUESTION.getCode(),aiProductRoleLink.getProductRoleId(),AiTypeEnum.QUESTION.getName(), null);
+
ApiMemberTalkVo apiMemberTalkVo = new ApiMemberTalkVo();
apiMemberTalkVo.setMemberTalkId(aiMemberTalk.getId());
apiMemberTalkVo.setType(1);
apiMemberTalkVo.setContext(aiResponse.getResContext());
+ if(aiResponse.getCode().equals("200")){
+ AiMemberTalkItem aiMemberTalkItem = aiMemberTalkItemService.add(memberUuid, aiMemberTalk.getId(), 1, aiResponse.getResContext(), nowTime);
+ apiMemberTalkVo.setMemberTalkItemId(aiMemberTalkItem.getId());
+ this.updateTimeUpdate(nowTime,aiMemberTalk.getId());
+ }else{
+ throw new FebsException(aiResponse.getDescription());
+ }
return new FebsResponse().success().data(apiMemberTalkVo);
+ }
+
+ @Override
+ public FebsResponse reload(ApiMemberTalkReloadDto dto) {
+
+ String memberUuid = LoginUserUtil.getLoginUser().getMemberUuid();
+ ApiMemberTalkReloadVo apiMemberTalkReloadVo = new ApiMemberTalkReloadVo();
+ String memberTalkId = dto.getMemberTalkId();
+ LambdaQueryWrapper<AiMemberTalkItem> queryWrapper = Wrappers.lambdaQuery(AiMemberTalkItem.class);
+ queryWrapper.eq(AiMemberTalkItem::getMemberTalkId,memberTalkId);
+ queryWrapper.eq(AiMemberTalkItem::getType,AiTypeEnum.QUESTION_ANSWER.getCode());
+ queryWrapper.orderByDesc(AiMemberTalkItem::getCreatedTime);
+ queryWrapper.last("limit 1");
+ AiMemberTalkItem byQuery = aiMemberTalkItemService.getByQuery(queryWrapper);
+ if (ObjectUtil.isNotNull(byQuery)){
+ apiMemberTalkReloadVo.setContext(byQuery.getContext());
+ apiMemberTalkReloadVo.setMemberTalkId(memberTalkId);
+ apiMemberTalkReloadVo.setType(AiTypeEnum.QUESTION_ANSWER.getCode());
+ }
+ return new FebsResponse().success().data(apiMemberTalkReloadVo);
}
@Override
@@ -179,8 +205,9 @@
}
- public static final String ANSWER_FORMAT = "{}/n[回答]{}/n";
+ public static final String ANSWER_FORMAT = "###题目：{}###用户回答：{}";
@Override
+ @Transactional
public FebsResponse answer(ApiMemberTalkAnswerDto dto) {
String memberUuid = LoginUserUtil.getLoginUser().getMemberUuid();
String memberTalkId = dto.getId();
@@ -211,20 +238,29 @@
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);
+
+
+ ApiMemberTalkVo apiMemberTalkVo = new ApiMemberTalkVo();
+ apiMemberTalkVo.setMemberTalkId(aiMemberTalk.getId());
+ apiMemberTalkVo.setType(3);
+ List<AiMessage> aiMessageDtoList = aiMemberTalkItemService.getQuestionUpDownContext(aiMemberTalk.getId(),AiTypeEnum.ANSWER.getCode());
+ AiResponse aiResponse = aiService.start(aiMessageDtoList,AiTypeEnum.ANSWER.getCode(),aiProductRoleLink.getProductRoleId(), reqContext,aiMemberTalkItem.getContext());
String context = null;
if(aiResponse.getCode().equals("200")){
Date nowTime = new Date();
context = String.valueOf(JSONUtil.parse(aiResponse.getReport()));
- aiMemberTalkItemService.add(memberUuid,aiMemberTalk.getId(),3, context,nowTime);
+ if ("null".equals( context)){
+ context = aiResponse.getResContext();
+ }
+ AiMemberTalkItem talkItem = aiMemberTalkItemService.add(memberUuid, aiMemberTalk.getId(), 3, context, nowTime);
this.updateTimeUpdate(nowTime,aiMemberTalk.getId());
+
+
+ apiMemberTalkVo.setContext(context);
+ apiMemberTalkVo.setMemberTalkItemId(talkItem.getId());
}else{
throw new FebsException(aiResponse.getDescription());
}
- ApiMemberTalkVo apiMemberTalkVo = new ApiMemberTalkVo();
- apiMemberTalkVo.setMemberTalkId(aiMemberTalk.getId());
- apiMemberTalkVo.setType(3);
- apiMemberTalkVo.setContext(context);
return new FebsResponse().success().data(apiMemberTalkVo);
}
@Override
@@ -240,9 +276,16 @@
@Override
public FebsResponse historyPage(ApiMemberTalkItemPageDto dto) {
-
String memberUuid = LoginUserUtil.getLoginUser().getMemberUuid();
dto.setMemberUuid(memberUuid);
- return aiMemberTalkItemService.historyPage(dto);
+ return new FebsResponse().success().data(aiMemberTalkItemService.historyPage(dto));
}
+
+ @Override
+ public Flux<FebsResponse> answerStream(String question) {
+
+// String memberUuid = LoginUserUtil.getLoginUser().getMemberUuid();
+ return aiService.answerStream(question);
+ }
+
}
--
Gitblit v1.9.1