规整iot代码，解耦SessionManager与IotDescriptor的关联。方便下一步处理设备mcp相关逻辑

Author: dc444

src/main/java/com/xiaozhi/communication/common/ChatSession.java

@@ -1,6 +1,6 @@
 package com.xiaozhi.communication.common;
 
-import com.xiaozhi.communication.domain.IotDescriptor;
+import com.xiaozhi.communication.domain.iot.IotDescriptor;
 import com.xiaozhi.dialogue.llm.tool.ToolsSessionHolder;
 import com.xiaozhi.entity.SysDevice;
 import com.xiaozhi.entity.SysRole;

src/main/java/com/xiaozhi/communication/common/SessionManager.java

@@ -1,6 +1,5 @@
 package com.xiaozhi.communication.common;
 
-import com.xiaozhi.communication.domain.IotDescriptor;
 import com.xiaozhi.dialogue.llm.tool.ToolsSessionHolder;
 import com.xiaozhi.entity.SysDevice;
 import com.xiaozhi.entity.SysRole;
@@ -17,7 +16,6 @@
 import java.time.Duration;
 import java.time.Instant;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -159,7 +157,7 @@ public void closeSession(ChatSession chatSession) {
             logger.info("会话已关闭 - SessionId: {} SessionType: {}", chatSession.getSessionId(), chatSession.getClass().getSimpleName());
         } catch (Exception e) {
             logger.error("清理会话资源时发生错误 - SessionId: {}",
-                chatSession.getSessionId(), e);
+                    chatSession.getSessionId(), e);
         }
     }
 
@@ -179,48 +177,6 @@ public void registerDevice(String sessionId, SysDevice device) {
         }
     }
 
