From 6e9730ebbbff634d27c2c49ec328156c8905b508 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 30 Oct 2025 13:52:14 +0800
Subject: [PATCH] feat(ai): 简化AI对话项创建逻辑并新增连续对话类型 - 移除复杂的对话项更新逻辑，统一通过add方法创建新项 - 新增AiTalkOutputEnum枚举值CONTEXT_TALK用于AI陪练连续对话 - 更新ApiMemberTalkAnswerSavaDto注释以包含新的对话类型 - 修复对话项创建时类型参数未正确传递的问题 - 优化代码结构，减少冗余的条件判断和数据转换操作
---
src/main/java/cc/mrbird/febs/ai/service/impl/AiMemberAnswerServiceImpl.java | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 102 insertions(+), 13 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/ai/service/impl/AiMemberAnswerServiceImpl.java b/src/main/java/cc/mrbird/febs/ai/service/impl/AiMemberAnswerServiceImpl.java
index a13c68e..4ee4a14 100644
--- a/src/main/java/cc/mrbird/febs/ai/service/impl/AiMemberAnswerServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/ai/service/impl/AiMemberAnswerServiceImpl.java
@@ -1,14 +1,18 @@
package cc.mrbird.febs.ai.service.impl;
import cc.mrbird.febs.ai.entity.*;
+import cc.mrbird.febs.ai.enumerates.AiTypeEnum;
import cc.mrbird.febs.ai.mapper.AiMemberAnswerMapper;
+import cc.mrbird.febs.ai.req.member.ApiMemberAnswerPageDto;
import cc.mrbird.febs.ai.req.memberAnswer.*;
+import cc.mrbird.febs.ai.res.member.ApiMemberAnswerPageVo;
import cc.mrbird.febs.ai.res.memberAnswer.*;
import cc.mrbird.febs.ai.res.product.ApiProductVo;
import cc.mrbird.febs.ai.res.productQuestionItem.ApiMemberAnswerItemVo;
import cc.mrbird.febs.ai.service.*;
import cc.mrbird.febs.ai.utils.UUID;
import cc.mrbird.febs.common.entity.FebsResponse;
+import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.utils.LoginUserUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUnit;
@@ -28,6 +32,8 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
/**
* AI用户答题记录 Service实现类
@@ -45,6 +51,8 @@
private final AiProductService aiProductService;
private final AiProductQuestionService aiProductQuestionService;
private final AiProductQuestionItemService aiProductQuestionItemService;
+ private final AiProductDependencyService aiProductDependencyService;
+ private final AiMemberProductUnlockService aiMemberProductUnlockService;
@Override
@@ -57,13 +65,13 @@
public FebsResponse startAnswerV2(ApiMemberAnswerDto dto) {
String memberUuid = LoginUserUtil.getLoginUser().getMemberUuid();
ApiMemberAnswerVoV2 apiMemberAnswerVoV2 = new ApiMemberAnswerVoV2();
- Integer current = 1;
String productId = dto.getId();
AiProduct aiProduct = aiProductService.getById(productId);
if(ObjectUtil.isNull(aiProduct)){
- throw new RuntimeException("产品不存在");
+ throw new FebsException("产品不存在");
}
+ String companyId = aiProduct.getCompanyId();
//验证产品分类下是否有题目
String productCategoryId = aiProduct.getProductCategoryId();
LambdaQueryWrapper<AiProductQuestion> questionLambdaQueryWrapper = Wrappers.lambdaQuery(AiProductQuestion.class);
@@ -73,7 +81,7 @@
List<AiProductQuestion> aiProductQuestions = aiProductQuestionService.getListByQuery(questionLambdaQueryWrapper);
if(CollUtil.isEmpty(aiProductQuestions)){
// todo 没有题目采用AI生成题目
- throw new RuntimeException("产品没有题目");
+ throw new FebsException("产品没有题目");
}
//判断该产品是否有正在进行的练习
Date createdTime = new Date();
@@ -86,6 +94,7 @@
Integer questionCount = aiProduct.getQuestionCount();
aiMemberAnswer = new AiMemberAnswer();
aiMemberAnswer.setId(UUID.getSimpleUUIDString());
+ aiMemberAnswer.setCompanyId(companyId);
aiMemberAnswer.setCreatedTime(createdTime);
aiMemberAnswer.setUpdatedTime(createdTime);
aiMemberAnswer.setProductId(aiProduct.getId());
@@ -102,6 +111,7 @@
AiProductQuestion aiProductQuestion = aiProductQuestionService.createQuestion(aiProduct.getId());
AiMemberAnswerItem aiMemberAnswerItem = new AiMemberAnswerItem();
aiMemberAnswerItem.setId(UUID.getSimpleUUIDString());
+ aiMemberAnswerItem.setCompanyId(companyId);
aiMemberAnswerItem.setCreatedTime(createdTime);
aiMemberAnswerItem.setAnswerId(aiMemberAnswer.getId());
aiMemberAnswerItem.setProductId(aiMemberAnswer.getProductId());
@@ -114,11 +124,15 @@
aiMemberAnswerItems.add(aiMemberAnswerItem);
}
aiMemberAnswerItemService.saveBatch(aiMemberAnswerItems);
- current = 1;
+ apiMemberAnswerVoV2.setCurrent(1);
}else{
- current = aiMemberAnswer.getDoneCnt();
+ if (aiMemberAnswer.getQuestionCnt() > aiMemberAnswer.getDoneCnt()){
+ apiMemberAnswerVoV2.setCurrent(aiMemberAnswer.getDoneCnt() + 1);
+ }else{
+ apiMemberAnswerVoV2.setCurrent(aiMemberAnswer.getDoneCnt());
+ }
}
- apiMemberAnswerVoV2.setCurrent(current);
+ apiMemberAnswerVoV2.setMemberAnswerId(aiMemberAnswer.getId());
return new FebsResponse().success().data(apiMemberAnswerVoV2);
}
@@ -131,7 +145,7 @@
String productId = dto.getId();
AiProduct aiProduct = aiProductService.getById(productId);
if(ObjectUtil.isNull(aiProduct)){
- throw new RuntimeException("产品不存在");
+ throw new FebsException("产品不存在");
}
//验证产品分类下是否有题目
String productCategoryId = aiProduct.getProductCategoryId();
@@ -142,7 +156,7 @@
List<AiProductQuestion> aiProductQuestions = aiProductQuestionService.getListByQuery(questionLambdaQueryWrapper);
if(CollUtil.isEmpty(aiProductQuestions)){
// todo 没有题目采用AI生成题目
- throw new RuntimeException("产品没有题目");
+ throw new FebsException("产品没有题目");
}
//判断该产品是否有正在进行的练习
Date createdTime = new Date();
@@ -243,12 +257,14 @@
AiMemberAnswer aiMemberAnswer = this.getById(memberAnswerId);
if(ObjectUtil.isNull(aiMemberAnswer)){
- throw new RuntimeException("答题记录不存在");
+ throw new FebsException("答题记录不存在");
}
- Date createdTime = new Date();
+ Date nowTime = new Date();
+
+ String companyId = aiMemberAnswer.getCompanyId();
AiMemberAnswerItem aiMemberAnswerItem = aiMemberAnswerItemService.getById(memberAnswerItemId);
- aiMemberAnswerItem.setUpdatedTime(createdTime);
+ aiMemberAnswerItem.setUpdatedTime(nowTime);
AiProductQuestion aiProductQuestion = aiProductQuestionService.getById(productQuestionId);
LambdaQueryWrapper<AiProductQuestionItem> productQuestionItemLambdaQueryWrapper = Wrappers.lambdaQuery(AiProductQuestionItem.class);
@@ -273,13 +289,14 @@
}else{
aiMemberAnswerItem.setIsCollected(0);
}
- aiMemberAnswerItemService.save(aiMemberAnswerItem);
+ aiMemberAnswerItem.setCompanyId(companyId);
+ aiMemberAnswerItemService.updateById(aiMemberAnswerItem);
aiMemberAnswer.setDoneCnt(aiMemberAnswer.getDoneCnt() + 1);
if (aiMemberAnswerItem.getMemberAnswerState() == 1){
aiMemberAnswer.setCorrectCnt(aiMemberAnswer.getCorrectCnt() + 1);
}
- aiMemberAnswer.setUpdatedTime(createdTime);
+ aiMemberAnswer.setUpdatedTime(nowTime);
aiMemberAnswerMapper.updateById(aiMemberAnswer);
apiQuestionItemInfoVo.setAnswerAnalysis(aiMemberAnswerItem.getAnswerAnalysis());
@@ -292,6 +309,7 @@
@Override
public FebsResponse insure(ApiMemberAnswerInsureDto dto) {
String memberUuid = LoginUserUtil.getLoginUser().getMemberUuid();
+ String companyId = LoginUserUtil.getLoginUser().getCompanyId();
ApiMemberAnswerInsureVo apiMemberAnswerInsureVo = new ApiMemberAnswerInsureVo();
String memberAnswerId = dto.getMemberAnswerId();
@@ -310,6 +328,31 @@
long between = DateUtil.between(createdTime, updatedTime, DateUnit.MINUTE);
apiMemberAnswerInsureVo.setUseTime(between);
+ apiMemberAnswerInsureVo.setProductId(aiMemberAnswer.getProductId());
+
+ aiMemberAnswerMapper.update(null,
+ Wrappers.lambdaUpdate(AiMemberAnswer.class)
+ .set(AiMemberAnswer::getUpdatedTime, new Date())
+ .set(AiMemberAnswer::getState, 1)
+ .set(AiMemberAnswer::getScore, percentage.intValue())
+ .eq(AiMemberAnswer::getId, memberAnswerId)
+ );
+
+ //如果有升级规则，则解锁
+ List<AiProductDependency> aiProductDependencies = aiProductDependencyService.selectListByProductId(aiMemberAnswer.getProductId(),percentage.intValue());
+ if (CollUtil.isNotEmpty(aiProductDependencies)){
+ //stream流操作aiProductDependencies,获取全部的targetProductId
+ Set<String> targetProductIds = aiProductDependencies.stream().map(AiProductDependency::getTargetProductId).collect(Collectors.toSet());
+
+ List<AiMemberProductUnlock> aiMemberProductUnlocks = aiMemberProductUnlockService.selectListByProductIds(targetProductIds, memberUuid);
+ Set<String> doneProductIds = aiMemberProductUnlocks.stream().map(AiMemberProductUnlock::getProductId).collect(Collectors.toSet());
+
+ //获取在targetProductIds集合中，并且不在doneProductIds集合中的productId
+ Set<String> unlockProductIds = targetProductIds.stream().filter(productId -> !doneProductIds.contains(productId)).collect(Collectors.toSet());
+ if (CollUtil.isNotEmpty(unlockProductIds)){
+ aiMemberProductUnlockService.insertList(companyId,unlockProductIds, memberUuid,percentage.intValue());
+ }
+ }
return new FebsResponse().success().data(apiMemberAnswerInsureVo);
}
@@ -366,4 +409,50 @@
dto.setMemberUuid(memberUuid);
return aiMemberAnswerItemService.wrongPage(dto);
}
+
+ @Override
+ public FebsResponse myWork(ApiMemberProductWorkPageDto dto) {
+ String memberUuid = LoginUserUtil.getLoginUser().getMemberUuid();
+ dto.setMemberUuid(memberUuid);
+ // 创建分页对象，传入当前页和每页大小
+ Page<ApiMemberProductWorkVo> page = new Page<>(dto.getPageNow(), dto.getPageSize());
+ Page<ApiMemberProductWorkVo> pageListByQuery = this.getBaseMapper().getPageMyWorkListByQuery(page, dto);
+
+ return new FebsResponse().success().data(pageListByQuery);
+ }
+
+ @Override
+ public void updateMemberAnswerUpdateTime(String memberAnswerId, Date updateTime) {
+ aiMemberAnswerMapper.update(
+ null,
+ Wrappers.lambdaUpdate(AiMemberAnswer.class)
+ .set(AiMemberAnswer::getUpdatedTime,updateTime)
+ .eq(AiMemberAnswer::getId,memberAnswerId)
+ );
+ }
+
+ @Override
+ public List<AiMemberAnswer> getListByCompanyId(String companyId) {
+ return aiMemberAnswerMapper.selectList(
+ Wrappers.lambdaQuery(AiMemberAnswer.class)
+ .eq(AiMemberAnswer::getCompanyId, companyId)
+ .eq(AiMemberAnswer::getState, AiTypeEnum.AI_MEMBER_ANSWER_STATE_DONE.getCode())
+ );
+ }
+
+ @Override
+ public List<AiMemberAnswer> getListByCompanyIdAndMemberUuid(String companyId, String memberUuid) {
+ return aiMemberAnswerMapper.selectList(
+ Wrappers.lambdaQuery(AiMemberAnswer.class)
+ .eq(AiMemberAnswer::getCompanyId, companyId)
+ .eq(AiMemberAnswer::getMemberId, memberUuid)
+ .eq(AiMemberAnswer::getState, AiTypeEnum.AI_MEMBER_ANSWER_STATE_DONE.getCode())
+ );
+ }
+
+ @Override
+ public Page<ApiMemberAnswerPageVo> getAnswerPage(Page<ApiMemberAnswerPageVo> page, ApiMemberAnswerPageDto dto) {
+
+ return aiMemberAnswerMapper.getAnswerPage(page,dto);
+ }
}
--
Gitblit v1.9.1