From 203223860baa19deb6860eb2ba3181910d662980 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 17 四月 2025 14:22:59 +0800
Subject: [PATCH] 1. 轮灌组被终止时灌溉时长为实际数值。2. 计划历史表按照创建时间倒排序。3. 发布计划时判断是否同项目下未完成计划，是否其他项目下使用了本计划的轮灌组且计划未完成。4. 根据计划ID获取计划最新状态。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeInfo.java | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 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 7102291..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,4 +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()) ;
+ 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