From cb46d99ac8c302334e8c39600de0d9a4ffbf5533 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 29 十月 2024 09:39:48 +0800
Subject: [PATCH] 1、删除global模块中Contant中的一些无用代码; 2、删除global模块中一些无用的备份; 3、一些有继承关系并注解有@Data的类中增加注解@EqualsAndHashCode(callSuper=false),防止编译时警告
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/MidResultActionFromRtu.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/MidResultActionFromRtu.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/MidResultActionFromRtu.java
index ff772d0..7de3eba 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/MidResultActionFromRtu.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/MidResultActionFromRtu.java
@@ -30,10 +30,11 @@
MidResultToRtu resToRtu = TcpDownCommandCache.matchFromHead(resFromRtu) ;
if(resToRtu != null){
//鍖归厤鍒颁笅鍙戠殑鍛戒护
- resFromRtu.matchedCommand(resToRtu.commandId, resToRtu.param, resToRtu.rtuResultSendWebUrl) ;
+ resFromRtu.matchedCommand(resToRtu.commandId, resToRtu.rtuResultSendWebUrl) ;
this.nextDealRtuData(false, resFromRtu);
this.nextDealRtuComResult(resFromRtu);
}else{
+ log.error("鍖归厤鍛戒护澶辫触锛屽姛鑳界爜鏄細" + ((MidResultFromRtu) result).upCode );
this.nextDealRtuData(false, resFromRtu);
//鏈尮閰嶅埌涓嬪彂鐨勫懡浠わ紝鍛戒护鍦ㄧ紦瀛樺洜瓒呮椂琚竻闄や簡
RtuStatusDealer.commandFail2Success(resFromRtu.rtuAddr) ;
--
Gitblit v1.8.0