From 76d5cfc674f9b1033baafbe3ac71f06ed001f289 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期四, 07 三月 2024 10:49:27 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/forTcp/MidResultActionFromRtu.java | 45 ++++++++++++++++++++++++++++++---------------
1 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/forTcp/MidResultActionFromRtu.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/forTcp/MidResultActionFromRtu.java
index f629bc9..b3ac066 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/forTcp/MidResultActionFromRtu.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/forTcp/MidResultActionFromRtu.java
@@ -1,14 +1,16 @@
package com.dy.aceMw.server.forTcp;
+import com.dy.aceMw.server.rtuData.RtuComResultCache;
+import com.dy.aceMw.server.rtuData.RtuComResultNode;
+import com.dy.aceMw.server.rtuData.RtuDataNode;
+import com.dy.aceMw.server.rtuData.RtuDataCache;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import com.dy.aceMw.server.forMq.ToMqMessageCach;
import com.dy.common.mw.protocol.MidResult;
import com.dy.common.mw.protocol.MidResultAction;
import com.dy.common.mw.protocol.MidResultFromRtu;
import com.dy.common.mw.protocol.MidResultToRtu;
-import com.dy.common.util.rtuMq.MessageType;
public class MidResultActionFromRtu implements MidResultAction {
@@ -25,33 +27,46 @@
//姝ゅ瀹炵幇锛屼笌浠ュ墠涓嶄竴鏍凤紝
//浠ュ墠瀹炵幇锛氬尮閰嶅懡浠ゆ槸浠庡悗鍚戝墠鍖归厤锛�
//褰撳墠瀹炵幇锛屽尮閰嶅懡浠ゆ槸浠庡墠鍚戝悗鍖归厤锛屽師鍥狅細涓句緥锛屽綋鎵归噺涓嬪彂琛ュ彫鍛戒护锛屽鏋滀粠鍚庡尮閰嶏紝鍒欏墠闈㈠懡浠や細涓嬪彂澶氭锛屽嵆涓�涓笂鎶ユ鏁版嵁浼氳ˉ鍙娆�
- MidResultToRtu resToRtu = TcpDownCommandCach.matchFromHead(resFromRtu) ;
+ MidResultToRtu resToRtu = TcpDownCommandCache.matchFromHead(resFromRtu) ;
if(resToRtu != null){
//鍖归厤鍒颁笅鍙戠殑鍛戒护
- resFromRtu.setCommandId(resToRtu.commandId) ;
- this.sendResult(false, resFromRtu);
+ resFromRtu.matchedCommand(resToRtu.rtuResultSendWebUrl, resToRtu.commandId) ;
+ this.nextDealRtuData(false, resFromRtu);
+ this.nextDealRtuComResult(resFromRtu);
}else{
- this.sendResult(false, resFromRtu);
+ this.nextDealRtuData(false, resFromRtu);
//鏈尮閰嶅埌涓嬪彂鐨勫懡浠わ紝鍛戒护鍦ㄧ紦瀛樺洜瓒呮椂琚竻闄や簡
RtuStatusDealer.commandFail2Success(resFromRtu.rtuAddr) ;
}
}else{
//涓诲姩涓婃姤鏁版嵁
- this.sendResult(true, resFromRtu);
+ this.nextDealRtuData(true, resFromRtu);
}
}
}
- private void sendResult(boolean reportOrResponse_trueOrFalse, MidResultFromRtu resFromRtu){
+
+ /**
+ * 杩涘叆澶氱嚎绋嬬幆澧冧腑杩愯
+ * @param reportOrResponse_trueOrFalse
+ * @param resFromRtu
+ */
+ private void nextDealRtuData(boolean reportOrResponse_trueOrFalse, MidResultFromRtu resFromRtu){
try{
- String json = resFromRtu.data.toJson() ;
- if(reportOrResponse_trueOrFalse){
- ToMqMessageCach.cachObj(MessageType.RtuAutoReport, json);
- }else{
- ToMqMessageCach.cachObj(MessageType.RtuCmdResponse, json);
- }
+ RtuDataCache.cacheRtuUpData(reportOrResponse_trueOrFalse, new RtuDataNode(resFromRtu.data));
}catch(Exception e){
log.error(e.getMessage(), e);
}
-
+ }
+
+ /**
+ * 杩涘叆鍗曠嚎绋嬬幆澧冧腑杩愯
+ * @param resFromRtu
+ */
+ private void nextDealRtuComResult(MidResultFromRtu resFromRtu){
+ try{
+ RtuComResultCache.cacheRtuComResult(new RtuComResultNode(resFromRtu.data));
+ }catch(Exception e){
+ log.error(e.getMessage(), e);
+ }
}
}
--
Gitblit v1.8.0