-    /**
-     * 注册设备iot部件描述信息
-     *
-     * @param sessionId 会话ID
-     * @param iotDescriptor iot部件描述信息
-     */
-    public void registerIot(String sessionId, IotDescriptor iotDescriptor) {
-        ChatSession chatSession = sessions.get(sessionId);
-        if(chatSession != null){
-            // 先检查是否已存在该sessionId的配置
-            Map<String, IotDescriptor> existingIotDescriptors = chatSession.getIotDescriptors();
-            existingIotDescriptors.put(iotDescriptor.getName(), iotDescriptor);
-            logger.debug("设备iot部件已注册 - SessionId: {}, Iot: {}", sessionId, iotDescriptor.getName());
-        }
-    }
-
-    /**
-     * 注册会话的function_call
-     *
-     * @param sessionId 会话ID
-     * @param toolsSessionHolder function_call工具
-     */
-    public void registerFunctionSessionHolder(String sessionId, ToolsSessionHolder toolsSessionHolder) {
-        ChatSession chatSession = sessions.get(sessionId);
-        if(chatSession != null){
-            chatSession.setFunctionSessionHolder(toolsSessionHolder);
-        }
-    }
-
-    /**
-     * 注册设备iot部件描述信息
-     *
-     * @param sessionId 会话ID
-     * @param roles 可用角色列表
-     */
-    public void registerRoles(String sessionId, List<SysRole> roles) {
-        ChatSession chatSession = sessions.get(sessionId);
-        if(chatSession != null){
-            chatSession.setSysRoleList(roles);
-        }
-    }
-
     /**
      * 设置会话完成后是否关闭
      *
@@ -309,38 +265,6 @@ public SysDevice getDeviceConfig(String sessionId) {
         return null;
     }
 
-    /**
-     * 获取Iot部件描述信息
-     *
-     * @param sessionId 会话ID
-     * @return 设备配置
-     */
-    public Map<String, IotDescriptor> getAllIotDescriptor(String sessionId) {
-        ChatSession chatSession = sessions.get(sessionId);
-        if (chatSession != null) {
-            return chatSession.getIotDescriptors();
-        }
-        return null;
-    }
-
-    /**
-     * 获取Iot部件描述信息
-     *
-     * @param sessionId 会话ID
-     * @param iotName IoT名称
-     * @return 设备配置
-     */
-    public IotDescriptor getIotDescriptor(String sessionId, String iotName) {
-        ChatSession chatSession = sessions.get(sessionId);
-        if (chatSession != null) {
-            Map<String, IotDescriptor> descriptors = chatSession.getIotDescriptors();
-            if (descriptors != null) {
-                return descriptors.get(iotName);
-            }
-        }
-        return null;
-    }
-
     /**
      * 获取会话的function holder
      *

src/main/java/com/xiaozhi/communication/domain/IotMessage.java

@@ -1,10 +1,12 @@
 package com.xiaozhi.communication.domain;
 
-import java.util.List;
-
+import com.xiaozhi.communication.domain.iot.IotDescriptor;
+import com.xiaozhi.communication.domain.iot.IotState;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.List;
+
 @Data
 @EqualsAndHashCode(callSuper = true)
 public final class IotMessage extends Message {

…/communication/domain/IotDescriptor.java …munication/domain/iot/IotDescriptor.javasrc/main/java/com/xiaozhi/communication/domain/IotDescriptor.java renamed to src/main/java/com/xiaozhi/communication/domain/iot/IotDescriptor.java src/main/java/com/xiaozhi/communication/domain/IotDescriptor.java renamed to src/main/java/com/xiaozhi/communication/domain/iot/IotDescriptor.java

@@ -1,4 +1,4 @@
-package com.xiaozhi.communication.domain;
+package com.xiaozhi.communication.domain.iot;
 
 import com.xiaozhi.utils.JsonUtil;
 import lombok.Data;

…ozhi/communication/domain/IotMethod.java …/communication/domain/iot/IotMethod.javasrc/main/java/com/xiaozhi/communication/domain/IotMethod.java renamed to src/main/java/com/xiaozhi/communication/domain/iot/IotMethod.java src/main/java/com/xiaozhi/communication/domain/IotMethod.java renamed to src/main/java/com/xiaozhi/communication/domain/iot/IotMethod.java

@@ -1,4 +1,4 @@
-package com.xiaozhi.communication.domain;
+package com.xiaozhi.communication.domain.iot;
 
 import com.xiaozhi.utils.JsonUtil;
 import lombok.Data;

…unication/domain/IotMethodParameter.java …ation/domain/iot/IotMethodParameter.javasrc/main/java/com/xiaozhi/communication/domain/IotMethodParameter.java renamed to src/main/java/com/xiaozhi/communication/domain/iot/IotMethodParameter.java src/main/java/com/xiaozhi/communication/domain/IotMethodParameter.java renamed to src/main/java/com/xiaozhi/communication/domain/iot/IotMethodParameter.java

@@ -1,4 +1,4 @@
-package com.xiaozhi.communication.domain;
+package com.xiaozhi.communication.domain.iot;
 
 import com.xiaozhi.utils.JsonUtil;
 import lombok.Data;

…hi/communication/domain/IotProperty.java …ommunication/domain/iot/IotProperty.javasrc/main/java/com/xiaozhi/communication/domain/IotProperty.java renamed to src/main/java/com/xiaozhi/communication/domain/iot/IotProperty.java src/main/java/com/xiaozhi/communication/domain/IotProperty.java renamed to src/main/java/com/xiaozhi/communication/domain/iot/IotProperty.java

@@ -1,4 +1,4 @@
-package com.xiaozhi.communication.domain;
+package com.xiaozhi.communication.domain.iot;
 
 import com.xiaozhi.utils.JsonUtil;
 import lombok.Data;

…aozhi/communication/domain/IotState.java …i/communication/domain/iot/IotState.javasrc/main/java/com/xiaozhi/communication/domain/IotState.java renamed to src/main/java/com/xiaozhi/communication/domain/iot/IotState.java src/main/java/com/xiaozhi/communication/domain/IotState.java renamed to src/main/java/com/xiaozhi/communication/domain/iot/IotState.java

@@ -1,4 +1,4 @@
-package com.xiaozhi.communication.domain;
+package com.xiaozhi.communication.domain.iot;
 
 import lombok.Data;
 

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

@@ -3,7 +3,9 @@
 import com.fasterxml.jackson.databind.node.JsonNodeType;
 import com.xiaozhi.communication.common.ChatSession;
 import com.xiaozhi.communication.common.SessionManager;
-import com.xiaozhi.communication.domain.*;
+import com.xiaozhi.communication.domain.iot.IotDescriptor;
+import com.xiaozhi.communication.domain.iot.IotProperty;
+import com.xiaozhi.communication.domain.iot.IotState;
 import com.xiaozhi.dialogue.llm.tool.ToolCallStringResultConverter;
 import com.xiaozhi.dialogue.llm.tool.ToolsSessionHolder;
 import com.xiaozhi.utils.JsonUtil;
@@ -16,7 +18,10 @@
 import org.springframework.ai.tool.metadata.ToolMetadata;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Iot服务 - 负责iot处理和WebSocket发送
@@ -39,8 +44,9 @@ public class IotService {
      * @param descriptors iot设备描述消息内容
      */
     public void handleDeviceDescriptors(String sessionId, List<IotDescriptor> descriptors) {
+        ChatSession chatSession = sessionManager.getSession(sessionId);
         for (var descriptor : descriptors) {
-            sessionManager.registerIot(sessionId, descriptor);
+            chatSession.getIotDescriptors().put(descriptor.getName(), descriptor);
             registerFunctionTools(sessionId, descriptor);
         }
     }
