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/AiTalkServiceImpl.java | 36 +++++++++++++++++++++++++++++++++--- 1 files changed, 33 insertions(+), 3 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/ai/service/impl/AiTalkServiceImpl.java b/src/main/java/cc/mrbird/febs/ai/service/impl/AiTalkServiceImpl.java index 2cabe56..7eda1af 100644 --- a/src/main/java/cc/mrbird/febs/ai/service/impl/AiTalkServiceImpl.java +++ b/src/main/java/cc/mrbird/febs/ai/service/impl/AiTalkServiceImpl.java @@ -2,12 +2,12 @@ import cc.mrbird.febs.ai.entity.AiProductQuestion; import cc.mrbird.febs.ai.entity.AiTalk; +import cc.mrbird.febs.ai.enumerates.AiPromptEnum; import cc.mrbird.febs.ai.mapper.AiTalkMapper; import cc.mrbird.febs.ai.req.talk.AiTalkAnswerStream; import cc.mrbird.febs.ai.req.talk.ApiTalkDto; import cc.mrbird.febs.ai.req.talk.ApiTalkItemPageDto; import cc.mrbird.febs.ai.req.talk.ApiTalkPageDto; -import cc.mrbird.febs.ai.res.memberAnswer.ApiMemberProductWorkVo; import cc.mrbird.febs.ai.res.talk.ApiTalkPageVo; import cc.mrbird.febs.ai.res.talk.ApiTalkQuestionVo; import cc.mrbird.febs.ai.res.talk.ApiTalkVo; @@ -15,6 +15,10 @@ import cc.mrbird.febs.ai.service.AiService; import cc.mrbird.febs.ai.service.AiTalkItemService; import cc.mrbird.febs.ai.service.AiTalkService; +import cc.mrbird.febs.ai.strategy.LlmStrategyFactory; +import cc.mrbird.febs.ai.strategy.enumerates.LlmStrategyContextEnum; +import cc.mrbird.febs.ai.strategy.enumerates.LlmStrategyEnum; +import cc.mrbird.febs.ai.strategy.param.LlmStrategyDto; import cc.mrbird.febs.ai.utils.UUID; import cc.mrbird.febs.common.entity.FebsResponse; import cc.mrbird.febs.common.utils.LoginUserUtil; @@ -22,6 +26,8 @@ import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONUtil; +import com.alibaba.dashscope.common.Role; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -33,6 +39,7 @@ import java.util.ArrayList; import java.util.Date; +import java.util.HashMap; import java.util.List; @Slf4j @@ -43,6 +50,7 @@ private final AiTalkItemService aiTalkItemService; private final AiProductQuestionService aiProductQuestionService; private final AiService aiService; + private final LlmStrategyFactory llmStrategyFactory; @Override public FebsResponse questionList() { @@ -66,6 +74,7 @@ String talkId = dto.getTalkId(); String context = dto.getContext(); Integer type = dto.getType(); + String reasoningContent = dto.getReasoningContent(); String memberUuid = LoginUserUtil.getLoginUser().getMemberUuid(); AiTalk aiTalk = this.getById(talkId); @@ -73,8 +82,10 @@ if (StrUtil.isEmpty(talkId)){ aiTalk = this.add(memberUuid,context, date); } - - aiTalkItemService.add(aiTalk.getId(), type, context, memberUuid, date); + HashMap<String, String> stringStringHashMap = new HashMap<>(); + stringStringHashMap.put(LlmStrategyContextEnum.THINK.getName(),reasoningContent); + stringStringHashMap.put(LlmStrategyContextEnum.CONTENT.getName(),context); + aiTalkItemService.add(aiTalk.getId(), type, JSONUtil.toJsonStr(stringStringHashMap), memberUuid, date); ApiTalkVo apiTalkVo = new ApiTalkVo(); apiTalkVo.setTalkId(aiTalk.getId()); @@ -121,4 +132,23 @@ return aiService.answerStreamV2(dto); } + @Override + public Flux<FebsResponse> answerStreamV3(AiTalkAnswerStream dto) { + ArrayList<LlmStrategyDto> llmStrategyDtoList = new ArrayList<>(); + if (dto.getPrompt() != null){ + LlmStrategyDto llmStrategyDto = new LlmStrategyDto(); + llmStrategyDto.setRole(Role.SYSTEM.getValue()); + llmStrategyDto.setContent(AiPromptEnum.STREAM_NORMAL.getPrompt()); + llmStrategyDtoList.add(llmStrategyDto); + } + if (dto.getQuestion() != null){ + LlmStrategyDto llmStrategyDto = new LlmStrategyDto(); + llmStrategyDto.setRole(Role.USER.getValue()); + llmStrategyDto.setContent(dto.getQuestion()); + llmStrategyDtoList.add(llmStrategyDto); + } + String modelName = LlmStrategyEnum.getName(aiService.getSystemSetAiType()); + return llmStrategyFactory.getCalculationStrategyMap().get(modelName).llmInvokeStreamingWithThink(llmStrategyDtoList); + } + } -- Gitblit v1.9.1