From c4d56f4a2c7687739f3bf0f43bcc1f35c9bbeb8b Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 14 五月 2025 15:18:44 +0800
Subject: [PATCH] 1、表阀一体协议解析同步新版本；2、默认设备是表阀一体（0x02）
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd10Vo.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd10Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd10Vo.java
index 4ae9598..665d18b 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd10Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd10Vo.java
@@ -1,17 +1,22 @@
package com.dy.common.mw.protocol.p206V202404.upVos;
+import com.dy.common.mw.protocol.p206V202404.CodeV202404;
+import com.dy.common.mw.protocol.p206V202404.CommonV202404;
import lombok.Data;
//璁剧疆璁惧缁堢鍦板潃
@Data
public class DataCd10Vo {
- public String controllerType;//鎺у埗鍣ㄧ被鍨�: 01:娴嬫帶涓�浣撻榾锛�57:浜曠數鎺у埗鍣�
+ public String controllerType;//鎺у埗鍣ㄧ被鍨�
public Integer projectNo ;//椤圭洰缂栧彿:
public String rtuNewAddr ;//鎺у埗鍣ㄦ柊鍦板潃
public String comName ;//鍛戒护鍚嶇О
+ public DataCd10Vo(){
+ this.comName = CodeV202404.getCodeName(CodeV202404.cd_10) ;
+ }
public DataCd10Vo(String comName){
this.comName = comName ;
}
@@ -20,7 +25,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