From 30b41e5c97c0c4a50077e926612ec156b50c8461 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 14 五月 2025 15:49:03 +0800 Subject: [PATCH] 表阀一体协议同步新版本 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd56Vo.java | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 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 4a6758b..2f1d436 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 @@ -1,17 +1,21 @@ package com.dy.common.mw.protocol.p206V202404.upVos; +import com.dy.common.mw.protocol.p206V202404.CodeV202404; import lombok.Data; //鏌ヨ璁惧缁堢鍓╀綑姘撮噺鍜屽墿浣欓噾棰濇姤璀﹀�� @Data public class DataCd56Vo { - public String controllerType;//鎺у埗鍣ㄧ被鍨� 01锛�0x01锛�:娴嬫帶涓�浣撻榾锛�02锛�0x02锛�:琛ㄩ榾涓�浣撴満锛�57(0x57):浜曠數鎺у埗鍣� + public String controllerType;//鎺у埗鍣ㄧ被鍨� public Integer projectNo ;//椤圭洰缂栧彿 public Integer waterAlarm ;//鍓╀綑姘撮噺鎶ヨ鍊�,鍗曚綅:m3銆傛暣鏁帮紝鍙栧�艰寖鍥�0~65535 public Integer moneyAlarm ;//鍓╀綑閲戦鎶ヨ鍊�,鍗曚綅:鍏冦�傛暣鏁帮紝鍙栧�艰寖鍥�0~65535 public String comName ;//鍛戒护鍚嶇О + public DataCd56Vo(){ + this.comName = CodeV202404.getCodeName(CodeV202404.cd_56) ; + } public DataCd56Vo(String comName){ this.comName = comName ; @@ -35,4 +39,24 @@ return sb.toString() ; } + public String toStr(boolean showBase){ + StringBuffer sb = new StringBuffer() ; + if(showBase){ + 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(moneyAlarm == null?"鏈煡":moneyAlarm) ; + sb.append("\n") ; + sb.append("鍓╀綑姘撮噺鎶ヨ鍊� : ") ; + sb.append(waterAlarm == null?"鏈煡":waterAlarm) ; + sb.append("\n") ; + return sb.toString() ; + } + } -- Gitblit v1.8.0