chenxudong
/
electromagnetic-data-new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clean code

This commit is contained in:
chenxudong 2025-04-03 15:03:53 +08:00
parent 059a417001
commit 9b177b5c1d
5 changed files with 42 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/ai/ChatTaskThread2.java → electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/ai/ChatTaskThread.java
View File

@ -10,12 +10,13 @@ import java.util.concurrent.Callable;
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
public class ChatTaskThread2 implements Callable<Flux<String>> { public class ChatTaskThread implements Callable<Flux<String>> {
private ChatService chatService; private ChatService chatService;
private QueryDTO queryDTO; private QueryDTO queryDTO;
@Override @Override
public Flux<String> call() throws Exception { public Flux<String> call() throws Exception {
return chatService.chatStreamStr(queryDTO.getMsg()); return chatService.chatStreamStr(queryDTO);
} }
} }

21
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/ai/ChatTaskThread1.java
View File

@ -1,21 +0,0 @@
package com.electromagnetic.industry.software.manage.ai;
import com.electromagnetic.industry.software.manage.pojo.req.QueryDTO;
import com.electromagnetic.industry.software.manage.service.serviceimpl.ChatService;
import lombok.AllArgsConstructor;
import lombok.NoArgsConstructor;
import java.util.concurrent.Callable;
@NoArgsConstructor
@AllArgsConstructor
public class ChatTaskThread1 implements Callable<String> {
private ChatService chatService;
private QueryDTO queryDTO;
@Override
public String call() throws Exception {
return chatService.chat(queryDTO);
}
}

23
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/ai/ChatTaskThread3.java
View File

@ -1,23 +0,0 @@
package com.electromagnetic.industry.software.manage.ai;
import com.electromagnetic.industry.software.manage.pojo.req.QueryDTO;
import com.electromagnetic.industry.software.manage.service.serviceimpl.ChatService;
import lombok.AllArgsConstructor;
import lombok.NoArgsConstructor;
import org.springframework.ai.chat.model.ChatResponse;
import reactor.core.publisher.Flux;
import java.util.concurrent.Callable;
@AllArgsConstructor
@NoArgsConstructor
public class ChatTaskThread3 implements Callable<Flux<ChatResponse>> {
private ChatService chatService;
private QueryDTO queryDTO;
@Override
public Flux<ChatResponse> call() throws Exception {
return chatService.chatStreamResponse(queryDTO.getMsg());
}
}

44
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/AiController.java
View File

@ -2,16 +2,12 @@ package com.electromagnetic.industry.software.manage.controller;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.electromagnetic.industry.software.common.resp.ElectromagneticResult; import com.electromagnetic.industry.software.common.resp.ElectromagneticResult;
import com.electromagnetic.industry.software.common.util.ElectromagneticResultUtil; import com.electromagnetic.industry.software.manage.ai.ChatTaskThread;
import com.electromagnetic.industry.software.manage.ai.ChatTaskThread1;
import com.electromagnetic.industry.software.manage.ai.ChatTaskThread2;
import com.electromagnetic.industry.software.manage.ai.ChatTaskThread3;
import com.electromagnetic.industry.software.manage.ai.ThreadUtil; import com.electromagnetic.industry.software.manage.ai.ThreadUtil;
import com.electromagnetic.industry.software.manage.pojo.req.QueryDTO; import com.electromagnetic.industry.software.manage.pojo.req.QueryDTO;
import com.electromagnetic.industry.software.manage.service.serviceimpl.ChatService; import com.electromagnetic.industry.software.manage.service.serviceimpl.ChatService;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.ai.chat.model.ChatResponse;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
@ -33,34 +29,34 @@ public class AiController {
return chatService.addFromUpload(file); return chatService.addFromUpload(file);
} }
@PostMapping("/chat") // @PostMapping("/chat")
public ElectromagneticResult<String> chat(@RequestBody QueryDTO queryDTO) throws Exception { // public ElectromagneticResult<String> chat(@RequestBody QueryDTO queryDTO) throws Exception {
log.info("question is --->" + queryDTO.getMsg()); // log.info("question is --->" + queryDTO.getMsg());
ChatTaskThread1 chatTaskThread = new ChatTaskThread1(chatService, queryDTO); // ChatTaskThread<String> chatTaskThread = new ChatTaskThread<>(chatService, queryDTO);
Future<String> future = ThreadUtil.getThreadPool().submit(chatTaskThread); // Future<String> future = ThreadUtil.getThreadPool().submit(chatTaskThread);
String res = future.get(); // String res = future.get();
log.info("answer is --->" + res); // log.info("answer is --->" + res);
return ElectromagneticResultUtil.success(res); // return ElectromagneticResultUtil.success(res);
} // }
@PostMapping(path = "/chatStreamStr", produces = MediaType.TEXT_EVENT_STREAM_VALUE) @PostMapping(path = "/chatStreamStr", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
public Flux<String> chatStreamStr(@RequestBody QueryDTO queryDTO) throws ExecutionException, InterruptedException { public Flux<String> chatStreamStr(@RequestBody QueryDTO queryDTO) throws ExecutionException, InterruptedException {
if (StrUtil.isEmpty(queryDTO.getMsg())) { if (StrUtil.isEmpty(queryDTO.getMsg())) {
return Flux.empty(); return Flux.empty();
} }
ChatTaskThread2 chatTaskThread = new ChatTaskThread2(chatService, queryDTO); ChatTaskThread chatTaskThread = new ChatTaskThread(chatService, queryDTO);
Future<Flux<String>> future = ThreadUtil.getThreadPool().submit(chatTaskThread); Future<Flux<String>> future = ThreadUtil.getThreadPool().submit(chatTaskThread);
return future.get(); return future.get();
} }
@PostMapping(path = "/chatStreamResp", produces = MediaType.TEXT_EVENT_STREAM_VALUE) // @PostMapping(path = "/chatStreamResp", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
public Flux<ChatResponse> chatStreamResp(@RequestBody QueryDTO queryDTO) throws ExecutionException, InterruptedException { // public Flux<ChatResponse> chatStreamResp(@RequestBody QueryDTO queryDTO) throws ExecutionException, InterruptedException {
if (StrUtil.isEmpty(queryDTO.getMsg())) { // if (StrUtil.isEmpty(queryDTO.getMsg())) {
return Flux.empty(); // return Flux.empty();
} // }
ChatTaskThread3 chatTaskThread = new ChatTaskThread3(chatService, queryDTO); // ChatTaskThread<Flux<ChatResponse>> chatTaskThread = new ChatTaskThread<>(chatService, queryDTO);
Future<Flux<ChatResponse>> future = ThreadUtil.getThreadPool().submit(chatTaskThread); // Future<Flux<ChatResponse>> future = ThreadUtil.getThreadPool().submit(chatTaskThread);
return future.get(); // return future.get();
} // }
} }

