From d8eb22351c6d0bfe0c9f233edfd593538e6838c9 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期四, 24 四月 2025 13:58:49 +0800 Subject: [PATCH] 1、表阀一体机协议开阀类型变化; 2、表阀一体机协议开关阀报中增加水价数据; --- 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