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-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeInfo.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeInfo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeInfo.java
index 0f3437b..c7f876e 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeInfo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeInfo.java
@@ -3,6 +3,7 @@
import lombok.Data;
import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
/**
* @Author: liurunyu
@@ -17,13 +18,29 @@
public UpgradeState ugOverallState;
//鍗囩骇浠诲姟RTU鐘舵�佸垪琛�
public List<UpgradeRtu> ugRtuStateList;
-
public String toString(){
+ return this.toString(null) ;
+ }
+
+ public String toString(String logRtuAddr){
StringBuilder sb = new StringBuilder() ;
sb.append("RTU杩滅▼鍗囩骇鐘舵�侊細") ;
sb.append(" \n浠诲姟id锛�" + ugTaskId) ;
sb.append(" \n" + ugOverallState.toString()) ;
- //sb.append(" \n鍗囩骇鐨勬帶鍒跺櫒鎬绘暟锛�" + ugRtuStateList.size()) ;
+ if(ugRtuStateList != null && ugRtuStateList.size() > 0){
+ sb.append(" \n鍗囩骇鐨勬帶鍒跺櫒鎬绘暟锛�" + ugRtuStateList.size()) ;
+ sb.append(" \n鍏朵腑涓�涓帶鍒跺櫒鍗囩骇鎯呭喌锛�") ;
+ AtomicBoolean exist = new AtomicBoolean(false);
+ if(logRtuAddr != null){
+ ugRtuStateList.stream().filter(ur -> ur.getRtuAddr().equals(logRtuAddr)).forEach(ur -> {
+ sb.append(" \n" + ur.toString()) ;
+ exist.set(true);
+ }) ;
+ }
+ if(!exist.get()){
+ sb.append(" \n" + ugRtuStateList.get(0).toString()) ;
+ }
+ }
return sb.toString() ;
}
}
--
Gitblit v1.8.0