From c929083f415ef98765afec91d5a8c88be4450f5b Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期四, 30 五月 2024 09:16:11 +0800 Subject: [PATCH] 为甘肃嘉峪关项目基于靳总制定协议实现一款产品 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataV1_0_1.java | 44 ++++---------------------------------------- 1 files changed, 4 insertions(+), 40 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 05e5b1c..628014d 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,52 +9,16 @@ public String rtuAddr ;//RtuAddr - public DataCd02Vo dataCd02Vo;//閾捐矾妫�娴� - public DataCd10Vo dataCd10Vo;//璁剧疆RTU鍦板潃 - public DataCd21Vo dataCd21Vo;//璁剧疆IP鍦板潃 - public DataCd71Vo dataCd71Vo;//鏌ヨ闃�闂ㄧ姸鎬� - public DataCd83OpenVo dataCd83OpenVo;//寮�闃�鑷姤 - public DataCd83CloseVo dataCd83CloseVo;//鍏抽榾鑷姤 - public DataCd84Vo dataCd84Vo;//寮�闃�宸ヤ綔鎶� - public DataCd92Vo dataCd92Vo;//寮�闃�搴旂瓟 - public DataCd93Vo dataCd93Vo;//鍏抽榾搴旂瓟 - 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(" 缁堢鏁版嵁:\n") ; - 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()) ; + if(subData != null){ + sb.append(subData.toString()) ; } return sb.toString() ; } -- Gitblit v1.8.0