From 2fcfbcefee1a6ad5b51e23223ebe77093b847c3a Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 30 Oct 2025 14:45:53 +0800
Subject: [PATCH] feat(ai):优化对话流初始化逻辑 - 调整对话记录查询顺序，确保获取最新进行中的对话 - 在对话不存在时创建新对话并初始化问题 - 若对话已存在，则查询最近的对话项作为标题来源 - 修复可能因查询顺序导致的标题加载异常问题
---
src/main/java/cc/mrbird/febs/ai/service/impl/AiMemberServiceImpl.java | 109 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 99 insertions(+), 10 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/ai/service/impl/AiMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/ai/service/impl/AiMemberServiceImpl.java
index f7c232f..1ea68f5 100644
--- a/src/main/java/cc/mrbird/febs/ai/service/impl/AiMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/ai/service/impl/AiMemberServiceImpl.java
@@ -3,13 +3,9 @@
import cc.mrbird.febs.ai.entity.*;
import cc.mrbird.febs.ai.enumerates.AiTypeEnum;
import cc.mrbird.febs.ai.mapper.AiMemberMapper;
-import cc.mrbird.febs.ai.req.member.ApiMemberTeamPageDto;
-import cc.mrbird.febs.ai.req.member.ApiMemberTeamPracticeDto;
-import cc.mrbird.febs.ai.req.member.ApiMemberTeamStudyDto;
-import cc.mrbird.febs.ai.res.member.ApiMemberTeamPageVo;
-import cc.mrbird.febs.ai.res.member.ApiMemberTeamPracticeVo;
-import cc.mrbird.febs.ai.res.member.ApiMemberTeamStudyVo;
-import cc.mrbird.febs.ai.res.productPoint.ApiProductPointListVo;
+import cc.mrbird.febs.ai.req.member.*;
+import cc.mrbird.febs.ai.res.member.*;
+import cc.mrbird.febs.ai.res.memberAnswer.ApiMemberAnswerPreviousItemVo;
import cc.mrbird.febs.ai.service.*;
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.exception.FebsException;
@@ -41,9 +37,11 @@
private final MallMemberMapper mallMemberMapper;
private final AiMemberTalkService aiMemberTalkService;
private final AiMemberAnswerService aiMemberAnswerService;
+ private final AiMemberAnswerItemService aiMemberAnswerItemService;
private final AiMemberPointService aiMemberPointService;
private final AiProductService aiProductService;
private final AiProductPointService aiProductPointService;
+ private final AiProductQuestionItemService aiProductQuestionItemService;
@Override
public AiMember getById(String id) {
return aiMemberMapper.selectById( id);
@@ -207,6 +205,8 @@
String productId = aiProduct.getId();
ApiMemberTeamPracticeVo vo = new ApiMemberTeamPracticeVo();
+ vo.setMemberUuid(memberUuid);
+ vo.setProductId(aiProduct.getId());
vo.setName(aiProduct.getName());
vo.setTarget(aiProduct.getTarget());
@@ -251,9 +251,10 @@
if (CollUtil.isEmpty(aiMemberPoints)){
return new FebsResponse().success().data(vos);
}
- Map<String, AiMemberPoint> aiMemberPointMap = new HashMap<>();
+ Map<String, List<AiMemberPoint>> aiMemberPointMap = new HashMap<>();
if (CollUtil.isNotEmpty(aiMemberPoints)){
- aiMemberPoints.forEach(aiMemberPoint -> aiMemberPointMap.put(aiMemberPoint.getProductPointId(),aiMemberPoint));
+ //stream操作aiMemberPoints，返回一个Map<productPointId,List<AiMemberPoint>>
+ aiMemberPointMap = aiMemberPoints.stream().collect(Collectors.groupingBy(AiMemberPoint::getProductPointId));
}
//stream流操作aiMemberPoints，返回一个productPointId的set集合
@@ -273,7 +274,10 @@
vo.setTitle(aiProductPoint.getTitle());
Integer totalTime = 0;
if (aiMemberPointMap.containsKey(aiProductPoint.getId())){
- totalTime = aiMemberPointMap.get(aiProductPoint.getId()).getTotalTime();
+ List<AiMemberPoint> memberPoints = aiMemberPointMap.get(aiProductPoint.getId());
+ for (AiMemberPoint memberPoint : memberPoints){
+ totalTime += memberPoint.getTotalTime();
+ }
}
vo.setTotalTime(DateUtil.secondToTime(totalTime));
@@ -282,4 +286,89 @@
return new FebsResponse().success().data(vos);
}
+
+ @Override
+ public FebsResponse talkPage(ApiMemberTalkPageDto dto) {
+
+ String companyId = LoginUserUtil.getLoginUser().getCompanyId();
+ dto.setCompanyId(companyId);
+ // 创建分页对象，传入当前页和每页大小
+ Page<ApiMemberTalkPageVo> page = new Page<>(dto.getPageNow(), dto.getPageSize());
+ Page<ApiMemberTalkPageVo> pages = aiMemberTalkService.getTalkPage(page, dto);
+
+ return new FebsResponse().success().data(pages);
+ }
+
+ @Override
+ public FebsResponse answerPage(ApiMemberAnswerPageDto dto) {
+
+ String companyId = LoginUserUtil.getLoginUser().getCompanyId();
+ dto.setCompanyId(companyId);
+ // 创建分页对象，传入当前页和每页大小
+ Page<ApiMemberAnswerPageVo> page = new Page<>(dto.getPageNow(), dto.getPageSize());
+ Page<ApiMemberAnswerPageVo> pages = aiMemberAnswerService.getAnswerPage(page, dto);
+
+ return new FebsResponse().success().data(pages);
+ }
+
+ @Override
+ public FebsResponse answerInfo(ApiMemberAnswerInfoDto dto) {
+ List<ApiMemberAnswerInfoVo> vos = new ArrayList<>();
+
+ String answerId = dto.getAnswerId();
+ AiMemberAnswer memberAnswer = aiMemberAnswerService.getById(answerId);
+ if (memberAnswer == null){
+ return new FebsResponse().success().data(vos);
+ }
+
+ List<AiMemberAnswerItem> records = aiMemberAnswerItemService.getBaseMapper().selectList(
+ Wrappers.lambdaQuery(AiMemberAnswerItem.class)
+ .eq(AiMemberAnswerItem::getAnswerId, memberAnswer.getId())
+ .orderByAsc(AiMemberAnswerItem::getCreatedTime)
+ );
+
+ if (CollUtil.isNotEmpty(records)){
+ Set<String> collect = records.stream().map(AiMemberAnswerItem::getProductQuestionId).collect(Collectors.toSet());
+
+ LambdaQueryWrapper<AiProductQuestionItem> questionItemQuery = Wrappers.lambdaQuery(AiProductQuestionItem.class);
+ questionItemQuery.in(AiProductQuestionItem::getProductQuestionId,collect);
+ List<AiProductQuestionItem> listByQuery = aiProductQuestionItemService.getListByQuery(questionItemQuery);
+
+ if (CollUtil.isNotEmpty(listByQuery)){
+ //利用stream流，操作集合listByQuery，返回一个map对象，key为productQuestionId，value为List<AiProductQuestionItem>对象
+ Map<String, List<AiProductQuestionItem>> questionItemMap =
+ listByQuery.stream().collect(Collectors.groupingBy(AiProductQuestionItem::getProductQuestionId));
+
+ for (AiMemberAnswerItem record : records){
+ String productQuestionId = record.getProductQuestionId();
+ ApiMemberAnswerInfoVo vo = new ApiMemberAnswerInfoVo();
+ vo.setTitle(record.getTitle());
+ vo.setDifficulty(record.getDifficulty());
+ vo.setMemberAnswerQuestionId(record.getMemberAnswerQuestionId());
+ vo.setAnswerAnalysis(record.getAnswerAnalysis());
+ vo.setProductQuestionId(record.getProductQuestionId());
+ vo.setCreatedTime(record.getUpdatedTime());
+
+
+ List<AiProductQuestionItem> questionItemList = questionItemMap.get(productQuestionId);
+ List<ApiMemberAnswerPreviousItemVo> answerList = new ArrayList<>();
+ if (CollUtil.isNotEmpty(questionItemList)){
+ for (AiProductQuestionItem questionItem : questionItemList){
+ ApiMemberAnswerPreviousItemVo itemVo = new ApiMemberAnswerPreviousItemVo();
+ itemVo.setId(questionItem.getId());
+ itemVo.setAnswer(questionItem.getAnswer());
+ itemVo.setAnswerAnalysis(questionItem.getAnswerAnalysis());
+ itemVo.setCorrectAnswer(questionItem.getCorrectAnswer());
+ answerList.add(itemVo);
+ }
+ }
+ vo.setAnswerList(answerList);
+
+ vos.add( vo);
+ }
+ }
+ }
+
+ return new FebsResponse().success().data(vos);
+ }
}
--
Gitblit v1.9.1