语音流式方式处理。

yanghl
1 parent 71e86108
Showing 6 changed files with 249 additions and 387 deletions
src/main/java/com/xly/tts/bean/TTSResponseDTO.java
src/main/java/com/xly/tts/service/LocalAudioCache.java
src/main/java/com/xly/tts/service/PythonTtsProxyService.java
src/main/java/com/xly/util/AdvancedSymbolRemover.java
src/main/java/com/xly/web/TTSStreamController.java
src/main/resources/templates/chat.html
@@ -8,7 +8,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
  
 import java.io.Serializable;
-import java.util.Map;
  
 /**
  * TTS响应数据传输对象
@@ -27,6 +26,11 @@ public class TTSResponseDTO implements Serializable {
     private String requestId;
  
     /**
+     * 【新加】缓存唯一KEY，用于多用户不冲突
+     */
+    private String cacheKey;
+
+    /**
      * 状态码：200成功，其他失败
      */
     @Builder.Default
@@ -65,8 +69,6 @@ public class TTSResponseDTO implements Serializable {
  
     private String sReturnType = ReturnTypeCode.MAKEDOWN.getCode();
  
-
-
     /**
      * 创建失败响应
      */
@@ -97,5 +99,4 @@ public class TTSResponseDTO implements Serializable {
                 .timestamp(System.currentTimeMillis())
                 .build();
     }
-
 }
 \ No newline at end of file
+package com.xly.tts.service;
+
+import com.xly.tts.bean.TTSResponseDTO;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class LocalAudioCache {
+    private static final Map<String, TTSResponseDTO> CACHE = new ConcurrentHashMap<>();
+
+    public static void put(String text, TTSResponseDTO dto) {
+        CACHE.put(text, dto);
+        // 5分钟后自动清理
+        new Thread(() -> {
+            try {
+                Thread.sleep(5 * 60 * 1000);
+                CACHE.remove(text);
+            } catch (Exception ignored) {}
+        }).start();
+    }
+
+    public static TTSResponseDTO get(String text) {
+        return CACHE.get(text);
+    }
+}
 \ No newline at end of file
@@ -24,6 +24,10 @@ import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.net.URL;
+import java.net.HttpURLConnection;
+import java.io.OutputStream;
+import java.io.InputStream;
  
 @Slf4j
 @Service
