From f74db84df0e3797e0a2db1faa50adcb778a5150a Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 27 六月 2025 11:33:35 +0800
Subject: [PATCH] 1、完善水肥、墒情、气象相关Mapper代码； 2、解决表阀一体机远程关阀出现的订单号不一致专制不能关阀问题（王江海测试发现）。
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/tasks/RtuUpTask.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/tasks/RtuUpTask.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/tasks/RtuUpTask.java
index 387bb42..06c34ed 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/tasks/RtuUpTask.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/tasks/RtuUpTask.java
@@ -104,7 +104,7 @@
*/
//璁剧疆鏀跺埌鏁版嵁鏃跺埢
- TcpSessionCache.cacheUpDataTime(rtuAddr);
+ TcpSessionCache.whenUpData(rtuAddr);
if(protocolName != null){
//瀵逛笂琛屾暟鎹繘琛屽鐞�
@@ -179,7 +179,14 @@
}else{
MidResult[] midRs = dri.parseData(ServerProperties.isLowPower, rtuAddrAtHead, upBuf, upHex, new DriverParserDataCallback(){
@Override
- public void callback(String rtuAddrAtHead, String code, String codeName, String upHex, Boolean reportOrResponse_trueOrFalse, boolean parseFail, String rtuAddrInData) {
+ public void callback(String rtuAddrAtHead,
+ String code,
+ String codeName,
+ String upHex,
+ Boolean reportOrResponse_trueOrFalse,
+ boolean parseFail,
+ String rtuAddrInData,
+ Object ...objs) {
//鏇存柊缁堢鐘舵��
if(rtuAddrInData != null && !rtuAddrInData.equals(rtuAddrAtHead)){
//鏁版嵁澶翠腑鐨凴TU鍦板潃涓庢暟鎹腑鐨凴TU鍦板潃涓嶄竴鑷达紝鏇存崲鎴愭暟鎹腑鐨凴TU鍦板潃
@@ -230,7 +237,7 @@
@Override
public void exception(Exception e) {
}
- });
+ }, objs);
}
}) ;
if(midRs != null){
--
Gitblit v1.8.0