From 7d55b601b8ec846e9d48ce31de1c5c6930d6dee0 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 19 八月 2025 17:24:35 +0800
Subject: [PATCH] 1、修改等待中间件返回结果超时时间为10秒; 2、修改向水肥机下发命令相关逻辑; 3、修改水肥机回复命令结果处理逻辑; 4、去除前端webSocket关闭产生异常日志记录。
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/largeScreen/WebSocketServer.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/largeScreen/WebSocketServer.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/largeScreen/WebSocketServer.java
index 03b1c12..53fe54c 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/largeScreen/WebSocketServer.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/largeScreen/WebSocketServer.java
@@ -2,6 +2,7 @@
import com.dy.common.aop.SsoCheck;
import com.dy.common.aop.SsoVo;
+import com.dy.common.springUtil.SpringContextUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
@@ -65,6 +66,10 @@
webSocketMap.put(token, this);
WebSocketServer.addOnlineCount();
}
+ if(this.ssoCheck == null){
+ //2025-07-22 涓嶇煡涓轰粈涔堬紝this.ssoCheck浼氫负null
+ this.ssoCheck = SpringContextUtil.getBean(SsoCheck.class);
+ }
Object rObj = this.ssoCheck.check(token);
if(rObj != null) {
if (rObj instanceof SsoVo ssoVo) {
@@ -104,7 +109,7 @@
*/
@OnError
public void onError(Session session, Throwable error) {
- log.error("瀹㈡埛绔�:" + this.token + "锛寃ebsocket浼氳瘽寮傚父锛屽師鍥�:" + error.getMessage());
+ //log.error("瀹㈡埛绔�:" + this.token + "锛寃ebsocket浼氳瘽寮傚父锛屽師鍥�:" + error.getMessage());
}
/**
--
Gitblit v1.8.0