From 7a30cb7329eb065d9a95213b327818412c2d5d0e Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期一, 03 三月 2025 14:22:22 +0800 Subject: [PATCH] 1、表阀一体机新协议解析优化; 2、取水口实体编辑更新逻辑修改,去除引起bug的代码。 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd9AVo.java | 7 ++++--- 1 files changed, 4 insertions(+), 3 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 c1c590f..cd1beec 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 @@ -1,13 +1,14 @@ package com.dy.common.mw.protocol.p206V202404.upVos; +import com.dy.common.mw.protocol.p206V202404.CommonV202404; import lombok.Data; //鏌ヨ璁惧骞寸敤姘撮噺 @Data public class DataCd9AVo { - public String controllerType;//鎺у埗鍣ㄧ被鍨� 01锛�0x01锛�:娴嬫帶涓�浣撻榾锛�57(0x57):浜曠數鎺у埗鍣� - public Integer projectNo ;//鎺у埗鍣ㄧ被鍨� 0x01:娴嬫帶涓�浣撻榾锛�0x57:浜曠數鎺у埗鍣� + public String controllerType;//鎺у埗鍣ㄧ被鍨� + public Integer projectNo ;//椤圭洰缂栧彿 public Integer maxAmountYear ;//璁惧缁堢骞寸敤姘撮噺 鍗曚綅锛歮3 鏁存暟锛屽彇鍊艰寖鍥�0~99999999 public String comName ;//鍛戒护鍚嶇О @@ -20,7 +21,7 @@ StringBuffer sb = new StringBuffer() ; sb.append(" " + comName + " : \n") ; sb.append(" 鎺у埗鍣ㄧ被鍨� : ") ; - sb.append(controllerType == null?"鏈煡":(controllerType.equals("01")?"娴嬫帶涓�浣撻榾":(controllerType.equals("57")?"浜曠數鎺у埗鍣�":"鏈煡"))) ; + sb.append(CommonV202404.ctrlDevType(controllerType)) ; sb.append("\n") ; sb.append(" 椤圭洰缂栧彿 : ") ; sb.append(projectNo == null?"鏈煡":projectNo) ; -- Gitblit v1.8.0