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 | 10 ++++++++-- src/main/java/cc/mrbird/febs/ai/controller/TestController.java | 2 ++ src/main/java/cc/mrbird/febs/ai/enumerates/AiPromptEnum.java | 2 +- src/main/java/cc/mrbird/febs/ai/req/talk/ApiTalkDto.java | 3 +++ 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/ai/controller/TestController.java b/src/main/java/cc/mrbird/febs/ai/controller/TestController.java index b8311c0..811117b 100644 --- a/src/main/java/cc/mrbird/febs/ai/controller/TestController.java +++ b/src/main/java/cc/mrbird/febs/ai/controller/TestController.java @@ -278,6 +278,8 @@ } Flux.from(resultStream) .doOnNext(message -> { + String reasoningContent = message.getOutput().getChoices().get(0).getMessage().getReasoningContent(); + System.out.print(reasoningContent); String content = message.getOutput().getChoices().get(0).getMessage().getContent(); System.out.print(content); }) diff --git a/src/main/java/cc/mrbird/febs/ai/enumerates/AiPromptEnum.java b/src/main/java/cc/mrbird/febs/ai/enumerates/AiPromptEnum.java index 8386811..1d2ab97 100644 --- a/src/main/java/cc/mrbird/febs/ai/enumerates/AiPromptEnum.java +++ b/src/main/java/cc/mrbird/febs/ai/enumerates/AiPromptEnum.java @@ -11,7 +11,7 @@ HIGH_LIGHT(2,"请输出亮点"), - STREAM_NORMAL(1,"你是人工智能,请回答我提出的问题"); + STREAM_NORMAL(1,"你是人工智能,请回答我输入的问题"); private final int code; private final String prompt; diff --git a/src/main/java/cc/mrbird/febs/ai/req/talk/ApiTalkDto.java b/src/main/java/cc/mrbird/febs/ai/req/talk/ApiTalkDto.java index f5f200e..5276b6c 100644 --- a/src/main/java/cc/mrbird/febs/ai/req/talk/ApiTalkDto.java +++ b/src/main/java/cc/mrbird/febs/ai/req/talk/ApiTalkDto.java @@ -14,6 +14,9 @@ @ApiModel(value = "ApiTalkDto", description = "参数") public class ApiTalkDto { + @ApiModelProperty(value = "思考内容", example = "10") + private String reasoningContent; + @NotBlank(message = "内容不能为空") @ApiModelProperty(value = "内容", example = "10") private String context; 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 3d7be4e..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 @@ -16,6 +16,7 @@ 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; @@ -25,6 +26,7 @@ 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; @@ -37,6 +39,7 @@ import java.util.ArrayList; import java.util.Date; +import java.util.HashMap; import java.util.List; @Slf4j @@ -71,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); @@ -78,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()); -- Gitblit v1.9.1