42
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/ChatService.java
View File

@ -17,12 +17,8 @@ import com.electromagnetic.industry.software.manage.pojo.req.QueryDTO;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.ai.chat.client.ChatClient; import org.springframework.ai.chat.client.ChatClient;
import org.springframework.ai.chat.client.advisor.AbstractChatMemoryAdvisor;
import org.springframework.ai.chat.client.advisor.MessageChatMemoryAdvisor; import org.springframework.ai.chat.client.advisor.MessageChatMemoryAdvisor;
import org.springframework.ai.chat.client.advisor.QuestionAnswerAdvisor; import org.springframework.ai.chat.client.advisor.QuestionAnswerAdvisor;
import org.springframework.ai.chat.messages.UserMessage;
import org.springframework.ai.chat.model.ChatResponse;
import org.springframework.ai.chat.prompt.Prompt;
import org.springframework.ai.document.Document; import org.springframework.ai.document.Document;
import org.springframework.ai.ollama.OllamaChatModel; import org.springframework.ai.ollama.OllamaChatModel;
import org.springframework.ai.vectorstore.VectorStore; import org.springframework.ai.vectorstore.VectorStore;
@ -107,25 +103,25 @@ public class ChatService {
return ElectromagneticResultUtil.success(fileMd5); return ElectromagneticResultUtil.success(fileMd5);
} }
public String chat(QueryDTO queryDTO) { // public String chat(String msg) {
//
// log.info("Start call model to answer");
//
// return ChatClient.builder(model).defaultAdvisors(messageChatMemoryAdvisor, questionAnswerAdvisor).build().prompt()
// .user(msg)
// .advisors(advisorSpec -> advisorSpec
//// .param(CHAT_MEMORY_CONVERSATION_ID_KEY, queryDTO.getUserId())
// .param(AbstractChatMemoryAdvisor.CHAT_MEMORY_RETRIEVE_SIZE_KEY, 100))
// .call()
// .content();
// }
//
// public Flux<ChatResponse> chatStreamResponse(String msg) {
// ChatClient.StreamResponseSpec stream = ChatClient.builder(model).defaultAdvisors(messageChatMemoryAdvisor, questionAnswerAdvisor).build().prompt(new Prompt(new UserMessage(msg))).stream();
// return stream.chatResponse();
// }
log.info("Start call model to answer"); public Flux<String> chatStreamStr(QueryDTO queryDTO) {
return ChatClient.builder(model).defaultAdvisors(messageChatMemoryAdvisor, questionAnswerAdvisor).build().prompt(queryDTO.getMsg()).stream().content();
return ChatClient.builder(model).defaultAdvisors(messageChatMemoryAdvisor, questionAnswerAdvisor).build().prompt()
.user(queryDTO.getMsg())
.advisors(advisorSpec -> advisorSpec
// .param(CHAT_MEMORY_CONVERSATION_ID_KEY, queryDTO.getUserId())
.param(AbstractChatMemoryAdvisor.CHAT_MEMORY_RETRIEVE_SIZE_KEY, 100))
.call()
.content();
}
public Flux<String> chatStreamStr(String msg) {
return ChatClient.builder(model).defaultAdvisors(messageChatMemoryAdvisor, questionAnswerAdvisor).build().prompt(msg).stream().content();
}
public Flux<ChatResponse> chatStreamResponse(String msg) {
ChatClient.StreamResponseSpec stream = ChatClient.builder(model).defaultAdvisors(messageChatMemoryAdvisor, questionAnswerAdvisor).build().prompt(new Prompt(new UserMessage(msg))).stream();
return stream.chatResponse();
} }
} }