From 5c3ba107b6fe756c5eab6cc83bb18ad0c8c5d9ec Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 07 五月 2024 21:10:52 +0800
Subject: [PATCH] 实现王江海制定的协议实现到3.30节(功能码0x87)

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

diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/TkRtuData.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/TkRtuData.java
index 23f334c..ca9c35c 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/TkRtuData.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/TkRtuData.java
@@ -19,10 +19,15 @@
 	public void execute(Object data) {
 		Data d = (Data)data ;
 		String rtuAddr = d.getRtuAddr() ;
-		if(rtuAddr == null){
+		if(rtuAddr == null || rtuAddr.trim().equals("")){
 			log.error("涓ラ噸閿欒锛孯TU涓婅鏁版嵁涓棤RTU鍦板潃锛�" );
 		}else{
-			this.toNextTasks(data);
+			String protocol = d.getProtocol() ;
+			if(protocol == null || protocol.trim().equals("")){
+				log.error("涓ラ噸閿欒锛孯TU涓婅鏁版嵁涓棤鍗忚鍚嶇О锛�" );
+			}else{
+				this.toNextTasks(data);
+			}
 		}
 	}
 

--
Gitblit v1.8.0