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-sso/src/main/java/com/dy/sso/config/CaffeineCacheConfiguration.java |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/config/CaffeineCacheConfiguration.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/config/CaffeineCacheConfiguration.java
index 8a705f2..1c85166 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/config/CaffeineCacheConfiguration.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/config/CaffeineCacheConfiguration.java
@@ -12,6 +12,9 @@
 
 @Configuration
 public class CaffeineCacheConfiguration {
+    private static final int cacheInitialCapacityDefault = 10 ;
+    private static final int cacheMaximumSizeDefault = 10000 ;
+    private static final int cacheDurationDefault = 720 ;
 
     @Value("${pipIrr.sso.cacheMaximumSize}")
     private String cacheMaximumSize ;
@@ -36,17 +39,21 @@
      */
     @Bean
     public CacheManager cacheManager() {
-        int cacheMaximumSizeInt = 10000 ;
-        int cacheDurationInt = 720 ;
+        int cacheMaximumSizeInt;
+        int cacheDurationInt;
         if(NumUtil.isPlusIntNumber(cacheMaximumSize)){
-            cacheMaximumSizeInt = Integer.parseInt(cacheMaximumSize) ;//
+            cacheMaximumSizeInt = Integer.parseInt(cacheMaximumSize) ;
+        }else{
+            cacheMaximumSizeInt = cacheMaximumSizeDefault ;
         }
         if(NumUtil.isPlusIntNumber(cacheDuration)){
-            cacheDurationInt = Integer.parseInt(cacheDuration) ;//
+            cacheDurationInt = Integer.parseInt(cacheDuration) ;
+        }else{
+            cacheDurationInt = cacheDurationDefault ;
         }
         CaffeineCacheManager cacheManager = new CaffeineCacheManager();
         cacheManager.setCaffeine(Caffeine.newBuilder()
-                .initialCapacity(10)
+                .initialCapacity(cacheInitialCapacityDefault)
                 .maximumSize(cacheMaximumSizeInt)
                 .expireAfterAccess(cacheDurationInt, TimeUnit.MINUTES));
 

--
Gitblit v1.8.0