From 8fd8e2f7c84446ab6bf84fe252053b85d9b20d30 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 30 Oct 2025 10:45:44 +0800
Subject: [PATCH] feat(ai): 简化AI对话项创建逻辑并新增连续对话类型 - 移除复杂的对话项更新逻辑，统一通过add方法创建新项 - 新增AiTalkOutputEnum枚举值CONTEXT_TALK用于AI陪练连续对话 - 更新ApiMemberTalkAnswerSavaDto注释以包含新的对话类型 - 修复对话项创建时类型参数未正确传递的问题 - 优化代码结构，减少冗余的条件判断和数据转换操作
---
src/main/java/cc/mrbird/febs/ai/service/impl/AiMemberTalkServiceImpl.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 46 insertions(+), 5 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 61c9102..c30e579 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,10 +7,15 @@
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.member.ApiMemberTalkPageDto;
import cc.mrbird.febs.ai.req.memberTalk.*;
+import cc.mrbird.febs.ai.req.memberTalk.ApiMemberTalkListDto;
import cc.mrbird.febs.ai.res.ai.AiResponse;
+import cc.mrbird.febs.ai.res.member.ApiMemberTalkPageVo;
+import cc.mrbird.febs.ai.res.memberTalk.ApiMemberTalkListVo;
import cc.mrbird.febs.ai.res.memberTalk.ApiMemberTalkReloadVo;
import cc.mrbird.febs.ai.res.memberTalk.ApiMemberTalkVo;
+import cc.mrbird.febs.ai.res.memberTalk.ApiTalkMemberListVo;
import cc.mrbird.febs.ai.service.AiMemberTalkItemService;
import cc.mrbird.febs.ai.service.AiMemberTalkService;
import cc.mrbird.febs.ai.service.AiProductRoleLinkService;
@@ -23,7 +28,9 @@
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
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;
@@ -80,7 +87,7 @@
query.last("limit 1");
AiMemberTalk aiMemberTalk = this.getByQuery(query);
if (ObjectUtil.isNull(aiMemberTalk)){
- aiMemberTalk = this.add(memberUuid,companyId,productId,nowTime);
+ aiMemberTalk = this.add(memberUuid,companyId,productId,nowTime,5);
}
List<AiMessage> aiMessageDtoList = aiMemberTalkItemService.getQuestionUpDownContext(aiMemberTalk.getId(),AiTypeEnum.QUESTION.getCode());
@@ -112,7 +119,7 @@
queryWrapper.eq(AiMemberTalkItem::getType,AiTypeEnum.QUESTION_ANSWER.getCode());
queryWrapper.orderByDesc(AiMemberTalkItem::getCreatedTime);
queryWrapper.last("limit 1");
- AiMemberTalkItem byQuery = aiMemberTalkItemService.getByQuery(queryWrapper);
+ AiMemberTalkItem byQuery = aiMemberTalkItemService.getOneByQuery(queryWrapper);
if (ObjectUtil.isNotNull(byQuery)){
apiMemberTalkReloadVo.setContext(byQuery.getContext());
apiMemberTalkReloadVo.setMemberTalkId(memberTalkId);
@@ -155,7 +162,7 @@
query.last("limit 1");
AiMemberTalk aiMemberTalk = this.getByQuery(query);
if (ObjectUtil.isNull(aiMemberTalk)) {
- aiMemberTalk = this.add(memberUuid,companyId, productId, nowTime);
+ aiMemberTalk = this.add(memberUuid,companyId, productId, nowTime,5);
}
try {
if (aiResponse.getCode().equals("200")) {
@@ -236,7 +243,7 @@
memberTalkItemQuery.eq(AiMemberTalkItem::getType,1);
memberTalkItemQuery.orderByDesc(AiMemberTalkItem::getCreatedTime);
memberTalkItemQuery.last("limit 1");
- AiMemberTalkItem aiMemberTalkItem = aiMemberTalkItemService.getByQuery(memberTalkItemQuery);
+ AiMemberTalkItem aiMemberTalkItem = aiMemberTalkItemService.getOneByQuery(memberTalkItemQuery);
aiMemberTalkItemService.add(memberUuid,aiMemberTalk.getId(),companyId,2,reqContext,new Date());
String format = StrUtil.format(ANSWER_FORMAT, aiMemberTalkItem.getContext(), reqContext);
@@ -268,13 +275,16 @@
return new FebsResponse().success().data(apiMemberTalkVo);
}
@Override
- public AiMemberTalk add(String memberUuid,String companyId, String productId, Date nowTime) {
+ public AiMemberTalk add(String memberUuid,String companyId, String productId, Date nowTime,Integer questionCount) {
AiMemberTalk aiMemberTalk = new AiMemberTalk();
aiMemberTalk.setId(UUID.getSimpleUUIDString());
aiMemberTalk.setCompanyId(companyId);
aiMemberTalk.setCreatedTime(nowTime);
aiMemberTalk.setMemberId(memberUuid);
aiMemberTalk.setProductId(productId);
+ aiMemberTalk.setQuestionCnt(questionCount);
+ aiMemberTalk.setDoneCnt(0);
+ aiMemberTalk.setState(AiTypeEnum.AI_MEMBER_TALK_STATE_ING.getCode());
aiMemberTalkMapper.insert(aiMemberTalk);
return aiMemberTalk;
}
@@ -293,4 +303,35 @@
return aiService.answerStream(question);
}
+ @Override
+ public List<AiMemberTalk> getListByCompanyId(String companyId) {
+ return aiMemberTalkMapper.selectList(
+ Wrappers.lambdaQuery(AiMemberTalk.class)
+ .eq(AiMemberTalk::getCompanyId, companyId)
+ .eq(AiMemberTalk::getState, AiTypeEnum.AI_MEMBER_TALK_STATE_DONE.getCode())
+ );
+ }
+
+ @Override
+ public List<AiMemberTalk> getListByCompanyIdAndMemberUuid(String companyId, String memberUuid) {
+ return aiMemberTalkMapper.selectList(
+ Wrappers.lambdaQuery(AiMemberTalk.class)
+ .eq(AiMemberTalk::getCompanyId, companyId)
+ .eq(AiMemberTalk::getMemberId, memberUuid)
+ .eq(AiMemberTalk::getState, AiTypeEnum.AI_MEMBER_TALK_STATE_DONE.getCode())
+ );
+ }
+
+ @Override
+ public IPage<ApiMemberTalkListVo> getPageByDto(ApiMemberTalkListDto dto) {
+ // 创建分页对象，传入当前页和每页大小
+ Page<ApiMemberTalkListVo> page = new Page<>(dto.getPageNow(), dto.getPageSize());
+ return aiMemberTalkMapper.getPageByDto(page, dto);
+ }
+
+ @Override
+ public Page<ApiMemberTalkPageVo> getTalkPage(Page<ApiMemberTalkPageVo> page, ApiMemberTalkPageDto dto) {
+ return aiMemberTalkMapper.getTalkPage(page, dto);
+ }
+
}
--
Gitblit v1.9.1