From c929083f415ef98765afec91d5a8c88be4450f5b Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 30 五月 2024 09:16:11 +0800
Subject: [PATCH] 为甘肃嘉峪关项目基于靳总制定协议实现一款产品
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/MidResultFromRtu.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 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 51289ac..f5c44b7 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,5 +1,7 @@
package com.dy.common.mw.protocol;
+import com.dy.common.mw.protocol.p206V1_0_0.*;
+
/**
* 浠嶳TU鏀跺埌鏁版嵁
*/
@@ -26,11 +28,36 @@
ProtocolUnit.getInstance().adapter.getSingleActionFromRtu(this.protocolName).doAction(this);
}
- public void matchedCommand(String commandId, String rtuResultSendWebUrl){
+ public void matchedCommand(String commandId, Object toRtuMidResultParam, 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){
this.data.setRtuResultSendWebUrl(rtuResultSendWebUrl);
--
Gitblit v1.8.0