From 276ce2ba5e91523f3c202cce0b0a8bae43630a5e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 03 六月 2025 10:37:21 +0800
Subject: [PATCH] 表阀一体协议与测控一体阀协议进行兼容时，阀门状态位判断未做兼容修改，本次进行修改并进行必要注释。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd86Vo.java | 41 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 40 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd86Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd86Vo.java
index 2b44df6..b972ff2 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd86Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd86Vo.java
@@ -1,11 +1,13 @@
package com.dy.common.mw.protocol.p206V202404.upVos;
+import com.dy.common.mw.protocol.UpComResVo;
+import com.dy.common.mw.protocol.p206V202404.CodeV202404;
import com.dy.common.mw.protocol.p206V202404.CommonV202404;
import lombok.Data;
//鏌ヨ鎺у埗鍣↖P鍦板潃
@Data
-public class DataCd86Vo {
+public class DataCd86Vo implements UpComResVo {
public String controllerType;//鎺у埗鍣ㄧ被鍨�
public Integer projectNo ;//椤圭洰缂栧彿:
@@ -15,6 +17,9 @@
public String comName ;//鍛戒护鍚嶇О
+ public DataCd86Vo(){
+ this.comName = CodeV202404.getCodeName(CodeV202404.cd_86) ;
+ }
public DataCd86Vo(String comName){
this.comName = comName ;
}
@@ -41,4 +46,38 @@
return sb.toString() ;
}
+ public String toStr(boolean showBase){
+ StringBuffer sb = new StringBuffer() ;
+ if(showBase){
+ sb.append(comName + " : \n") ;
+ sb.append("鎺у埗鍣ㄧ被鍨� : ") ;
+ sb.append(CommonV202404.ctrlDevType(controllerType)) ;
+ sb.append("\n") ;
+ sb.append("椤圭洰缂栧彿 : ") ;
+ sb.append(projectNo == null?"鏈煡":projectNo) ;
+ sb.append("\n") ;
+ }
+ sb.append("IP閫氶亾鍙� : ") ;
+ sb.append(channel == null?"鏈煡":channel) ;
+ sb.append("\n") ;
+ sb.append("ip : ") ;
+ sb.append(ip == null?"鏈煡":ip) ;
+ sb.append("\n") ;
+ sb.append("绔彛鍙� : ") ;
+ sb.append(port == null?"鏈煡":port) ;
+ sb.append("\n") ;
+
+ return sb.toString() ;
+ }
+ public String comLog(){
+ StringBuilder sb = new StringBuilder() ;
+ sb.append("鏌ヨ璁惧缁堢IP鍦板潃鍥炲:\n");
+ sb.append(toStr(false)) ;
+ return sb.toString() ;
+ }
+
+ @Override
+ public String comLog(String code) {
+ return null;
+ }
}
--
Gitblit v1.8.0