From f5a10d5ae1290d8ceefee143815555d59be6ff9a Mon Sep 17 00:00:00 2001 From: Administrator <zhubaomin> Date: 星期四, 23 五月 2024 08:50:58 +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/p206V202404/upVos/DataCd83Vo.java | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd83Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd83Vo.java index f0e1586..9260479 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd83Vo.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd83Vo.java @@ -16,11 +16,18 @@ public Double waterUserTotalAmountDay ;// 褰撴棩鐢ㄦ埛鐢ㄦ按閲� public Double lossTotalAmountDay ;// 婕忔崯姘撮噺 public Double batteryVolt ;//鍚庡鐢垫睜鐢靛帇 - public Double rtuDt ;//涓婃姤鏃堕棿锛坹yyy-mm-dd HH锛� + public String dataDt ;//鏁版嵁鏃堕棿锛坹yyy-mm-dd锛� + public String rtuDt ;//RTU鏃堕挓锛堜笂鎶ユ椂鍒伙級锛坹yyy-mm-dd HH:00:00锛� + + public String comName ;//鍛戒护鍚嶇О + + public DataCd83Vo(String comName){ + this.comName = comName ; + } public String toString(){ StringBuffer sb = new StringBuffer() ; - sb.append(" 鏈轰簳瀹氱偣涓婃姤(姣忓ぉ12鐐逛笂鎶�) : \n") ; + sb.append(" " + comName + " : \n") ; sb.append(" 鎺у埗鍣ㄧ被鍨� : ") ; sb.append(controllerType == null?"鏈煡":(controllerType.equals("01")?"娴嬫帶涓�浣撻榾":(controllerType.equals("57")?"浜曠數鎺у埗鍣�":"鏈煡"))) ; sb.append("\n") ; -- Gitblit v1.8.0