From d5dab07dc674de7edbbc1bd6ade0486f54fbdb26 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 06 五月 2025 19:19:35 +0800 Subject: [PATCH] 1、实现万用token(0000-0000-1234-9876-5); 2、web端单独实现命令结果等待器,并修改相关部分; 3、web端实现透传命令; 4、修改一些不当注释; 5、优化一些代码。 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/ParseParamsForUpV2.java | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/ParseParamsForUpV2.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/ParseParamsForUpV2.java index a8c3f1d..bfed77a 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/ParseParamsForUpV2.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/ParseParamsForUpV2.java @@ -6,6 +6,7 @@ public class ParseParamsForUpV2 implements CodeParseParams{ public String protocolName ;//鍗忚鍚嶇О + public Short protocolVersion ;//鍗忚鐗堟湰鍙� public String rtuAddr ;//鎺у埗鍣ㄥ潃 public String upCode ;//涓婅鎶ユ枃鏁版嵁涓殑鍔熻兘鐮� public String upHex ;//琛屾姤鏂囨暟鎹崄鍏繘鍒跺舰寮� @@ -16,21 +17,24 @@ public void clear(){ this.protocolName = null ; - this.rtuAddr = null ; + this.protocolVersion = null ; + this.rtuAddr = null ; this.upCode = null ; this.upHex = null ; this.upBuffer = null ; this.data = null ; } - public void setValue(String protocolName, - String rtuAddr, - String upCode, - String upHex, - byte[] upBuffer, - Data data){ + public void setValue(String protocolName, + Short protocolVersion, + String rtuAddr, + String upCode, + String upHex, + byte[] upBuffer, + Data data){ this.protocolName = protocolName ; - this.rtuAddr = rtuAddr ; + this.protocolVersion = protocolVersion ; + this.rtuAddr = rtuAddr ; this.upCode = upCode ; this.upHex = upHex ; this.upBuffer = upBuffer ; -- Gitblit v1.8.0