From 9281643d18bc2e0aaffed3c5f216d1df12d68424 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期四, 18 一月 2024 09:44:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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