From e407fcf19e50ed0972e7262d99da4b3a83d08706 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 11 十月 2024 17:08:23 +0800
Subject: [PATCH] 1、修改协议驱动RTU上行数据解析出错时，RTU上下行数据日志中的RTU地址不正确的bug; 2、83功能码上行数据测试main方法实现。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataV1_0_1.java | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataV1_0_1.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataV1_0_1.java
index 5fb7201..718adcc 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataV1_0_1.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataV1_0_1.java
@@ -9,20 +9,17 @@
public String rtuAddr ;//RtuAddr
- public DataCd02Vo dataCd02Vo;//閾捐矾妫�娴�
- public DataCdC0Vo dataCdC0Vo;//缁堢鑷姤瀹炴椂鏁版嵁
- public DataCd83OpenVo dataCd83OpenVo;//寮�闃�鑷姤
- public DataCd83CloseVo dataCd83CloseVo;//鍏抽榾鑷姤
- public DataCd84Vo dataCd84Vo;//寮�闃�宸ヤ綔鎶�
+ public Object subData ;
- public String dt ;//閫氫俊涓棿浠朵骇鐢熷彂鎶ユ椂闂�(yyyy-MM-dd hh:mm:ss)
+ public String dt ;//閫氫俊涓棿浠朵骇鐢熺殑鏀舵姤鏃堕棿(yyyy-MM-dd hh:mm:ss)
public String toString(){
StringBuffer sb = new StringBuffer() ;
sb.append(" 鎺у埗鍣ㄥ湴鍧� : " + (rtuAddr==null?"":rtuAddr) + "\n") ;
+ sb.append(" 鎺ユ敹鏁版嵁鏃堕棿 : " + (dt==null?"":dt) + "\n") ;
sb.append(" 缁堢鏁版嵁:\n") ;
- if(dataCd02Vo != null){
- sb.append(dataCd02Vo.toString()) ;
+ if(subData != null){
+ sb.append(subData.toString()) ;
}
return sb.toString() ;
}
--
Gitblit v1.8.0