From 6cf345bc8fe98d393320b89182f9293171aa19ff Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 22 四月 2025 16:39:55 +0800
Subject: [PATCH] 1、根据江海协议中开阀类型变化，修改相应代码； 2、江海协议RTU模拟器启动参数注释。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/MidResultFromRtu.java | 30 ++----------------------------
1 files changed, 2 insertions(+), 28 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 f5c44b7..a7464d6 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,7 +1,5 @@
package com.dy.common.mw.protocol;
-import com.dy.common.mw.protocol.p206V1_0_0.*;
-
/**
* 浠嶳TU鏀跺埌鏁版嵁
*/
@@ -16,6 +14,7 @@
public String rtuResultSendWebUrl ;//rtu杩斿洖鍛戒护缁撴灉 鍙戝悜鐩殑鍦皐eb URL
public String protocolName ;//鍗忚鍚嶇О
+ public Short protocolVersion ;//鍗忚鐗堟湰鍙�
public String rtuAddr ;//Rtu鍦板潃
public String upCode ;//涓婅鏁版嵁涓殑鍔熻兘鐮�
public String upHex ;//涓婅鏁版嵁鍗佸叚杩涘埗褰㈠紡
@@ -28,35 +27,10 @@
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)){
- if(data.subData != null && data.subData instanceof DataV1_0_1){
- DataV1_0_1 dataV1_0_1 = (DataV1_0_1)data.subData ;
- if(dataV1_0_1 != null && dataV1_0_1.subData != null && dataV1_0_1.subData instanceof DataCd97Vo){
- DataCd97Vo dataCd97Vo = (DataCd97Vo)dataV1_0_1.subData ;
- if(dataCd97Vo != null && dataCd97Vo.cardNo != null){
- dataCd97Vo.cardNo = (String)toRtuMidResultParam + dataCd97Vo.cardNo ;
- }
- }
- }
- }else if(upCode != null && upCode.equals(CodeV1_0_1.cd_98)){
- if(data.subData != null && data.subData instanceof DataV1_0_1){
- DataV1_0_1 dataV1_0_1 = (DataV1_0_1)data.subData ;
- if(dataV1_0_1 != null && dataV1_0_1.subData != null && dataV1_0_1.subData instanceof DataCd98Vo){
- DataCd98Vo dataCd98Vo = (DataCd98Vo)dataV1_0_1.subData ;
- if(dataCd98Vo != null && dataCd98Vo.cardNo != null){
- dataCd98Vo.cardNo = (String)toRtuMidResultParam + dataCd98Vo.cardNo ;
- }
- }
- }
- }
- }
}
this.rtuResultSendWebUrl = rtuResultSendWebUrl ;
if(this.data != null){
--
Gitblit v1.8.0