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/OnLineV2.java | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 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 new file mode 100644 index 0000000..9fd8559 --- /dev/null +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/OnLineV2.java @@ -0,0 +1,42 @@ +package com.dy.common.mw.protocol.p206V2; + +import com.dy.common.mw.protocol.AnnotationOnLine; +import com.dy.common.mw.protocol.OnLine; + +@AnnotationOnLine( + enable = true, + protocolName = ProtocolConstantV206V2.protocolName, + protocolVersion = ProtocolConstantV206V2.protocolVer, + priority = ProtocolConstantV206V2.priority) +@SuppressWarnings("unused") +public class OnLineV2 implements OnLine{ + + /** + * 瀵逛笂绾挎暟鎹繘琛屽垎鏋� + * @param upBuf 涓婅鏁版嵁 + * @return + */ + @Override + public OnLineResult parse(byte[] upBuf)throws Exception { + OnLineResult olr = new OnLineResult() ; + CommonV2 cp = new CommonV2() ; + Boolean[] isThis_p206Pgu = cp.isThisProtocolHead(upBuf) ; + if(isThis_p206Pgu == null || isThis_p206Pgu.length != 2){ + //鍑洪敊 + olr.result = OnLine.OnLineAction_fail ; + olr.rtuAddr = null ; + }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.protocolName = ProtocolConstantV206V2.protocolName ; + olr.protocolVersion = cp.parseVersion(upBuf) ; + } + return olr; + } + +} -- Gitblit v1.8.0