添加功能

pom.xml

@@ -54,11 +54,11 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
             <version>5.8.26</version>
-        </dependency>
+        </dependency>-->
     </dependencies>
 
     <build>

src/main/java/com/supervision/contoller/ChatController.java

@@ -2,6 +2,7 @@ package com.supervision.contoller;
 
 import com.supervision.dto.R;
 import com.supervision.dto.robot.RobotTalkDTO;
+import com.supervision.model.RobotTalkReq;
 import com.supervision.service.IChatService;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
@@ -21,8 +22,8 @@ public class ChatController {
     private final IChatService chatService;
 
     @PostMapping("/talk")
-    public R<RobotTalkDTO> talk(@RequestParam("file") MultipartFile multipartFile) {
-        RobotTalkDTO talk = chatService.talk(multipartFile);
+    public R<RobotTalkDTO> talk(@RequestParam("file") MultipartFile multipartFile, @ModelAttribute RobotTalkReq robotTalkReq) {
+        RobotTalkDTO talk = chatService.talk(multipartFile,robotTalkReq);
         return R.ok(talk);
     }
 

src/main/java/com/supervision/dto/dify/ChatResDTO.java

@@ -0,0 +1,18 @@
+package com.supervision.dto.dify;
+
+
+import lombok.Data;
+
+@Data
+public class ChatResDTO {
+
+    private String mode;
+    private String answer;
+    private String conversation_id;
+    private long created_at;
+    private String task_id;
+    private String message_id;
+    private String id;
+    private String event;
+
+}

src/main/java/com/supervision/model/RobotTalkReq.java

@@ -1,4 +1,4 @@
-package com.supervision.vo.talk;
+package com.supervision.model;
 
 import cn.hutool.core.util.StrUtil;
 import lombok.Data;

src/main/java/com/supervision/model/dify/DifyChatReqVO.java

@@ -9,4 +9,6 @@ public class DifyChatReqVO {
     private String user;
     private String response_mode = CHAT_RESPONSE_MODE_BLOCKING;
     private DIFYChatReqInputVO inputs = new DIFYChatReqInputVO();
+    private String query;
+    private String conversation_id;
 }

src/main/java/com/supervision/service/IChatService.java

@@ -1,14 +1,14 @@
 package com.supervision.service;
 
 import com.supervision.dto.robot.RobotTalkDTO;
+import com.supervision.model.RobotTalkReq;
 import jakarta.servlet.http.HttpServletResponse;
-import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 
 public interface IChatService {
-    RobotTalkDTO talk(MultipartFile file);
+    RobotTalkDTO talk(MultipartFile file, RobotTalkReq robotTalkReq);
 
     void getAudio(HttpServletResponse response, String audioId) throws IOException;
 }

src/main/java/com/supervision/service/impl/ChatServiceImpl.java

@@ -1,10 +1,12 @@
 package com.supervision.service.impl;
 
 import cn.hutool.core.codec.Base64;
+import com.supervision.dto.dify.ChatResDTO;
 import com.supervision.dto.paddlespeech.res.TtsResultDTO;
 import com.supervision.dto.robot.AnswerInfo;
 import com.supervision.dto.robot.AskInfo;
 import com.supervision.dto.robot.RobotTalkDTO;
+import com.supervision.model.RobotTalkReq;
 import com.supervision.model.dify.DIFYChatReqInputVO;
 import com.supervision.model.dify.DifyChatReqVO;
 import com.supervision.service.IChatService;
@@ -34,8 +36,9 @@ public class ChatServiceImpl implements IChatService {
 
 
     @Override
-    public RobotTalkDTO talk(MultipartFile file) {
-        RobotTalkDTO.RobotTalkDTOBuilder builder = RobotTalkDTO.builder().sessionId("111");
+    public RobotTalkDTO talk(MultipartFile file, RobotTalkReq robotTalkReq) {
+        log.info("robotTalkReq:{}", robotTalkReq);
+        RobotTalkDTO.RobotTalkDTOBuilder builder = RobotTalkDTO.builder();
 
         try {
             byte[] bytes = file.getBytes();
@@ -44,21 +47,21 @@ public class ChatServiceImpl implements IChatService {
             difyChatReqVO.setUser("admin");
             DIFYChatReqInputVO inputs = new DIFYChatReqInputVO();
             stopWatch.start("stt");
-            inputs.setQuery(AsrUtil.asrTransformByBytes(bytes));
             stopWatch.stop();
-            String askUUid = UUID.randomUUID().toString();
-            builder.askInfo(AskInfo.builder().contentType(2).message(inputs.getQuery()).audioLength(100L).askId(askUUid).build());
-            voiceCache.put(askUUid, Base64.encode(bytes));
-            difyChatReqVO.setInputs(inputs);
+            difyChatReqVO.setQuery(AsrUtil.asrTransformByBytes(bytes));
+            difyChatReqVO.setConversation_id(robotTalkReq.getSessionId());
             stopWatch.start("dify");
-            String response = difyApiUtil.chat(difyChatReqVO);
+            ChatResDTO chatResDTO = difyApiUtil.chat(difyChatReqVO);
             stopWatch.stop();
-            log.info("response:{}", response);
+            log.info("response:{}", chatResDTO.getAnswer());
+            builder.askInfo(AskInfo.builder().contentType(2).message(inputs.getQuery()).audioLength(100L).askId(chatResDTO.getMessage_id()).build());
+            voiceCache.put(chatResDTO.getMessage_id(), Base64.encode(bytes));
             stopWatch.start("tts");
-            TtsResultDTO ttsResultDTO = TtsUtil.ttsTransform(response);
+            TtsResultDTO ttsResultDTO = TtsUtil.ttsTransform(chatResDTO.getAnswer());
             stopWatch.stop();
             String voiceBaseId = UUID.randomUUID().toString();
-            builder.answerInfo(AnswerInfo.builder().contentType(2).message(response).voiceBaseId(voiceBaseId).voiceBase64(ttsResultDTO.getAudio()).build());
+            builder.answerInfo(AnswerInfo.builder().contentType(2).message(chatResDTO.getAnswer()).voiceBaseId(voiceBaseId).voiceBase64(ttsResultDTO.getAudio()).build());
+            builder.sessionId(chatResDTO.getConversation_id());
             voiceCache.put(voiceBaseId, ttsResultDTO.getAudio());
             log.info("耗时：{}", stopWatch.prettyPrint());
         } catch (IOException e) {

src/main/java/com/supervision/util/DifyApiUtil.java

@@ -1,7 +1,7 @@
 package com.supervision.util;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.supervision.dto.dify.ChatResDTO;
 import com.supervision.model.dify.DifyChatReqVO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.hc.client5.http.ClientProtocolException;
@@ -27,8 +27,8 @@ public class DifyApiUtil {
     @Value("${dify.app-auth}")
     private String difyAppAuth;
 
-    public String chat(DifyChatReqVO difyChatReqVO) {
-        String result = null;
+    public ChatResDTO chat(DifyChatReqVO difyChatReqVO) {
+        ChatResDTO execute;
         try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
             HttpPost httpPost = new HttpPost(difyUrl);
             httpPost.setHeader(HttpHeaders.AUTHORIZATION, difyAppAuth);
@@ -36,14 +36,14 @@ public class DifyApiUtil {
             log.info("发起对话：{}", difyChatReqVO);
             StringEntity entity = new StringEntity(com.alibaba.fastjson.JSONObject.toJSON(difyChatReqVO).toString(), StandardCharsets.UTF_8);
             httpPost.setEntity(entity);
-            result = httpClient.execute(httpPost, response -> {
+            execute = httpClient.execute(httpPost, response -> {
                 final int status = response.getCode();
                 if (status >= HttpStatus.SC_SUCCESS && status < HttpStatus.SC_REDIRECTION) {
                     final HttpEntity responseEntity = response.getEntity();
                     String responseStr = EntityUtils.toString(responseEntity);
-                    JSONObject jsonObject = JSON.parseObject(responseStr);
-                    log.info("DIFY返回：{}", jsonObject.getJSONObject("data").getJSONObject("outputs").get("answerText").toString());
-                    return jsonObject.getJSONObject("data").getJSONObject("outputs").get("answerText").toString();
+                    ChatResDTO chatResDTO = JSONUtil.toBean(responseStr, ChatResDTO.class);
+                    log.info("DIFY返回：{}", chatResDTO.getAnswer());
+                    return chatResDTO;
                 } else {
                     log.info("responseEntity {}", EntityUtils.toString(response.getEntity()));
                     throw new ClientProtocolException("Unexpected response status: " + status);
@@ -51,8 +51,9 @@ public class DifyApiUtil {
             });
         } catch (Exception e) {
             log.error("发起对话失败", e);
+            throw new RuntimeException("发起对话失败");
         }
-        return result;
+        return execute;
     }
 
 }

src/main/java/com/supervision/util/TtsUtil.java

@@ -24,7 +24,6 @@ public class TtsUtil {
         try {
             PaddleSpeechResDTO<TtsResultDTO> response = objectMapper.readValue(post, new TypeReference<PaddleSpeechResDTO<TtsResultDTO>>() {
             });
-            log.info("response:{}", response.getResult());
             if (!response.getSuccess() || ObjectUtil.isEmpty(response.getResult())) {
                 throw new BusinessException("文字转换语音失败");
             }

src/main/resources/application.yml

@@ -6,8 +6,8 @@ server:
   servlet:
     context-path: /speech-demo-service
 dify:
-  url: http://192.168.10.137/v1/workflows/run
-  app-auth: Bearer app-cSxbjvdTZQhq2p2cKinChIhj
+  url: http://192.168.10.138/v1/chat-messages
+  app-auth: Bearer app-79ABpRQWayX0bK9C2m7vecXe
 paddle-speech:
   tts: http://192.168.10.138:8090/paddlespeech/tts
   asr: http://192.168.10.138:8090/paddlespeech/asr

src/test/java/com/supervision/SpeechDemoServiceApplicationTests.java

@@ -1,11 +1,15 @@
 package com.supervision;
 
 import cn.hutool.json.JSONUtil;
+import com.supervision.dto.dify.ChatResDTO;
 import com.supervision.dto.paddlespeech.res.TtsResultDTO;
+import com.supervision.model.dify.DIFYChatReqInputVO;
+import com.supervision.model.dify.DifyChatReqVO;
 import com.supervision.util.AsrUtil;
+import com.supervision.util.DifyApiUtil;
 import com.supervision.util.TtsUtil;
+import jakarta.annotation.Resource;
 import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
 
@@ -34,4 +38,20 @@ class SpeechDemoServiceApplicationTests {
         System.out.println(text);
 
     }
+
+
+    @Resource
+    private DifyApiUtil difyApiUtil;
+    @Test
+    public void chatTest() {
+        DifyChatReqVO difyChatReqVO = new DifyChatReqVO();
+        difyChatReqVO.setUser("admin");
+        DIFYChatReqInputVO inputs = new DIFYChatReqInputVO();
+        difyChatReqVO.setQuery("我叫什么？");
+        difyChatReqVO.setInputs(inputs);
+
+        System.out.println(JSONUtil.toJsonStr(difyChatReqVO));
+        ChatResDTO chat = difyApiUtil.chat(difyChatReqVO);
+        System.out.println(JSONUtil.toJsonStr(chat));
+    }
 }