From 7d885c1d4c86f40927af50e6e7bfa13aac0c2180 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 21 十二月 2023 21:47:15 +0800
Subject: [PATCH] 1、common模块优化代码，Command命令中增加RTU命令结果返回webRul; 2、通信中间件增加了接收http下发RTU命令和内部命令的Controler； 3、RTU模拟器和控制器增加了上报完数据是否关闭TCP连接的控制。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCdC0Vo.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCdC0Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCdC0Vo.java
index 997792e..79a731d 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCdC0Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCdC0Vo.java
@@ -41,10 +41,14 @@
sb.append(" 鎺у埗鍣ㄦ椂閽燂細");
sb.append(rtuDt==null?"":rtuDt);
sb.append("\n");
- sb.append(alarmVo==null?"":alarmVo.toString());
- sb.append("\n");
- sb.append(stateVo==null?"":stateVo.toString());
- sb.append("\n");
+ if(alarmVo != null){
+ sb.append(alarmVo.toString());
+ sb.append("\n");
+ }
+ if(stateVo != null){
+ sb.append(stateVo.toString());
+ sb.append("\n");
+ }
return sb.toString() ;
}
--
Gitblit v1.8.0