From a13544fb6dcc1c4abce1e34f82cdd4669b1694e0 Mon Sep 17 00:00:00 2001 From: Administrator <zhubaomin> Date: 星期三, 26 六月 2024 15:21:52 +0800 Subject: [PATCH] 2024-06-26 朱宝民 鉴权 token改为Token --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataV1_0_1.java | 28 ++++------------------------ 1 files changed, 4 insertions(+), 24 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 c8c3116..ef1095f 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,36 +9,16 @@ public String rtuAddr ;//RtuAddr - public DataCd02Vo dataCd02Vo;//閾捐矾妫�娴� - public DataCdC0Vo dataCdC0Vo;//缁堢鑷姤瀹炴椂鏁版嵁 - public DataCd83OpenVo dataCd83OpenVo;//寮�闃�鑷姤 - public DataCd83CloseVo dataCd83CloseVo;//鍏抽榾鑷姤 - public DataCd84Vo dataCd84Vo;//寮�闃�宸ヤ綔鎶� - public DataCd71Vo dataCd71Vo;//鏌ヨ闃�闂ㄧ姸鎬� + 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(dataCdC0Vo != null){ - sb.append(dataCdC0Vo.toString()) ; - } - if(dataCd83OpenVo != null){ - sb.append(dataCd83OpenVo.toString()) ; - } - if(dataCd83CloseVo != null){ - sb.append(dataCd83CloseVo.toString()) ; - } - if(dataCd84Vo != null){ - sb.append(dataCd84Vo.toString()) ; - } - if(dataCd71Vo != null){ - sb.append(dataCd71Vo.toString()) ; + if(subData != null){ + sb.append(subData.toString()) ; } return sb.toString() ; } -- Gitblit v1.8.0