From a5b7ba070f03327f8848593a31c44cc79e7bb24a Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期四, 11 七月 2024 21:53:14 +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 | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 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..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
@@ -31,6 +31,33 @@
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