From ae844683ede273edad59085227e36ae3ce02de06 Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期二, 22 十月 2024 09:25:30 +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/MidResultFromRtu.java | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/MidResultFromRtu.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/MidResultFromRtu.java index 62278cc..7116f14 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/MidResultFromRtu.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/MidResultFromRtu.java @@ -1,9 +1,5 @@ package com.dy.common.mw.protocol; -import com.dy.common.mw.protocol.p206V1_0_0.*; -import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd97Vo; -import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd98Vo; - /** * 浠嶳TU鏀跺埌鏁版嵁 */ @@ -30,11 +26,12 @@ ProtocolUnit.getInstance().adapter.getSingleActionFromRtu(this.protocolName).doAction(this); } - public void matchedCommand(String commandId, Object toRtuMidResultParam, String rtuResultSendWebUrl){ + public void matchedCommand(String commandId, String rtuResultSendWebUrl){ this.commandId = commandId ; if(this.data != null){ this.data.setCommandId(commandId); } + /* if(toRtuMidResultParam != null){ if(protocolName != null && protocolName.equals(ProtocolConstantV206V1_0_0.protocolName)){ if(upCode != null && upCode.equals(CodeV1_0_1.cd_97)){ @@ -60,6 +57,7 @@ } } } + */ this.rtuResultSendWebUrl = rtuResultSendWebUrl ; if(this.data != null){ this.data.setRtuResultSendWebUrl(rtuResultSendWebUrl); -- Gitblit v1.8.0