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/controller/talk/ApiAiTalkController.java | 47 ++++++++++++++++++++++++++++++-----------------
1 files changed, 30 insertions(+), 17 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/ai/controller/talk/ApiAiTalkController.java b/src/main/java/cc/mrbird/febs/ai/controller/talk/ApiAiTalkController.java
index ada9ad3..6ece427 100644
--- a/src/main/java/cc/mrbird/febs/ai/controller/talk/ApiAiTalkController.java
+++ b/src/main/java/cc/mrbird/febs/ai/controller/talk/ApiAiTalkController.java
@@ -1,31 +1,20 @@
package cc.mrbird.febs.ai.controller.talk;
-import cc.mrbird.febs.ai.req.memberTalk.ApiMemberTalkAnswerDto;
-import cc.mrbird.febs.ai.req.memberTalk.ApiMemberTalkDto;
-import cc.mrbird.febs.ai.req.memberTalk.ApiMemberTalkItemPageDto;
-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.memberTalk.ApiMemberTalkItemVo;
-import cc.mrbird.febs.ai.res.memberTalk.ApiMemberTalkStreamVo;
-import cc.mrbird.febs.ai.res.memberTalk.ApiMemberTalkVo;
+import cc.mrbird.febs.ai.req.talk.*;
+import cc.mrbird.febs.ai.res.memberTalk.ApiMemberTalkStreamVoOld;
import cc.mrbird.febs.ai.res.talk.ApiTalkItemPageVo;
import cc.mrbird.febs.ai.res.talk.ApiTalkPageVo;
import cc.mrbird.febs.ai.res.talk.ApiTalkQuestionVo;
import cc.mrbird.febs.ai.res.talk.ApiTalkVo;
-import cc.mrbird.febs.ai.service.AiMemberTalkService;
import cc.mrbird.febs.ai.service.AiTalkService;
import cc.mrbird.febs.common.entity.FebsResponse;
+import cn.hutool.core.util.StrUtil;
import io.swagger.annotations.*;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
import reactor.core.publisher.Flux;
-
-import java.io.IOException;
/**
* @author Administrator
@@ -48,6 +37,16 @@
public FebsResponse questionList() {
return aiTalkService.questionList();
+ }
+
+ @ApiOperation(value = "题目轮播", notes = "题目轮播")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "success", response = ApiTalkQuestionVo.class)
+ })
+ @PostMapping(value = "/questionListV2")
+ public FebsResponse questionListV2(@RequestBody @Validated ApiQuestionListDto dto) {
+
+ return aiTalkService.questionListV2(dto);
}
@ApiOperation(value = "用户AI问答", notes = "用户AI问答")
@@ -82,7 +81,7 @@
@ApiOperation("提问AI(流式)")
@ApiResponses({
- @ApiResponse(code = 200, message = "流式响应", response = ApiMemberTalkStreamVo.class),
+ @ApiResponse(code = 200, message = "流式响应", response = ApiMemberTalkStreamVoOld.class),
})
@GetMapping("/answer-stream")
public Flux<FebsResponse> answerStream(@RequestParam String question) {
@@ -92,11 +91,25 @@
@ApiOperation("提问AI(流式)V2")
@ApiResponses({
- @ApiResponse(code = 200, message = "流式响应", response = ApiMemberTalkStreamVo.class),
+ @ApiResponse(code = 200, message = "流式响应", response = ApiMemberTalkStreamVoOld.class),
})
@PostMapping("/answer-streamV2")
public Flux<FebsResponse> answerStreamV2(@RequestBody @Validated AiTalkAnswerStream dto) {
-
+ if (StrUtil.isEmpty(dto.getQuestion())){
+ return Flux.just(new FebsResponse().fail().message("请输入问题"));
+ }
return aiTalkService.answerStreamV2(dto);
}
+
+ @ApiOperation("提问AI(流式带思考过程)V3")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "流式响应", response = ApiMemberTalkStreamVoOld.class),
+ })
+ @PostMapping("/answer-streamV3")
+ public Flux<FebsResponse> answerStreamV3(@RequestBody @Validated AiTalkAnswerStream dto) {
+ if (StrUtil.isEmpty(dto.getQuestion())){
+ return Flux.just(new FebsResponse().fail().message("请输入问题"));
+ }
+ return aiTalkService.answerStreamV3(dto);
+ }
}
--
Gitblit v1.9.1