From a5e68895029a10d6134df9d13c6925c752bf1f7b Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 08 一月 2024 13:10:44 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataV1_0_1.java | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 insertions(+), 2 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 78675d2..05e5b1c 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
@@ -10,11 +10,15 @@
public String rtuAddr ;//RtuAddr
public DataCd02Vo dataCd02Vo;//閾捐矾妫�娴�
- public DataCdC0Vo dataCdC0Vo;//缁堢鑷姤瀹炴椂鏁版嵁
+ public DataCd10Vo dataCd10Vo;//璁剧疆RTU鍦板潃
+ public DataCd21Vo dataCd21Vo;//璁剧疆IP鍦板潃
+ public DataCd71Vo dataCd71Vo;//鏌ヨ闃�闂ㄧ姸鎬�
public DataCd83OpenVo dataCd83OpenVo;//寮�闃�鑷姤
public DataCd83CloseVo dataCd83CloseVo;//鍏抽榾鑷姤
public DataCd84Vo dataCd84Vo;//寮�闃�宸ヤ綔鎶�
- public DataCd71Vo dataCd71Vo;//鏌ヨ闃�闂ㄧ姸鎬�
+ public DataCd92Vo dataCd92Vo;//寮�闃�搴旂瓟
+ public DataCd93Vo dataCd93Vo;//鍏抽榾搴旂瓟
+ public DataCdC0Vo dataCdC0Vo;//缁堢鑷姤瀹炴椂鏁版嵁
public String dt ;//閫氫俊涓棿浠朵骇鐢熷彂鎶ユ椂闂�(yyyy-MM-dd hh:mm:ss)
@@ -25,6 +29,33 @@
if(dataCd02Vo != null){
sb.append(dataCd02Vo.toString()) ;
}
+ if(dataCd10Vo != null){
+ sb.append(dataCd10Vo.toString()) ;
+ }
+ if(dataCd21Vo != null){
+ sb.append(dataCd21Vo.toString()) ;
+ }
+ if(dataCd71Vo != null){
+ sb.append(dataCd71Vo.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(dataCdC0Vo != null){
+ sb.append(dataCdC0Vo.toString()) ;
+ }
return sb.toString() ;
}
}
--
Gitblit v1.8.0