From 6de539c46205a6e26eaab24be2e1a21f9054af08 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 16 一月 2024 17:10:14 +0800
Subject: [PATCH] 1、完善通信中单件对上行数据处理的逻辑及代码

---
 pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkPreGenObjs.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkPreGenObjs.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkPreGenObjs.java
index 142c96b..7f541d1 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkPreGenObjs.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkPreGenObjs.java
@@ -32,9 +32,9 @@
 		String rtuAddr = d.getRtuAddr() ;//TkRtuData閲屽垽鏂簡rtuAddr涓虹┖
 		DbSv sv = (DbSv)SpringContextUtil.getBean(DbSv.class) ;
 		if(sv != null){
-			PrController controller = sv.getPrControllerByRtuAddr(rtuAddr) ;
+			PrController controller = sv.getControllersByRtuAddrAndIntakeNotNull(rtuAddr) ;
 			if(controller == null){
-				//鏁版嵁搴撲腑鏈煡璇㈠埌鎺у埗鍣紙RTU瀹炰綋锛�
+				//鏁版嵁搴撲腑鏈煡璇�(宸茬粡缁戝畾涓旀帶鍒跺櫒鍦板潃鐩哥)鍒版帶鍒跺櫒锛圧TU瀹炰綋锛�
 				//娴佹氮鑰呮帶鍒跺櫒
 				PrControllerTramp rtuTramp = sv.getPrControllerTrampByRtuAddr(rtuAddr);
 				if(rtuTramp == null){

--
Gitblit v1.8.0