日志提交

soc-modules/soc-modules-host/src/main/java/com/xunmei/host/server/service/impl/IotServerInfoServiceImpl.java

@@ -1,5 +1,6 @@
 package com.xunmei.host.server.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -9,6 +10,7 @@ import com.xunmei.common.core.utils.uuid.UUID;
 import com.xunmei.host.server.mapper.IotServerInfoMapper;
 import com.xunmei.host.server.service.IotServerInfoService;
 import com.xunmei.system.api.domain.SysOrg;
+import com.xunmei.system.api.util.LogUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -36,7 +38,10 @@ public class IotServerInfoServiceImpl extends ServiceImpl<IotServerInfoMapper, I
         if (serverInfo == null) {
             return null;
         }
-        serverInfo.setIotCode(UUID.randomUUID().toString());
+        if (ObjectUtil.isEmpty(serverInfo.getIotCode())){
+            LogUtils.WEBSOCKET_MSG.info("iotCode为空,生成iotCode");
+            serverInfo.setIotCode(UUID.randomUUID().toString());
+        }
 
         updateById(serverInfo);
 

soc-modules/soc-modules-host/src/main/java/com/xunmei/host/websocket/handler/SocWebSocketHandler.java

@@ -75,7 +75,7 @@ public class SocWebSocketHandler extends AbstractWebSocketHandler {
             }
             WebsocketResult register = createWebsocketResult(null, "register", map);
             WebSocketUtils.sendMessage(session, JacksonUtils.toJSONString(register));
-            LogUtils.WEBSOCKET_MSG.info("[建立注册连接],registerCode:{}", registerCode);
+            LogUtils.WEBSOCKET_MSG.info("[建立注册连接],registerCode:{},返回信息:{}", registerCode,JacksonUtils.toJSONString(register));
             session.close();
             return;
         }
@@ -100,7 +100,7 @@ public class SocWebSocketHandler extends AbstractWebSocketHandler {
                 WebsocketResult result = createWebsocketResult(null, "login", map);
                 WebSocketUtils.sendMessage(session, JacksonUtils.toJSONString(result));
                 session.close();
-                LogUtils.WEBSOCKET_MSG.info("准备建立连接时,token不可用,ip:{}", ip);
+                LogUtils.WEBSOCKET_MSG.info("准备建立连接时,token不可用,ip:{},返回信息:{}", ip,JacksonUtils.toJSONString(result));
                 return;
             }
             serverInfo.setIotIp(ip);

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/server/service/impl/IotServerInfoServiceImpl.java

@@ -1,5 +1,6 @@
 package com.xunmei.mediator.api.server.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -9,6 +10,7 @@ import com.xunmei.common.core.utils.uuid.UUID;
 import com.xunmei.mediator.api.server.mapper.IotServerInfoMapper;
 import com.xunmei.mediator.api.server.service.IotServerInfoService;
 import com.xunmei.system.api.domain.SysOrg;
+import com.xunmei.system.api.util.LogUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -36,8 +38,10 @@ public class IotServerInfoServiceImpl extends ServiceImpl<IotServerInfoMapper, I
         if (serverInfo == null) {
             return null;
         }
-        serverInfo.setIotCode(UUID.randomUUID().toString());
-
+        if (ObjectUtil.isEmpty(serverInfo.getIotCode())){
+            LogUtils.WEBSOCKET_MSG.info("iotCode为空,生成iotCode");
+            serverInfo.setIotCode(UUID.randomUUID().toString());
+        }
         updateById(serverInfo);
 
         return serverInfo;