From d9d08181a94d727a4fe5933ac9efd1ff5c8a7c5a Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 16 七月 2025 13:49:13 +0800 Subject: [PATCH] 中间件修改内容: 1、当没农业综合站时即没相关配置项目内容为空时,启动时会产生bug; 2、整理优化代码。 --- 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