From 1e6561acc89b7105c1dcbf5395845d6046f1453d Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 21 二月 2025 16:55:09 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/OnLineV1.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/OnLineV1.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/OnLineV1.java
index 20f1359..eb8c50a 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/OnLineV1.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/OnLineV1.java
@@ -6,6 +6,7 @@
@AnnotationOnLine(
enable = true,
protocolName = ProtocolConstantV206V1.protocolName,
+ protocolVersion = ProtocolConstantV206V1.protocolVer,
priority = ProtocolConstantV206V1.priority)
@SuppressWarnings("unused")
public class OnLineV1 implements OnLine{
@@ -19,19 +20,19 @@
public OnLineResult parse(byte[] upBuf)throws Exception {
OnLineResult olr = new OnLineResult() ;
CommonV1 cp = new CommonV1() ;
- 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 ;
}else{
//鏄湰鍗忚鏁版嵁
olr.result = OnLine.OnLineAction_success ;
- olr.rtuAddr = cp.parseRtuAddr(upBuf) ;
+ olr.rtuAddr = cp.parseRtuAddr(upBuf, isThis_p206Pgu[1]) ;
olr.protocolName = ProtocolConstantV206V1.protocolName ;
olr.protocolVersion = ProtocolConstantV206V1.protocolVer ;
}
--
Gitblit v1.8.0