From 1878514e0f33afba547955bd1bbc66318a05af88 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 22 十一月 2024 10:09:20 +0800
Subject: [PATCH] 升级演示程序逻辑修改
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/OnLineV2.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/OnLineV2.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/OnLineV2.java
index 090d655..078625e 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/OnLineV2.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/OnLineV2.java
@@ -2,6 +2,7 @@
import com.dy.common.mw.protocol.AnnotationOnLine;
import com.dy.common.mw.protocol.OnLine;
+import com.dy.common.mw.protocol.p206V1.ProtocolConstantV206V1;
@AnnotationOnLine(
enable = true,
@@ -19,12 +20,12 @@
public OnLineResult parse(byte[] upBuf)throws Exception {
OnLineResult olr = new OnLineResult() ;
CommonV2 cp = new CommonV2() ;
- Boolean flag = cp.isThisProtocolHead(upBuf) ;
- if(flag == null){
+ Boolean[] isThis_p206Pgu = cp.isThisProtocolHead(upBuf) ;
+ if(isThis_p206Pgu == null || isThis_p206Pgu.length != 2){
//鍑洪敊
olr.result = OnLine.OnLineAction_fail ;
olr.rtuAddr = null ;
- }else if(!flag.booleanValue()){
+ }else if(!isThis_p206Pgu[0].booleanValue()){
//涓嶆槸鏈崗璁暟鎹�
olr.result = OnLine.OnLineAction_success_noMe ;
olr.rtuAddr = null ;
@@ -33,6 +34,7 @@
olr.result = OnLine.OnLineAction_success ;
olr.rtuAddr = cp.parseRtuAddr(upBuf) ;
olr.protocolName = ProtocolConstantV206V2.protocolName ;
+ olr.protocolVersion = cp.parseVersion(upBuf) ;
}
return olr;
}
--
Gitblit v1.8.0