From 86e5bb4399d25e0a4ffa5188d6c0a5cc727efef1 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期四, 21 十二月 2023 15:52:31 +0800
Subject: [PATCH] 2023-12-21 朱宝民 分水房导出
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/tasks/FromRtuConstantTask.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/tasks/FromRtuConstantTask.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/tasks/FromRtuConstantTask.java
index 3009cc9..fbf4b7c 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/tasks/FromRtuConstantTask.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/tasks/FromRtuConstantTask.java
@@ -45,10 +45,10 @@
*/
private Node doDealRtuUpData(Node first, Node last){
if(last != null){
+ //鍦╠ealNode鏂规硶涓紝鍙兘瑕佹妸last浠庨槦鍒椾腑绉婚櫎锛岃繖鏃秎ast.pre涓虹┖锛屾墍浠ユ彁鍓嶆妸last.pre鍙栧嚭鏉�
+ Node pre = last.pre ;
+ dealNode(last) ;
if(first != last){
- //鍦╠ealNode鏂规硶涓紝鍙兘瑕佹妸last浠庨槦鍒椾腑绉婚櫎锛岃繖鏃秎ast.pre涓虹┖锛屾墍浠ユ彁鍓嶆妸last.pre鍙栧嚭鏉�
- Node pre = last.pre ;
- dealNode(last) ;
return pre ;
}else{
//鍋滄
@@ -102,9 +102,11 @@
* @param node 鑺傜偣
*/
private void dealNode(Node node){
- RtuDataNode obj = (RtuDataNode)node.obj ;
- obj.dealSelf() ;
- RtuDataCache.removeNode(node);
+ if(node != null && node.obj != null){
+ RtuDataNode obj = (RtuDataNode)node.obj ;
+ obj.dealSelf() ;
+ RtuDataCache.removeNode(node);
+ }
}
}
--
Gitblit v1.8.0