From 83b6ee65a7d3c1f37d8ec896902b5189132d59c7 Mon Sep 17 00:00:00 2001 From: Administrator <15274802129@163.com> Date: Wed, 27 Aug 2025 15:00:38 +0800 Subject: [PATCH] feat(ai): 添加再练一次(重新回答)功能 --- src/main/java/cc/mrbird/febs/ai/service/impl/AiMemberTalkServiceImpl.java | 72 ++++++++++++++++++++++++++++++----- 1 files changed, 61 insertions(+), 11 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..b921f93 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,13 +1,15 @@ 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.*; import cc.mrbird.febs.ai.res.ai.AiResponse; +import cc.mrbird.febs.ai.res.memberTalk.ApiMemberTalkReloadVo; import cc.mrbird.febs.ai.res.memberTalk.ApiMemberTalkVo; import cc.mrbird.febs.ai.service.AiMemberTalkItemService; import cc.mrbird.febs.ai.service.AiMemberTalkService; @@ -19,14 +21,18 @@ 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.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; /** @@ -52,6 +58,7 @@ } @Override + @Transactional public FebsResponse start(ApiMemberTalkDto dto) { String memberUuid = LoginUserUtil.getLoginUser().getMemberUuid(); @@ -75,7 +82,9 @@ aiMemberTalk = this.add(memberUuid,productId,nowTime); } - AiResponse aiResponse = aiService.start(aiProductRoleLink.getProductRoleId(),"<strong>\"生成题目\"</strong>"); + List<AiMessage> aiMessageDtoList = aiMemberTalkItemService.getQuestionUpDownContext(aiMemberTalk.getId(),AiTypeEnum.QUESTION.getCode()); + + AiResponse aiResponse = aiService.start(aiMessageDtoList,AiTypeEnum.QUESTION.getCode(),aiProductRoleLink.getProductRoleId(),AiTypeEnum.QUESTION.getName(), null); if(aiResponse.getCode().equals("200")){ aiMemberTalkItemService.add(memberUuid,aiMemberTalk.getId(),1,aiResponse.getResContext(),nowTime); this.updateTimeUpdate(nowTime,aiMemberTalk.getId()); @@ -86,9 +95,26 @@ apiMemberTalkVo.setMemberTalkId(aiMemberTalk.getId()); apiMemberTalkVo.setType(1); apiMemberTalkVo.setContext(aiResponse.getResContext()); - apiMemberTalkVo.setReport(aiResponse.getReport()); - 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); + 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 @@ -176,8 +202,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(); @@ -207,11 +234,19 @@ 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); + + + 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(); - aiMemberTalkItemService.add(memberUuid,aiMemberTalk.getId(),3,aiResponse.getResContext(),nowTime); + context = String.valueOf(JSONUtil.parse(aiResponse.getReport())); + if ("null".equals( context)){ + context = aiResponse.getResContext(); + } + aiMemberTalkItemService.add(memberUuid,aiMemberTalk.getId(),3, context,nowTime); this.updateTimeUpdate(nowTime,aiMemberTalk.getId()); }else{ throw new FebsException(aiResponse.getDescription()); @@ -219,8 +254,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 +267,20 @@ aiMemberTalkMapper.insert(aiMemberTalk); return aiMemberTalk; } + + @Override + public FebsResponse historyPage(ApiMemberTalkItemPageDto dto) { + + String memberUuid = LoginUserUtil.getLoginUser().getMemberUuid(); + dto.setMemberUuid(memberUuid); + return aiMemberTalkItemService.historyPage(dto); + } + + @Override + public Flux<FebsResponse> answerStream(String question) { + +// String memberUuid = LoginUserUtil.getLoginUser().getMemberUuid(); + return aiService.answerStream(question); + } + } -- Gitblit v1.9.1