vl校验

Author: wwtang5

src/main/java/com/xiaozhi/controller/VLChatController.java

@@ -2,6 +2,8 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.xiaozhi.common.interceptor.UnLogin;
+import com.xiaozhi.communication.common.ChatSession;
+import com.xiaozhi.communication.common.SessionManager;
 import com.xiaozhi.dialogue.llm.factory.ChatModelFactory;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletRequest;
@@ -26,6 +28,10 @@ public class VLChatController extends BaseController {
     @Resource
     private ChatModelFactory chatModelFactory;
 
+    @Resource
+    private SessionManager sessionManager;
+
+
     /**
      * 视觉对话
      */
@@ -35,7 +41,18 @@ public String vlChat(@RequestParam("file") MultipartFile file,
                          @RequestParam String question,
                          HttpServletRequest request) {
         try {
+            //获取当前下发的session信息
+            String authorization = request.getHeader("authorization");
+            logger.info("用户authorization：{}", authorization);
+            //下发的是session
+            String sessionId = authorization.substring(7);
+            ChatSession session = sessionManager.getSession(sessionId);
+            if (session == null) {
+                return "session不存在";
+            }
+
             ChatModel chatModel = chatModelFactory.takeVisionModel();
+
             MimeType mimeType = MimeType.valueOf(file.getContentType());
             Media media = Media.builder()
                     .mimeType(mimeType)

src/main/java/com/xiaozhi/dialogue/llm/tool/mcp/device/DeviceMcpService.java

@@ -94,7 +94,7 @@ private DeviceMcpInitialize deviceMcpInitialize(ChatSession chatSession) {
         DeviceMcpVision vision = new DeviceMcpVision();
 
         //VLChatController
-        String url = cmsUtils.getServerAddress() + "/vl/chat";
+        String url = CmsUtils.getServerAddress() + "/vl/chat";
         vision.setUrl(url);
         vision.setToken(chatSession.getSessionId());
 

src/main/java/com/xiaozhi/dialogue/service/DialogueService.java

@@ -65,6 +65,9 @@ public class DialogueService implements ApplicationListener<ChatSessionCloseEven
     @Resource
     private MusicService musicService;
 
+    @Resource
+    private HuiBenService huiBenService;
+
     @Resource
     private VadService vadService;
 
@@ -920,6 +923,7 @@ public void abortDialogue(ChatSession session, String reason) {
 
                 if (sessionManager.isMusicPlaying(sessionId)) {
                     musicService.stopMusic(sessionId);
+                    huiBenService.stopHuiBen(sessionId);
                     return;
                 }
                 // 清空句子队列

src/main/java/com/xiaozhi/dialogue/service/HuiBenService.java

@@ -195,6 +195,11 @@ private void sendAudio(ChatSession session, String audioPath) {
             AtomicLong frameIndexRef = new AtomicLong(0);
             Runnable frameTask = () -> {
                 try {
+                    if (scheduledTasks.get(sessionId) == null) {
+                        logger.error("{}任务已经终止", sessionId);
+
+                        return;
+                    }
                     int currentIndex = (int) frameIndexRef.get();
                     if (currentIndex >= frames.size()) {
                         // 所有帧已发送，取消任务