From 8910275656c9bf398832dc14957a03684a593e96 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 30 八月 2024 15:16:58 +0800
Subject: [PATCH] 2024-08-30 朱宝民 修改配置文件bug
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataV1_0_1.java | 61 ++----------------------------
1 files changed, 5 insertions(+), 56 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 137c49e..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,68 +9,17 @@
public String rtuAddr ;//RtuAddr
- public DataCd02Vo dataCd02Vo;//閾捐矾妫�娴�
- public DataCd10Vo dataCd10Vo;//璁剧疆RTU鍦板潃
- public DataCd21Vo dataCd21Vo;//璁剧疆IP鍦板潃
- public DataCd65Vo dataCd65Vo;//鏌ヨIP鍦板潃鍜岀鍙�
- public DataCd71Vo dataCd71Vo;//鏌ヨ闃�闂ㄧ姸鎬�
- public DataCd81Vo dataCd81Vo;//闅忔満鑷姤鎶�
- public DataCd83OpenVo dataCd83OpenVo;//寮�闃�鑷姤
- public DataCd83CloseVo dataCd83CloseVo;//鍏抽榾鑷姤
- public DataCd84Vo dataCd84Vo;//寮�闃�宸ヤ綔鎶�
- public DataCd92Vo dataCd92Vo;//寮�闃�搴旂瓟
- public DataCd93Vo dataCd93Vo;//鍏抽榾搴旂瓟
- public DataCd97Vo dataCd97Vo;//APP杩滅▼寮�闃�搴旂瓟
- public DataCd98Vo dataCd98Vo;//APP杩滅▼鍏抽榾搴旂瓟
- public DataCdC0Vo dataCdC0Vo;//缁堢鑷姤瀹炴椂鏁版嵁
+ 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(dataCd10Vo != null){
- sb.append(dataCd10Vo.toString()) ;
- }
- if(dataCd21Vo != null){
- sb.append(dataCd21Vo.toString()) ;
- }
- if(dataCd65Vo != null){
- sb.append(dataCd65Vo.toString()) ;
- }
- if(dataCd71Vo != null){
- sb.append(dataCd71Vo.toString()) ;
- }
- if(dataCd81Vo != null){
- sb.append(dataCd81Vo.toString()) ;
- }
- if(dataCd83OpenVo != null){
- sb.append(dataCd83OpenVo.toString()) ;
- }
- if(dataCd83CloseVo != null){
- sb.append(dataCd83CloseVo.toString()) ;
- }
- if(dataCd84Vo != null){
- sb.append(dataCd84Vo.toString()) ;
- }
- if(dataCd92Vo != null){
- sb.append(dataCd92Vo.toString()) ;
- }
- if(dataCd93Vo != null){
- sb.append(dataCd93Vo.toString()) ;
- }
- if(dataCd97Vo != null){
- sb.append(dataCd97Vo.toString()) ;
- }
- if(dataCd98Vo != null){
- sb.append(dataCd98Vo.toString()) ;
- }
- if(dataCdC0Vo != null){
- sb.append(dataCdC0Vo.toString()) ;
+ if(subData != null){
+ sb.append(subData.toString()) ;
}
return sb.toString() ;
}
--
Gitblit v1.8.0