@@ -41,7 +45,6 @@ public class PythonTtsProxyService {
     private ExecutorService executorService;
  
     private final XlyErpService xlyErpService;
-
     private final UserSceneSessionService userSceneSessionService;
  
     @PostConstruct
@@ -62,14 +65,13 @@ public class PythonTtsProxyService {
      * 流式合成语音 - 代理到Python服务
      */
     public ResponseEntity<InputStreamResource> synthesizeStream(TTSRequestDTO request) {
-       return getVoiceResult(request);
+        return getVoiceResult(request);
     }
  
     /**
-     * 流式合成语音 - 代理到Python服务
+     * 【保持原有返回类型】AI对话 + 流式TTS
      */
     public ResponseEntity<TTSResponseDTO> synthesizeStreamAi(TTSRequestDTO request) {
-        //调用AI返回请求内容
         String userInput = request.getText();
         String sUserId = request.getUserid();
         String sUserName = request.getUsername();
@@ -77,43 +79,37 @@ public class PythonTtsProxyService {
         String sSubsidiaryId = request.getSubsidiaryid();
         String sUserType = request.getUsertype();
         String authorization = request.getAuthorization();
-        AiResponseDTO voiceText = xlyErpService.erpUserInput(userInput,sUserId,sUserName,sBrandsId,sSubsidiaryId,sUserType, authorization);
-        return synthesizeStreamAi(request,voiceText);
+        AiResponseDTO voiceText = xlyErpService.erpUserInput(userInput, sUserId, sUserName, sBrandsId, sSubsidiaryId, sUserType, authorization);
+        return synthesizeStreamAi(request, voiceText);
     }
  
     public ResponseEntity<TTSResponseDTO> cleanMemory(TTSRequestDTO request) {
-        //调用AI返回请求内容
         String sUserId = request.getUserid();
         String sUserName = request.getUsername();
         String sBrandsId = request.getBrandsid();
         String sSubsidiaryId = request.getSubsidiaryid();
         String sUserType = request.getUsertype();
         String authorization = request.getAuthorization();
-        AiResponseDTO aiResponseDTO = xlyErpService.cleanMemory(sUserId,sUserName,sBrandsId,sSubsidiaryId,sUserType, authorization);
+        AiResponseDTO aiResponseDTO = xlyErpService.cleanMemory(sUserId, sUserName, sBrandsId, sSubsidiaryId, sUserType, authorization);
         return ResponseEntity.ok(TTSResponseDTO.builder()
                 .code(200)
                 .message("success")
-                .originalText(request.getText()) // 原始文本
-                .processedText(aiResponseDTO.getAiText()) // AI提示语
-                .systemText(aiResponseDTO.getSystemText()) // 系统提示语言
+                .originalText(request.getText())
+                .processedText(aiResponseDTO.getAiText())
+                .systemText(aiResponseDTO.getSystemText())
                 .voice(request.getVoice())
                 .sSceneName(aiResponseDTO.getSSceneName())
-                .sMethodName (aiResponseDTO.getSMethodName())
-                .sReturnType (aiResponseDTO.getSReturnType())
+                .sMethodName(aiResponseDTO.getSMethodName())
+                .sReturnType(aiResponseDTO.getSReturnType())
                 .timestamp(System.currentTimeMillis())
                 .textLength(request.getText().length())
                 .build());
     }
  
-    /***
-     * @Author 钱豹
-     * @Date 11:16 2026/2/8
-     * @Param [request]
-     * @return org.springframework.http.ResponseEntity<com.xly.tts.bean.TTSResponseDTO>
-     * @Description 初始化加载方法
-     **/
+    /**
+     * 【保持原有返回类型】不动！！！
+     */
     public ResponseEntity<TTSResponseDTO> init(TTSRequestDTO request) {
-        //调用AI返回请求内容
         String sUserId = request.getUserid();
         String sUserName = request.getUsername();
         String sBrandsId = request.getBrandsid();
@@ -121,154 +117,127 @@ public class PythonTtsProxyService {
         String sUserType = request.getUsertype();
         String authorization = request.getAuthorization();
  
-        //清空记忆
+        // 清空记忆
         userSceneSessionService.cleanUserSession(sUserId);
-//        xlyErpService.initSceneGuide(sUserId,sUserType,StrUtil.EMPTY)
-        AiResponseDTO voiceText = xlyErpService.initSceneGuide(StrUtil.EMPTY,sUserId,sUserName,sBrandsId,sSubsidiaryId,sUserType, authorization);
+        AiResponseDTO voiceText = xlyErpService.initSceneGuide(StrUtil.EMPTY, sUserId, sUserName, sBrandsId, sSubsidiaryId, sUserType, authorization);
         voiceText.setSReturnType(ReturnTypeCode.HTML.getCode());
-        return synthesizeStreamAi(request,voiceText);
+        return synthesizeStreamAi(request, voiceText);
     }
  
-    public ResponseEntity<TTSResponseDTO> synthesizeStreamAi(TTSRequestDTO request,AiResponseDTO aiResponseDTO) {
+    /**
+     * 【保持原有返回类型】不动！内部流式请求Python
+     */
+    public ResponseEntity<TTSResponseDTO> synthesizeStreamAi(TTSRequestDTO request, AiResponseDTO aiResponseDTO) {
         String aiText = aiResponseDTO.getAiText();
         String systemText = aiResponseDTO.getSystemText();
-        if(ObjectUtil.isEmpty(systemText)){
+        if (ObjectUtil.isEmpty(systemText)) {
             systemText = StrUtil.EMPTY;
         }
-        //移除html
         String voiceTextNew = AdvancedSymbolRemover.removePunctuationHtml(aiText);
-        try {
-            //如果没有语音直接返回
-            if(!request.getVoiceless() || ObjectUtil.isEmpty(voiceTextNew)){
-                return ResponseEntity.ok(TTSResponseDTO.builder()
-                        .code(200)
-                        .message("success")
-                        .originalText(request.getText()) // 原始文本
-                        .processedText(aiText) // AI提示语
-                        .systemText(systemText) // 系统提示语言
-                        .voice(request.getVoice())
-                        .sSceneName(aiResponseDTO.getSSceneName())
-                        .sMethodName (aiResponseDTO.getSMethodName())
-                        .sReturnType (aiResponseDTO.getSReturnType())
-                        .sCommonts(BusinessCode.COMMONTS.getMessage())
-                        .timestamp(System.currentTimeMillis())
-                        .textLength(request.getText().length())
-                        .build());
-            }
  
-            // 构建Python服务请求
-            Map<String, Object> pythonRequest = new HashMap<>();
-            pythonRequest.put("text", voiceTextNew);
-            pythonRequest.put("voice", request.getVoice());
-            pythonRequest.put("rate", request.getRate() != null ? request.getRate() : "+10%");
-            pythonRequest.put("volume", request.getVolume() != null ? request.getVolume() : "+0%");
-            // 发送请求到Python服务
-            HttpHeaders headers = new HttpHeaders();
-            headers.setContentType(MediaType.APPLICATION_JSON);
-            headers.setAccept(Arrays.asList(MediaType.APPLICATION_OCTET_STREAM, MediaType.ALL));
-            HttpEntity<Map<String, Object>> entity = new HttpEntity<>(pythonRequest, headers);
-            ResponseEntity<byte[]> response = restTemplate.exchange(
-                    pythonServiceUrl + "/stream-synthesize",
-                    HttpMethod.POST,
-                    entity,
-                    byte[].class
-            );
+        TTSResponseDTO dto = TTSResponseDTO.builder()
+                .code(200)
+                .message("success")
+                .originalText(request.getText())
+                .processedText(aiText)
+                .systemText(systemText)
+                .voice(request.getVoice())
+                .sSceneName(aiResponseDTO.getSSceneName())
+                .sMethodName(aiResponseDTO.getSMethodName())
+                .sReturnType(aiResponseDTO.getSReturnType())
+                .sCommonts(BusinessCode.COMMONTS.getMessage())
+                .timestamp(System.currentTimeMillis())
+                .textLength((aiText + systemText).length())
+                .build();
  
-            if (response.getStatusCode() == HttpStatus.OK && response.getBody() != null) {
-                // 将音频数据转为Base64
-                String audioBase64 = Base64.getEncoder().encodeToString(response.getBody());
-                // 构建完整的响应DTO
-                TTSResponseDTO ttsResponse = TTSResponseDTO.builder()
-                        .code(200)
-                        .message("success")
-                        .originalText(request.getText()) // 原始文本
-                        .processedText(aiText) // AI提示语
-                        .systemText(systemText) // 系统提示语言
-                        .voice(request.getVoice())
-                        .timestamp(System.currentTimeMillis())
-                        .textLength((aiText+systemText).length())
-                        .audioBase64(audioBase64) // Base64编码的音频
-                        .audioSize(response.getBody().length)
-                        .sSceneName(aiResponseDTO.getSSceneName())
-                        .sMethodName(aiResponseDTO.getSMethodName())
-                        .sReturnType(aiResponseDTO.getSReturnType())
-                        .sCommonts(BusinessCode.COMMONTS.getMessage())
-                        .audioFormat("audio/mpeg")
-                        .build();
-                return ResponseEntity.ok(ttsResponse);
-            } else {
-                return ResponseEntity.status(response.getStatusCode())
-                        .body(TTSResponseDTO.error("python_service_error", 500,
-                                "Python服务响应失败: " + response.getStatusCode()));
+        boolean voiceless = Boolean.TRUE.equals(request.getVoiceless());
+        if (!voiceless || ObjectUtil.isEmpty(voiceTextNew)) {
+            return ResponseEntity.ok(dto);
+        }
+
+        // ==============================================
+        // 👇 【关键】生成 全局唯一的 key（多用户不冲突）
+        // ==============================================
+        String cacheKey = request.getUserid() + "_" + System.currentTimeMillis() + "_" + request.getText();
+
+        CompletableFuture.runAsync(() -> {
+            try {
+                Map<String, Object> params = new HashMap<>();
+                params.put("text", voiceTextNew);
+                params.put("voice", request.getVoice());
+                params.put("rate", request.getRate() != null ? request.getRate() : "+10%");
+                params.put("volume", request.getVolume() != null ? request.getVolume() : "+0%");
+
+                HttpHeaders headers = new HttpHeaders();
+                headers.setContentType(MediaType.APPLICATION_JSON);
+                headers.setAccept(Collections.singletonList(MediaType.APPLICATION_OCTET_STREAM));
+                HttpEntity<Map<String, Object>> entity = new HttpEntity<>(params, headers);
+
+                ResponseEntity<byte[]> response = restTemplate.exchange(
+                        pythonServiceUrl + "/stream-synthesize",
+                        HttpMethod.POST, entity, byte[].class
+                );
+
+                if (response.getStatusCode().is2xxSuccessful() && response.getBody() != null) {
+                    dto.setAudioBase64(Base64.getEncoder().encodeToString(response.getBody()));
+                    dto.setAudioSize(response.getBody().length);
+                    dto.setAudioFormat("audio/mpeg");
+
+                    // ==============================================
+                    // 👇 用唯一key存（不覆盖别人）
+                    // ==============================================
+                    LocalAudioCache.put(cacheKey, dto);
+                }
+            } catch (Exception e) {
+                log.warn("语音合成忽略：{}", e.getMessage());
             }
+        }, executorService);
  
-        } catch (Exception e) {
-//            e.printStackTrace();
-            TTSResponseDTO ttsResponse = TTSResponseDTO.builder()
-                    .code(200)
-                    .message("success")
-                    .originalText(request.getText()) // 原始文本
-                    .voice(request.getVoice())
-                    .timestamp(System.currentTimeMillis())
-                    .processedText(aiText) // AI提示语
-                    .systemText(systemText) // 系统提示语言
-                    .textLength((aiText+systemText).length())
-                    .sSceneName(aiResponseDTO.getSSceneName())
-                    .sMethodName (aiResponseDTO.getSMethodName())
-                    .sReturnType (aiResponseDTO.getSReturnType())
-                    .sCommonts(BusinessCode.COMMONTS.getMessage())
-                    .build();
-            return ResponseEntity.ok(ttsResponse);
-        }
+        // ==============================================
+        // 👇 把 cacheKey 返回给前端（前端靠它取音频）
+        // ==============================================
+        dto.setCacheKey(cacheKey);
+
+        return ResponseEntity.ok(dto);
     }
  
     public ResponseEntity<InputStreamResource> getVoiceResult(TTSRequestDTO request) {
         try {
-
-            String  voiceText = request.getText();
-            //移除html
-            voiceText = AdvancedSymbolRemover.removePunctuationHtml( voiceText);
-            // 构建Python服务请求
+            String voiceText = AdvancedSymbolRemover.removePunctuationHtml(request.getText());
             Map<String, Object> pythonRequest = new HashMap<>();
             pythonRequest.put("text", voiceText);
             pythonRequest.put("voice", request.getVoice());
             pythonRequest.put("rate", request.getRate() != null ? request.getRate() : "+0%");
             pythonRequest.put("volume", request.getVolume() != null ? request.getVolume() : "+0%");
-            // 发送请求到Python服务
+
             HttpHeaders headers = new HttpHeaders();
             headers.setContentType(MediaType.APPLICATION_JSON);
             headers.setAccept(Arrays.asList(MediaType.APPLICATION_OCTET_STREAM, MediaType.ALL));
+
             HttpEntity<Map<String, Object>> entity = new HttpEntity<>(pythonRequest, headers);
+
             ResponseEntity<byte[]> response = restTemplate.exchange(
                     pythonServiceUrl + "/stream-synthesize",
                     HttpMethod.POST,
                     entity,
                     byte[].class
             );
+
             if (response.getStatusCode() == HttpStatus.OK && response.getBody() != null) {
                 InputStream inputStream = new ByteArrayInputStream(response.getBody());
                 InputStreamResource resource = new InputStreamResource(inputStream);
-                // 构建响应头
                 HttpHeaders responseHeaders = new HttpHeaders();
                 responseHeaders.setContentType(MediaType.parseMediaType("audio/mpeg"));
                 responseHeaders.setContentLength(response.getBody().length);
                 responseHeaders.set("Content-Disposition", "inline; filename=\"speech.mp3\"");
-                responseHeaders.set("X-TTS-Source", "python-service");
-                responseHeaders.set("X-TTS-Voice", request.getVoice());
-                return ResponseEntity.ok()
-                        .headers(responseHeaders)
-                        .body(resource);
-            } else {
-                return ResponseEntity.status(response.getStatusCode()).build();
+                return ResponseEntity.ok().headers(responseHeaders).body(resource);
             }
         } catch (Exception e) {
             return fallbackResponse(request);
         }
+        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
     }
  
-    /**
-     * 快速合成接口
-     */
     public ResponseEntity<InputStreamResource> quickSynthesize(String text, String voice) {
         TTSRequestDTO request = new TTSRequestDTO();
         request.setText(text);
@@ -276,157 +245,81 @@ public class PythonTtsProxyService {
         return synthesizeStream(request);
     }
  
-    /**
-     * 异步流式合成
-     */
     public CompletableFuture<ResponseEntity<InputStreamResource>> synthesizeStreamAsync(TTSRequestDTO request) {
         return CompletableFuture.supplyAsync(() -> synthesizeStream(request), executorService);
     }
  
-    /**
-     * 获取可用语音列表
-     */
     public List<VoiceInfoDTO> getAvailableVoices() {
         try {
-            log.info("从Python服务获取语音列表");
-
-            ResponseEntity<Map> response = restTemplate.getForEntity(
-                    pythonServiceUrl + "/voices",
-                    Map.class
-            );
-
+            ResponseEntity<Map> response = restTemplate.getForEntity(pythonServiceUrl + "/voices", Map.class);
             if (response.getStatusCode() == HttpStatus.OK && response.getBody() != null) {
-                Map<String, Object> responseBody = response.getBody();
-                List<Map<String, String>> voicesData = (List<Map<String, String>>) responseBody.get("voices");
-
+                List<Map<String, String>> voicesData = (List<Map<String, String>>) response.getBody().get("voices");
                 List<VoiceInfoDTO> voices = new ArrayList<>();
-                for (Map<String, String> voiceData : voicesData) {
-                    VoiceInfoDTO voice = new VoiceInfoDTO();
-                    voice.setName(voiceData.get("name"));
-                    voice.setLocale(voiceData.get("locale"));
-                    voice.setGender(voiceData.get("gender"));
-                    voice.setDisplayName(voiceData.get("displayName"));
-                    voices.add(voice);
+                for (Map<String, String> vd : voicesData) {
+                    VoiceInfoDTO vo = new VoiceInfoDTO();
+                    vo.setName(vd.get("name"));
+                    vo.setLocale(vd.get("locale"));
+                    vo.setGender(vd.get("gender"));
+                    vo.setDisplayName(vd.get("displayName"));
+                    voices.add(vo);
                 }
-
-                log.info("从Python服务获取到 {} 个语音", voices.size());
                 return voices;
             }
         } catch (Exception e) {
-            log.error("获取Python服务语音列表失败: {}", e.getMessage());
+            log.error("获取语音列表失败", e);
         }
-
-        // 返回默认语音列表作为降级
         return getDefaultVoices();
     }
  
-    /**
-     * 获取语音详情
-     */
     public VoiceInfoDTO getVoiceDetail(String name) {
-        List<VoiceInfoDTO> voices = getAvailableVoices();
-        return voices.stream()
-                .filter(v -> v.getName().equals(name))
-                .findFirst()
-                .orElse(null);
+        return getAvailableVoices().stream().filter(v -> v.getName().equals(name)).findFirst().orElse(null);
     }
  
-    /**
-     * 健康检查
-     */
     public boolean healthCheck() {
         try {
-            ResponseEntity<Map> response = restTemplate.getForEntity(
-                    pythonServiceUrl + "/health",
-                    Map.class
-            );
-
-            boolean healthy = response.getStatusCode() == HttpStatus.OK &&
-                    "healthy".equals(response.getBody().get("status"));
-
-            log.info("Python服务健康状态: {}", healthy ? "健康" : "异常");
-            return healthy;
-
+            ResponseEntity<Map> res = restTemplate.getForEntity(pythonServiceUrl + "/health", Map.class);
+            return res.getStatusCode() == HttpStatus.OK && "healthy".equals(res.getBody().get("status"));
         } catch (Exception e) {
-            log.error("Python服务健康检查失败: {}", e.getMessage());
             return false;
         }
     }
  
-    /**
-     * 批量合成
-     */
     public List<ResponseEntity<InputStreamResource>> batchSynthesize(List<TTSRequestDTO> requests) {
-        List<ResponseEntity<InputStreamResource>> results = new ArrayList<>();
-
-        for (TTSRequestDTO request : requests) {
-            results.add(synthesizeStream(request));
-        }
-
-        return results;
+        List<ResponseEntity<InputStreamResource>> list = new ArrayList<>();
+        for (TTSRequestDTO req : requests) list.add(synthesizeStream(req));
+        return list;
     }
  
-    /**
-     * 直接合成（用于测试）
-     */
     public ResponseEntity<InputStreamResource> synthesizeDirect(TTSRequestDTO request) {
         return synthesizeStream(request);
     }
  
-    /**
-     * 关闭服务
-     */
     public void shutdown() {
-        if (executorService != null) {
-            executorService.shutdown();
-        }
-        log.info("Python TTS代理服务已关闭");
+        if (executorService != null) executorService.shutdown();
+        log.info("Python TTS服务已关闭");
     }
  
-    /**
-     * 降级响应
-     */
     private ResponseEntity<InputStreamResource> fallbackResponse(TTSRequestDTO request) {
         try {
-            // 可以返回一个默认的音频文件
-            String fallbackText = "对不起，语音合成服务暂时不可用，请稍后重试。";
-            TTSRequestDTO fallbackRequest = new TTSRequestDTO();
-            fallbackRequest.setText(fallbackText);
-            fallbackRequest.setVoice("zh-CN-XiaoxiaoNeural");
-            // 这里可以调用本地备用的TTS服务
-            return synthesizeStream(fallbackRequest);
-
+            TTSRequestDTO req = new TTSRequestDTO();
+            req.setText("服务暂时不可用");
+            req.setVoice("zh-CN-XiaoxiaoNeural");
+            return synthesizeStream(req);
         } catch (Exception e) {
-            log.error("降级响应也失败了: {}", e.getMessage());
-            return ResponseEntity.status(HttpStatus.SERVICE_UNAVAILABLE)
-                    .header("X-TTS-Error", "服务暂时不可用")
-                    .body(null);
+            return ResponseEntity.status(HttpStatus.SERVICE_UNAVAILABLE).body(null);
         }
     }
  
-    /**
-     * 获取默认语音列表
-     */
     private List<VoiceInfoDTO> getDefaultVoices() {
-        List<VoiceInfoDTO> defaultVoices = Arrays.asList(
-                createVoice("zh-CN-XiaoxiaoNeural", "zh-CN", "Female", "晓晓 - 中文女声"),
-                createVoice("zh-CN-YunyangNeural", "zh-CN", "Male", "云扬 - 中文男声"),
-                createVoice("en-US-JennyNeural", "en-US", "Female", "Jenny - 英文女声"),
-                createVoice("en-US-GuyNeural", "en-US", "Male", "Guy - 英文男声"),
-                createVoice("ja-JP-NanamiNeural", "ja-JP", "Female", "七海 - 日文女声"),
-                createVoice("ko-KR-SunHiNeural", "ko-KR", "Female", "선히 - 韩文女声")
+        return Arrays.asList(
+                createVoice("zh-CN-XiaoxiaoNeural", "zh-CN", "Female", "晓晓"),
+                createVoice("zh-CN-YunyangNeural", "zh-CN", "Male", "云扬")
         );
-
-        log.warn("使用默认语音列表，共 {} 个语音", defaultVoices.size());
-        return defaultVoices;
     }
  
     private VoiceInfoDTO createVoice(String name, String locale, String gender, String displayName) {
-        VoiceInfoDTO voice = new VoiceInfoDTO();
-        voice.setName(name);
-        voice.setLocale(locale);
-        voice.setGender(gender);
-        voice.setDisplayName(displayName);
-        return voice;
+        VoiceInfoDTO v = new VoiceInfoDTO();
+        v.setName(name); v.setLocale(locale); v.setGender(gender); v.setDisplayName(displayName);
+        return v;
     }
 }
 \ No newline at end of file
@@ -22,16 +22,20 @@ public class AdvancedSymbolRemover {
             if (text == null || text.isEmpty()) return "";
             text = HtmlCleaner.cleanHtml(text);
  
-            // 移除中文和英文标点
-            text = text.replaceAll("[\\pP\\p{Punct}]", "");
  
-            // 可选：只保留字母、数字、汉字、空格
-            text = text.replaceAll("[^\\p{L}\\p{N}\\p{Zs}]", "");
             text = text.replaceAll("br", "");
             text = text.replaceAll("<br/>", "");
             text = text.replaceAll("</div>", "");
             text = text.replaceAll("<div>", "");
             text = text.replaceAll("&emsp;", "");
+            // 👇 【安全正则】只删除 数字后面的 .0 或 .00
+            text = text.replaceAll("(?<=\\d)\\.0+(?!\\d)", "");
+            // 移除中文和英文标点
+            text = text.replaceAll("[\\pP\\p{Punct}]", "");
+
+            // 可选：只保留字母、数字、汉字、空格
+            text = text.replaceAll("[^\\p{L}\\p{N}\\p{Zs}]", "");
+
             return text;
         }catch (Exception e){
         }
 package com.xly.web;
  
+import cn.hutool.core.util.ObjectUtil;
 import com.xly.runner.AppStartupRunner;
 import com.xly.service.UserSceneSessionService;
 import com.xly.tool.DynamicToolProvider;
 import com.xly.tts.bean.*;
+import com.xly.tts.service.LocalAudioCache;
 import com.xly.tts.service.PythonTtsProxyService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.io.InputStreamResource;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody;
@@ -53,7 +56,7 @@ public class TTSStreamController {
     /**
      * 提取报修结构化信息
      */
-    @PostMapping("/init")
+    @PostMapping(value="/init", consumes = {MediaType.APPLICATION_JSON_VALUE, MediaType.ALL_VALUE})
     public ResponseEntity<TTSResponseDTO> init(@RequestBody TTSRequestDTO request) {
         return pythonTtsProxyService.init(request);
     }
@@ -73,11 +76,23 @@ public class TTSStreamController {
     /**
      * 流式合成语音（代理到Python服务）
      */
-    @PostMapping("/stream/query")
+    @PostMapping(value = "/stream/query", consumes = {MediaType.APPLICATION_JSON_VALUE, MediaType.ALL_VALUE})
     public ResponseEntity<TTSResponseDTO> stream(@RequestBody TTSRequestDTO request) {
         return pythonTtsProxyService.synthesizeStreamAi(request);
     }
  
+    @GetMapping("/audio")
+    public ResponseEntity<TTSResponseDTO> getAudio(String cacheKey) {
+        if (ObjectUtil.isEmpty(cacheKey)) {
+            return ResponseEntity.ok(TTSResponseDTO.builder().code(204).build());
+        }
+        TTSResponseDTO dto = LocalAudioCache.get(cacheKey);
+        if (dto == null) {
+            return ResponseEntity.ok(TTSResponseDTO.builder().code(204).build());
+        }
+        return ResponseEntity.ok(dto);
+    }
+
     /**
      * 流式合成语音（代理到Python服务）
      */
@@ -461,34 +461,26 @@
  
 <script>
     let sessionId ="";
-    // let userid= "17706006510007934913359242990000";
     let userid= "17522967560005776104370282597000";
     let username= "钱豹";
     let brandsid= "1111111111";
     let subsidiaryid= "1111111111";
     let usertype= "sysadmin";
-    // let usertype= "General";
-    let authorization="CE444885A9BCFDDE1FD793F8A0931301E9D7DE6CEDD9DE4B83ECE2219C7829A8F3419238942A93E9AD666629E18D159AF7FE144A6407DE745BA0AEC8B235FC1D4CAE6F9AC893762209A98011A981375391D4466816B7D3D1AF306E28B989121C538155B7ADAEE71E899235DC1122F426";
+    let authorization="CE444885A9BCFDDE1FD793F8A0931301E9D7DE6CEDD9DE4B83ECE2219C7829A8F3419238942A93E9AD666629E18D159AF7FE144A6407DE745BA0AEC8B235FC1D4CAE6F9AC893752209A98011A981375391D4466816B7D3D1AF306E28B989121C538155B7ADAEE71E899235DC1122F426";
     let hrefLock = window.location.origin+"/xlyAi";
-    // ==================== 配置部分 ====================
+
     const CONFIG = {
-        // Spring Boot 后端 API 地址
         backendUrl: hrefLock,
-        // 请求头
         headers: {
             'Content-Type': 'application/json',
             'Accept': 'application/json'
         },
-
-        // 聊天历史
         maxHistory: 20,
-
-        // 流式响应配置
-        // streaming: true
     };
  
-    // 初始化变量
     let chatHistory = [];
+    let audioQueue = [];
+    let isPlaying = false;
     let currentModel = 'general';
     const md = window.markdownit({
         html: true,
@@ -496,47 +488,29 @@
         typographer: true
     });
  
-    // ==================== 初始化函数 ====================
     $(document).ready(function() {
-        // 设置欢迎消息时间
         document.getElementById('welcomeTime').textContent = getCurrentTime();
-        // init();
-        // 检查后端连接
-        // checkBackendStatus();
-
-        // 加载聊天历史（从本地存储）
-        // loadChatHistory();
-
-        // 聚焦输入框
         $('#messageInput').focus();
-        // 绑定键盘事件
         bindKeyboardEvents();
-
-        // 确保输入区域在底部
         ensureInputAtBottom();
     });
  
-    // ==================== 核心功能函数 ====================
-    // 生成指定长度的随机字符串（包含大小写字母和数字）
     function generateRandomString(length) {
         const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
         let result = '';
         for (let i = 0; i < length; i++) {
             result += chars.charAt(Math.floor(Math.random() * chars.length));
         }
-
         return result;
     }
  
-    window.onload =function(){
-        // 准备请求数据
+    window.onload = function(){
         const data = {
             text: "",
             userid: userid,
             username: username,
             brandsid: brandsid,
             subsidiaryid: subsidiaryid,
-            // usertype: "General",
             usertype: usertype,
             authorization: authorization,
             voice: "zh-CN-XiaoxiaoNeural",
@@ -548,25 +522,23 @@
         let initUrl=CONFIG.backendUrl+"/api/tts/init";
         $.ajax({
             url: initUrl,
-            type: 'POST', // 或 'GET'
-            async: false, // 关键参数：设置为 false 表示同步
+            type: 'POST',
+            async: false,
             data:JSON.stringify(data),
             dataType: 'json',
             contentType: 'application/json; charset=UTF-8',
             success: function(response) {
-                debugger;
                 $("#ts").html((response.processedText + response.systemText) );
             },
             error: function(xhr, status, error) {
                 console.log('请求失败:', error);
             }
         });
-
     }
+
     function reset(message){
         const input = $('#messageInput');
         const button = $('#sendButton');
-        // 禁用输入和按钮
         input.val('');
         input.prop('disabled', true);
         button.prop('disabled', true);
@@ -576,65 +548,80 @@
     async function sendMessage() {
         const input = $('#messageInput');
         const button = $('#sendButton');
-        const  message = input.val();
+        const message = input.val();
         if (!message) return;
-        // 禁用输入和按钮
         input.val('');
         input.prop('disabled', true);
         button.prop('disabled', true);
-        doMessage(input,message,button);
+        doMessage(input, message, button);
     }
  
-    // 最简单版本 - 直接放在sendMessage函数里
-    async function doMessage(input,message,button) {
-        // 添加用户消息
+    // ======================
+    // 🔥 已修复：完整 fetch 流式交互
+    // ======================
+    async function doMessage(input, message, button) {
         addMessage(message, 'user');
-
-        // 显示"正在思考"
         showTypingIndicator();
  
         try {
-            // 准备请求数据
             const requestData = {
                 text: message,
                 userid: userid,
-                // usertype: "General",
                 usertype: usertype,
                 authorization: authorization,
                 voice: "zh-CN-XiaoxiaoNeural",
                 rate: "+10%",
                 volume: "+0%",
-                voiceless: false
+                voiceless: true
             };
  
-            // 发送请求
             const response = await fetch(`${CONFIG.backendUrl}/api/tts/stream/query`, {
-                method: 'POST',
-                headers: { 'Content-Type': 'application/json' },
+                method: "POST",
+                headers: { "Content-Type": "application/json;charset=UTF-8" },
                 body: JSON.stringify(requestData)
             });
  
             const data = await response.json();
-
-            // 隐藏"正在思考"
             hideTypingIndicator();
-           // console.log("data==",data)
-            // 显示AI回复文字
-            addMessage((data.processedText + data.systemText) || data.originalText || message, 'ai');
-
-            // 播放音频
-            if (data.audioBase64) {
-                const audioBlob = base64ToBlob(data.audioBase64);
-                const audio = new Audio(URL.createObjectURL(audioBlob));
-                audio.play();
-            }
+            const replyText = (data.processedText || "") + (data.systemText || "");
+            addMessage(replyText, 'ai');
+
+            // ==============================================
+            // 👇 【关键】用 cacheKey 取音频（绝对不串音）
+            // ==============================================
+            const cacheKey = data.cacheKey;
+            if (!cacheKey) return;
+
+            let retry = 0;
+            const checkAudio = async () => {
+                retry++;
+                if (retry > 20) return;
+
+                try {
+                    // ==============================================
+                    // 👇 用 cacheKey 获取自己的音频（别人拿不到）
+                    // ==============================================
+                    const res = await fetch(`${CONFIG.backendUrl}/api/tts/audio?cacheKey=${encodeURIComponent(cacheKey)}`);
+                    const audioData = await res.json();
+
+                    if (audioData.audioBase64) {
+                        const blob = base64ToBlob(audioData.audioBase64);
+                        const audio = new Audio(URL.createObjectURL(blob));
+                        audio.play().catch(err => console.log('播放异常', err));
+                    } else {
+                        setTimeout(checkAudio, 800);
+                    }
+                } catch (e) {
+                    setTimeout(checkAudio, 800);
+                }
+            };
+            setTimeout(checkAudio, 1200);
  
         } catch (error) {
             console.error('错误:', error);
             hideTypingIndicator();
-            addMessage(message, 'ai'); // 出错也显示原消息
+            addMessage("服务异常，请重试", 'ai');
         } finally {
-            // 恢复输入框
             input.prop('disabled', false);
             button.prop('disabled', false);
             input.focus();
@@ -642,7 +629,28 @@
         }
     }
  
-    // 工具函数
+    // ==============================
+    // 👇 语音排队播放函数（保证顺序）
+    // ==============================
+    function playNextAudio() {
+        if (isPlaying || audioQueue.length === 0) return;
+
+        isPlaying = true;
+        const base64 = audioQueue.shift();
+        const blob = base64ToBlob(base64);
+        const audio = new Audio(URL.createObjectURL(blob));
+
+        audio.onended = () => {
+            isPlaying = false;
+            playNextAudio(); // 播放下一条
+        };
+
+        audio.play().catch(err => {
+            isPlaying = false;
+            playNextAudio();
+        });
+    }
+
     function base64ToBlob(base64) {
         const byteCharacters = atob(base64);
         const byteNumbers = new Array(byteCharacters.length);
@@ -652,10 +660,8 @@
         return new Blob([new Uint8Array(byteNumbers)], { type: 'audio/mpeg' });
     }
  
-    // 处理非流式响应
     async function handleNormalResponse(requestData) {
         try {
-            console.log("requestData",requestData);
             const response = await fetch(`${CONFIG.backendUrl}/api/tts/stream/query`, {
                 method: 'POST',
                 headers: CONFIG.headers,
@@ -664,43 +670,20 @@
             if (!response.ok) {
                 throw new Error(`HTTP ${response.status}: ${response.statusText}`);
             }
-            console.log("123",response);
-
-            // // 流式请求
-            // const audioBlob = await response.blob();
-            // currentAudioBlob = audioBlob;
-            // currentAudioUrl = URL.createObjectURL(audioBlob);
-            // elements.audioPlayer.src = currentAudioUrl
-            // elements.audioPlayer.play();
-            //
-            // const messageDetail = await response.messageDetail;
-            // hideTypingIndicator();
-            // // 添加AI回复
-            // if (data.data) {
-            //     addMessage(data.data, 'ai');
-            //     saveToHistory('assistant', data.content);
-            //     updateStatus('回答完成', 'connected');
-            // }
-
         } catch (error) {
             hideTypingIndicator();
             throw error;
         } finally {
-            // 确保输入区域在底部
             ensureInputAtBottom();
         }
     }
  
-    // ==================== 界面辅助函数 ====================
-
-    // 获取当前时间
     function getCurrentTime() {
         const now = new Date();
         return now.getHours().toString().padStart(2, '0') + ':' +
             now.getMinutes().toString().padStart(2, '0');
     }
  
-    // 添加消息到界面
     function addMessage(content, type = 'ai') {
         const messagesDiv = $('#chatMessages');
         const messageId = `msg-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
@@ -724,20 +707,9 @@
  
         messagesDiv.append(messageHtml);
         scrollToBottom();
-
         return messageId;
     }
  
-    // 更新消息内容
-    // function updateMessage(messageId, content) {
-    //     const messageDiv = $(`#${messageId}`);
-    //     if (messageDiv.length) {
-    //         messageDiv.find('.message-content').html(md.render(content));
-    //         scrollToBottom();
-    //     }
-    // }
-
-    // 显示/隐藏打字机效果
     function showTypingIndicator() {
         const messagesDiv = $('#chatMessages');
         const typingHtml = `
@@ -758,7 +730,6 @@
         $('#typingIndicator').remove();
     }
  
-    // 更新状态显示
     function updateStatus(text, type = 'connected') {
         const indicator = $('#statusIndicator');
         const statusText = $('#statusText');
@@ -777,22 +748,16 @@
         }
     }
  
-    // 滚动到底部
     function scrollToBottom() {
         const messagesDiv = $('#chatMessages');
-        // 添加延迟确保DOM更新完成
         setTimeout(() => {
             messagesDiv.scrollTop(messagesDiv[0].scrollHeight);
         }, 10);
     }
  
-    // 确保输入区域在底部
     function ensureInputAtBottom() {
-        // 添加一个小的延迟，确保DOM更新完成
         setTimeout(() => {
             scrollToBottom();
-
-            // 添加一个空div来确保底部有空间
             const messagesDiv = $('#chatMessages');
             let bottomSpacer = messagesDiv.find('.bottom-spacer');
             if (bottomSpacer.length === 0) {
@@ -801,9 +766,6 @@
         }, 100);
     }
  
-    // ==================== 历史管理函数 ====================
-
-    // 保存到历史
     function saveToHistory(role, content) {
         chatHistory.push({
             role: role,
@@ -811,22 +773,17 @@
             timestamp: Date.now()
         });
  
-        // 限制历史长度
         if (chatHistory.length > CONFIG.maxHistory) {
             chatHistory = chatHistory.slice(-CONFIG.maxHistory);
         }
-
-        // 保存到本地存储
         localStorage.setItem('chatHistory', JSON.stringify(chatHistory));
     }
  
-    // 加载聊天历史
     function loadChatHistory() {
         const saved = localStorage.getItem('chatHistory');
         if (saved) {
             try {
                 chatHistory = JSON.parse(saved);
-                // 如果有历史消息，加载到界面
                 if (chatHistory.length > 0) {
                     chatHistory.forEach(item => {
                         if (item.role === 'user' || item.role === 'assistant') {
@@ -842,15 +799,6 @@
         }
     }
  
-    // ==================== 事件处理函数 ====================
-
-    // 预设问题点击
-    // function askPresetQuestion(question) {
-    //     $('#messageInput').val(question);
-    //     sendMessage();
-    // }
-
-    // 清空对话
     function clearChat() {
         if (confirm('确定要清空当前对话吗？')) {
             $('#chatMessages').html(`
@@ -869,16 +817,13 @@
             localStorage.removeItem('chatHistory');
             updateStatus('对话已清空', 'connected');
             sessionId ="";
-            // 确保输入区域在底部
             ensureInputAtBottom();
         }
     }
  
-    // 复制消息
     function copyMessage(messageId) {
         const messageContent = $(`#${messageId}`).find('.message-content').text();
         navigator.clipboard.writeText(messageContent).then(() => {
-            // 显示复制成功的反馈
             const button = $(`#${messageId} .action-btn:first-child`);
             const originalText = button.text();
             button.text('已复制');
@@ -888,29 +833,19 @@
         });
     }
  
-    // 重新生成消息
     function regenerateMessage(messageId) {
-        // 找到对应的用户消息
         const messageDiv = $(`#${messageId}`);
         const content = messageDiv.find('.message-content').text();
-
-        // 从历史中移除
         chatHistory = chatHistory.filter(item =>
             item.role !== 'assistant' || item.content !== content
         );
-
-        // 重新发送
         $('#messageInput').val(content);
         sendMessage();
-
-        // 移除旧消息
         messageDiv.remove();
     }
  
-    // 错误处理
     function handleError(error) {
         hideTypingIndicator();
-
         const errorMessage = `
                 抱歉，请求出现错误：${error.message}<br><br>
                 <strong>可能的原因：</strong><br>
@@ -922,14 +857,11 @@
                 2. 检查浏览器控制台查看详细错误<br>
                 3. 刷新页面重试
             `;
-
         addMessage(errorMessage, 'ai');
         updateStatus('请求失败', 'error');
-        // 确保输入区域在底部
         ensureInputAtBottom();
     }
  
-    // 绑定键盘事件
     function bindKeyboardEvents() {
         $('#messageInput').on('keypress', function(e) {
             if (e.which === 13 && !e.shiftKey) {
@@ -939,17 +871,12 @@
         });
  
         $(document).on('keydown', function(e) {
-            // Ctrl + Enter 发送
             if (e.ctrlKey && e.key === 'Enter') {
                 sendMessage();
             }
-
-            // ESC 清空输入框
             if (e.key === 'Escape') {
                 $('#messageInput').val('');
             }
-
-            // 上箭头恢复上一条消息
             if (e.key === 'ArrowUp' && $('#messageInput').val() === '') {
                 const lastUserMessage = chatHistory
                     .filter(item => item.role === 'user')
@@ -962,13 +889,11 @@
         });
     }
  
-    // 模型选择器变化
     $('#modelSelector').on('change', function() {
         currentModel = $(this).val();
         updateStatus(`切换到${$(this).find('option:selected').text()}模式`, 'connected');
     });
  
-    // 监听窗口大小变化，重新计算布局
     $(window).on('resize', function() {
         ensureInputAtBottom();
     });