From 854e951894deaa54b26590f8575474ed7a5f5b88 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期二, 02 七月 2024 10:32: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 | 40 +++++++++++++++++++++++++++++++++++++---
1 files changed, 37 insertions(+), 3 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 e6efa2e..62278cc 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,9 @@
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鏀跺埌鏁版嵁
*/
@@ -11,9 +15,10 @@
}
public String commandId ;//鍙戦�佸懡浠ょ殑ID锛屽鏋滄槸鍛戒护缁撴灉锛屽苟涓斿尮閰嶄簡涓嬪彂鍛戒护锛屾鍊间笉涓虹┖
-
+
+ public String rtuResultSendWebUrl ;//rtu杩斿洖鍛戒护缁撴灉 鍙戝悜鐩殑鍦皐eb URL
public String protocolName ;//鍗忚鍚嶇О
- public String rtuAddr ;//IMEI鍙�
+ public String rtuAddr ;//Rtu鍦板潃
public String upCode ;//涓婅鏁版嵁涓殑鍔熻兘鐮�
public String upHex ;//涓婅鏁版嵁鍗佸叚杩涘埗褰㈠紡
public byte[] upBuffer ;//涓婅鏁版嵁瀛楄妭鏁扮粍
@@ -25,11 +30,40 @@
ProtocolUnit.getInstance().adapter.getSingleActionFromRtu(this.protocolName).doAction(this);
}
- public void setCommandId(String commandId){
+ 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