@@ -52,14 +58,13 @@ public void handleDeviceDescriptors(String sessionId, List<IotDescriptor> descri
      * @param states    iot状体消息内容
      */
     public void handleDeviceStates(String sessionId, List<IotState> states) {
-
+        ChatSession chatSession = sessionManager.getSession(sessionId);
         for (var state : states) {
-            var iotDescriptor = sessionManager.getIotDescriptor(sessionId, state.getName());
+            var iotDescriptor = chatSession.getIotDescriptors().get(state.getName());
             if (iotDescriptor == null) {
                 logger.error("[{}] - SessionId: {} 未找到设备: {} 的描述信息", TAG, sessionId, state.getName());
                 continue;
             }
-
             for (var stateProp : state.getState().entrySet()) {
                 var propName = stateProp.getKey();
                 var propValue = stateProp.getValue();
@@ -83,8 +88,8 @@ public void handleDeviceStates(String sessionId, List<IotState> states) {
      * @return 属性值，如未找到则返回null
      */
     public Object getIotStatus(String sessionId, String iotName, String propertyName) {
-        IotDescriptor iotDescriptor = sessionManager.getIotDescriptor(sessionId, iotName);
-
+        ChatSession chatSession = sessionManager.getSession(sessionId);
+        var iotDescriptor = chatSession.getIotDescriptors().get(iotName);
         if (iotDescriptor != null) {
             IotProperty property = iotDescriptor.getProperties().get(propertyName);
             if (property != null) {
@@ -108,8 +113,8 @@ public Object getIotStatus(String sessionId, String iotName, String propertyName
      * @return 是否设置成功
      */
     public boolean setIotStatus(String sessionId, String iotName, String propertyName, Object value) {
-        IotDescriptor iotDescriptor = sessionManager.getIotDescriptor(sessionId, iotName);
-
+        ChatSession chatSession = sessionManager.getSession(sessionId);
+        var iotDescriptor = chatSession.getIotDescriptors().get(iotName);
         if (iotDescriptor != null) {
             IotProperty property = iotDescriptor.getProperties().get(propertyName);
             if (property != null) {
@@ -151,14 +156,14 @@ public boolean sendIotMessage(String sessionId, String iotName, String methodNam
         try {
             logger.info("[{}] - SessionId: {}, message send iotName: {}, methodName: {}, parameters: {}", TAG, sessionId,
                     iotName, methodName, JsonUtil.toJson(parameters));
-            ChatSession session = sessionManager.getSession(sessionId);
-            IotDescriptor iotDescriptor = sessionManager.getIotDescriptor(sessionId, iotName);
+            ChatSession chatSession = sessionManager.getSession(sessionId);
+            IotDescriptor iotDescriptor = chatSession.getIotDescriptors().get(iotName);
             if (iotDescriptor != null && iotDescriptor.getMethods().containsKey(methodName)) {
                 Map<String, Object> command = new HashMap<>();
                 command.put("name", iotName);
                 command.put("method", methodName);
                 command.put("parameters", parameters);
-                messageService.sendIotCommandMessage(session, Collections.singletonList(command));
+                messageService.sendIotCommandMessage(chatSession, Collections.singletonList(command));
                 return true;
             } else {
                 logger.error("[{}] - SessionId: {}, {} method not found: {}", TAG, sessionId, iotName, methodName);
@@ -308,4 +313,4 @@ private void registerMethodFunctionTools(String sessionId, ToolsSessionHolder to
         }
     }
 
-}
+}