zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

由于前端响应超时，历史对话用数据库数据

Browse Source
This commit is contained in:
wuchunlei
2025-05-21 14:17:19 +08:00
parent e989ebeacf
commit 3c69aa9396
2 changed files with 57 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/com/peanut/modules/common/controller/RagFlowApiController.java
View File

@@ -1,16 +1,25 @@
package com.peanut.modules.common.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.peanut.common.utils.R;
import com.peanut.common.utils.RagFlowApiUtil;
import com.peanut.common.utils.ShiroUtils;
import com.peanut.modules.common.entity.AiChatContent;
import com.peanut.modules.common.service.AiChatContentService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import reactor.core.publisher.Flux;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@Slf4j
@RestController("commonRagFlowApi")
@@ -19,6 +28,8 @@ public class RagFlowApiController {
@Autowired
private RagFlowApiUtil ragFlowApiUtil;
@Autowired
private AiChatContentService aiChatContentService;
//聊天助手列表
@RequestMapping("/getChatAssistants")
@@ -47,7 +58,21 @@ public class RagFlowApiController {
//聊天助手下对话列表
@RequestMapping("/getChats")
public R getChats(@RequestBody Map<String,Object> params) throws Exception{
return R.ok().put("list",ragFlowApiUtil.getChats(params));
LambdaQueryWrapper<AiChatContent> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(AiChatContent::getUserId, ShiroUtils.getUId());
if (StringUtils.isNotEmpty(params.get("chatId").toString())||
StringUtils.isNotEmpty(params.get("sessionId").toString())){
wrapper.eq(StringUtils.isNotEmpty(params.get("chatId").toString()),
AiChatContent::getChatAssistantId,params.get("chatId"));
wrapper.eq(StringUtils.isNotEmpty(params.get("sessionId").toString()),
AiChatContent::getChatId,params.get("sessionId"));
wrapper.orderByAsc(AiChatContent::getCreateTime);
}else {
wrapper.groupBy(AiChatContent::getChatId);
wrapper.orderByDesc(AiChatContent::getCreateTime);
}
List<AiChatContent> contents = aiChatContentService.list(wrapper);
return R.ok().put("list",contents);
}
//创建会话
@@ -58,6 +83,7 @@ public class RagFlowApiController {
//与助手聊天流式
@RequestMapping(value = "/chatToAssistantStream", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
@Transactional
public Flux<String> chatToAssistantStream(String chatId,String chatName,String sessionId,String sessionName,String question,String patientName){
return ragFlowApiUtil.chatToAssistantStream(chatId,chatName,sessionId,sessionName,question,patientName);
}