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/DataCd10Vo.java | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 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 eec3712..cbc6584 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,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; //璁剧疆璁惧缁堢鍦板潃 @Data -public class DataCd10Vo { +public class DataCd10Vo implements UpComResVo { public String controllerType;//鎺у埗鍣ㄧ被鍨� public Integer projectNo ;//椤圭洰缂栧彿: @@ -13,6 +15,9 @@ public String comName ;//鍛戒护鍚嶇О + public DataCd10Vo(){ + this.comName = CodeV202404.getCodeName(CodeV202404.cd_10) ; + } public DataCd10Vo(String comName){ this.comName = comName ; } @@ -32,4 +37,18 @@ return sb.toString() ; } + + public String comLog(){ + StringBuilder sb = new StringBuilder() ; + sb.append("璁剧疆璁惧缁堢鍦板潃鍥炲:\n"); + sb.append("鏂板湴鍧�" + rtuNewAddr == null?"鏈煡":rtuNewAddr) ; + sb.append("\n"); + + return sb.toString() ; + } + + @Override + public String comLog(String code) { + return null; + } } -- Gitblit v1.8.0