From c3a0cb8e8d8025e3937149b64a604b8989b2de18 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 03 六月 2025 16:46:24 +0800 Subject: [PATCH] 1、表阀一体机阀门状态命令结果输出与测控一体阀做兼容; 2、虚拟卡状态写入时机进行修改,由原来的阶段写簇变成随时写入。 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd86Vo.java | 37 ++++++++++++++++++++++++++++++++++++- 1 files changed, 36 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 96d3b14..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,12 +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 ;//椤圭洰缂栧彿: @@ -45,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