jingyuanchao 11 сар өмнө
parent
commit
b130cd1e98

+ 1 - 1
project_data/sql/1.0.11/soc.sql

@@ -7,7 +7,7 @@ CREATE TABLE `iot_websocket_msg` (
          `org_name` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '机构名称',
          `iot_code` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '目标主机',
          `server_name` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '主机名称',
-         `status` int DEFAULT NULL COMMENT '消息状态;0:处理中,1:处理完成,2:重试中,3:重试成功,4:重试失败',
+         `status` int DEFAULT NULL COMMENT '消息状态;0:处理中,1:处理完成,2:重试中,3:重试失败',
          `receive_content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '收到消息内容',
          `reply_content` text COLLATE utf8mb4_general_ci COMMENT '回复内容',
          `ready_send_time` datetime DEFAULT NULL COMMENT '准备发送时间',

+ 2 - 0
soc-modules/soc-modules-host/src/main/java/com/xunmei/host/north/service/impl/IotWebsocketMsgServiceImpl.java

@@ -166,6 +166,7 @@ public class IotWebsocketMsgServiceImpl extends ServiceImpl<IotWebsocketMsgMappe
             websocketMsg.setStatus(MessageStatusEnum.RETRY_FAIL.getCode());
             websocketMsg.setUpdateTime(now);
             updateById(websocketMsg);
+            LogUtils.WS_MSG_RETRY_LOG.error("主机消息重试次数已达到最大值,不再重试,消息内容: {}", JacksonUtils.toJSONString(websocketMsg));
             return;
         }
 
@@ -202,6 +203,7 @@ public class IotWebsocketMsgServiceImpl extends ServiceImpl<IotWebsocketMsgMappe
             });
             LogUtils.WS_MSG_RETRY_LOG.info("开始第{}次重试Ws消息,msgId: {}", msg.getCurRetryTimes(), msgId);
         } else {
+            //逻辑应该是走不到这里了
             msg.setStatus(MessageStatusEnum.RETRY_FAIL.getCode());
             updateById(msg);
             LogUtils.WS_MSG_RETRY_LOG.info("重试次数已达到最大值,停止重试,msgId: {}", msgId);