From d9765e031e100e1d8eea34e086cb9c81766e1a00 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期五, 21 二月 2025 09:52:14 +0800 Subject: [PATCH] 针对王江海制定的协议: 1、优化相关注释; 2、优化代码; 3、协议中报警信息有变化:外门报警改为电池电压报警、增加阀门开关状态、增加阀门堵转报警等。 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd9AVo.java | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd9AVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd9AVo.java index 9c4b06d..c49025c 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd9AVo.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd9AVo.java @@ -2,27 +2,32 @@ import lombok.Data; -//娓呯┖璁惧缁堢鏃ヨ褰� +//鏌ヨ璁惧骞寸敤姘撮噺 @Data public class DataCd9AVo { - public String controllerType;//鎺у埗鍣ㄧ被鍨�: 01:娴嬫帶涓�浣撻榾锛�57:浜曠數鎺у埗鍣� - public Integer projectNo ;//椤圭洰缂栧彿: - public Boolean success ;//鍛戒护缁撴灉锛坱rue鎴愬姛, false澶辫触锛� + public String controllerType;//鎺у埗鍣ㄧ被鍨� 01锛�0x01锛�:娴嬫帶涓�浣撻榾锛�57(0x57):浜曠數鎺у埗鍣� + public Integer projectNo ;//椤圭洰缂栧彿 + public Integer maxAmountYear ;//璁惧缁堢骞寸敤姘撮噺 鍗曚綅锛歮3 鏁存暟锛屽彇鍊艰寖鍥�0~99999999 + + public String comName ;//鍛戒护鍚嶇О + + public DataCd9AVo(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(success == null?"鏈煡":(success?"鎴愬姛":"澶辫触")) ; + sb.append(" 骞寸敤姘撮噺 : ") ; + sb.append(maxAmountYear == null?"鏈煡":maxAmountYear) ; sb.append("\n") ; - return sb.toString() ; } -- Gitblit v1.8.0