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/mw/protocol/PrefixedDataAvailablePool.java |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/PrefixedDataAvailablePool.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/PrefixedDataAvailablePool.java
index bb9761b..ba5b121 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/PrefixedDataAvailablePool.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/PrefixedDataAvailablePool.java
@@ -24,22 +24,21 @@
 		List<PrefixedDataAvailable> list = pool.get(className) ;
 		if(list == null){
 			list = new ArrayList<>() ;
-		}else{
+			pool.put(className, list) ;
+		}else if(list.size() > 0){
 			obj = list.get(0) ;
+			list.remove(0) ;
 		}
 		
-		if(obj != null){
-			list.remove(0) ;
-			return obj ;
-		}else{
+		if(obj == null){
 			try {
 				obj = (PrefixedDataAvailable)clazz.getDeclaredConstructor().newInstance() ;
 				//obj = (PrefixedDataAvailable)clazz.newInstance();
 			} catch (Exception e) {
 				throw new Exception( "鐢�" + className + "鐢熸垚瀹炰緥澶辫触锛�");
 			}
-			return obj ;
 		}
+		return obj ;
 	}
 	
 	/**

--
Gitblit v1.8.0