fix:修复roleId为空的情况

Author: joey-zhou

src/main/java/com/xiaozhi/communication/server/websocket/WebSocketHandler.java

@@ -97,8 +97,6 @@ protected void handleTextMessage(WebSocketSession session, TextMessage message)
                 if (device.getRoleId() == null) {
                     // 设备未绑定，处理未绑定设备的消息
                     messageHandler.handleUnboundDevice(sessionId, device);
-                } else {
-                    sessionManager.registerDevice(sessionId, device);
                 }
                 messageHandler.handleMessage(msg, sessionId);
             }

src/main/java/com/xiaozhi/entity/SysDevice.java

@@ -18,11 +18,6 @@ public class SysDevice extends SysRole {
 
     private String sessionId;
 
-    /*
-     * 角色Id
-     */
-    private Integer roleId;
-
     /**
      * 设备名称
      */
@@ -84,15 +79,6 @@ public class SysDevice extends SysRole {
      */
     private String functionNames;
 
-    public Integer getRoleId() {
-        return roleId;
-    }
-
-    public SysDevice setRoleId(Integer roleId) {
-        this.roleId = roleId;
-        return this;
-    }
-
     public String getDeviceId() {
         return deviceId;
     }
@@ -220,7 +206,7 @@ public void setFunctionNames(String functionNames) {
 
     @Override
     public String toString() {
-        return "SysDevice [deviceId=" + deviceId + ", sessionId=" + sessionId + ", deviceName=" + deviceName + ", roleId=" + roleId
+        return "SysDevice [deviceId=" + deviceId + ", sessionId=" + sessionId + ", deviceName=" + deviceName + ", roleId=" + getRoleId()
                 + ", state=" + state + ", totalMessage=" + totalMessage + ", code=" + code + ", audioPath=" + audioPath
                 + ", lastLogin=" + lastLogin + ", wifiName=" + wifiName + ", ip=" + ip + ", chipModelName="
                 + chipModelName + ", type=" + type + ", version=" + version + ", functionNames=" + functionNames;

src/main/java/com/xiaozhi/service/impl/SysDeviceServiceImpl.java

@@ -9,25 +9,22 @@
 import com.xiaozhi.dao.DeviceMapper;
 import com.xiaozhi.dao.MessageMapper;
 import com.xiaozhi.dao.RoleMapper;
-import com.xiaozhi.entity.SysConfig;
 import com.xiaozhi.entity.SysDevice;
 import com.xiaozhi.entity.SysMessage;
 import com.xiaozhi.entity.SysRole;
 import com.xiaozhi.service.SysConfigService;
 import com.xiaozhi.service.SysDeviceService;
-
 import jakarta.annotation.Resource;
-
 import org.apache.ibatis.javassist.NotFoundException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.CachePut;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.*;
+import java.util.List;
+import java.util.UUID;
 
 /**
  * 设备操作
@@ -137,7 +134,7 @@ public List<SysDevice> query(SysDevice device, PageFilter pageFilter) {
     @Cacheable(value = CACHE_NAME, key = "#deviceId.replace(\":\", \"-\")", unless = "#result == null")
     public SysDevice selectDeviceById(String deviceId) {
         SysDevice device = deviceMapper.selectDeviceById(deviceId);
-        return device;
+        return device;  
     }
 
     /**
@@ -183,6 +180,7 @@ public int updateCode(SysDevice device) {
     public int update(SysDevice device) {
         int rows = deviceMapper.update(device);
         // 更新设备信息后清空记忆缓存并重新注册设备信息
+        device = deviceMapper.selectDeviceById(device.getDeviceId());
         ChatSession session = sessionManager.getSessionByDeviceId(device.getDeviceId());
         if (session != null) {
             session.setChatMemory(null);