From 267e622c876bea09b61af34fc93cd08b022aa423 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期四, 05 十二月 2024 14:50:40 +0800 Subject: [PATCH] 1、优化代码; 2、实现新功能:查询RTU设备在通信中间件中的状态。 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd56Vo.java | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd56Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd56Vo.java index 0173230..0e899dc 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd56Vo.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd56Vo.java @@ -7,21 +7,26 @@ public class DataCd56Vo { public String controllerType;//鎺у埗鍣ㄧ被鍨� 01锛�0x01锛�:娴嬫帶涓�浣撻榾锛�57(0x57):浜曠數鎺у埗鍣� - public Integer projectNo ;//鎺у埗鍣ㄧ被鍨� 0x01:娴嬫帶涓�浣撻榾锛�0x57:浜曠數鎺у埗鍣� + public Integer projectNo ;//椤圭洰缂栧彿 public Integer waterAlarm ;//鍓╀綑姘撮噺鎶ヨ鍊�,鍗曚綅:m3銆傛暣鏁帮紝鍙栧�艰寖鍥�0~65535 public Integer moneyAlarm ;//鍓╀綑閲戦鎶ヨ鍊�,鍗曚綅:鍏冦�傛暣鏁帮紝鍙栧�艰寖鍥�0~65535 + public String comName ;//鍛戒护鍚嶇О + + public DataCd56Vo(String comName){ + this.comName = comName ; + } public String toString(){ StringBuffer sb = new StringBuffer() ; - sb.append(" 鏌ヨ璁惧缁堢鍓╀綑姘撮噺鍜屽墿浣欓噾棰濇姤璀﹀�� : \n") ; + sb.append(" " + comName + " : \n") ; sb.append(" 鎺у埗鍣ㄧ被鍨� : ") ; sb.append(controllerType == null?"鏈煡":(controllerType.equals("01")?"娴嬫帶涓�浣撻榾":(controllerType.equals("57")?"浜曠數鎺у埗鍣�":"鏈煡"))) ; sb.append("\n") ; sb.append(" 椤圭洰缂栧彿 : ") ; sb.append(projectNo == null?"鏈煡":projectNo) ; sb.append("\n") ; - sb.append(" 鍓╀綑姘撮噺鎶ヨ鍊� : ") ; + sb.append(" 鍓╀綑閲戦鎶ヨ鍊� : ") ; sb.append(moneyAlarm == null?"鏈煡":moneyAlarm) ; sb.append("\n") ; sb.append(" 鍓╀綑姘撮噺鎶ヨ鍊� : ") ; -- Gitblit v1.8.0