From 4faf659ac4d1287d41d1a9afab3c302356100185 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 29 八月 2024 10:11:04 +0800
Subject: [PATCH] 在pipIrr-web-remote模块中实现RTU上下行数据日志下载功能RtuLogCtrl.java， 为此在pipIrr-global模块中增加了ByteArrayHttpMessageConverter.java和ByteArrayHttpMessageConverterConfig.java pipIrr-global模块的application-global.yml文件中增加了通信中间件相关URL
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/tasks/RtuUpTask.java | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 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 167f7d7..bedf45e 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
@@ -78,18 +78,33 @@
}
}
}
-
if(rtuAddr != null){
- if(protocolName == null){
- protocolName = TcpSessionCache.getTcpProtocolName(rtuAddr) ;
+ boolean toDeal = true ;
+ if(ServerProperties.onlyDealRtusTest){
+ boolean find = false ;
+ for(String testRtu : ServerProperties.onlyDealRtus){
+ if(testRtu.equals(rtuAddr)){
+ find = true ;
+ break ;
+ }
+ }
+ if(!find){
+ //涓嶅湪澶勭悊鑼冨洿鍐�
+ toDeal = false ;
+ }
}
-
- //璁剧疆鏀跺埌鏁版嵁鏃跺埢
- TcpSessionCache.cacheUpDataTime(rtuAddr);
-
- if(protocolName != null){
- //瀵逛笂琛屾暟鎹繘琛屽鐞�
- this.dealUpData(session, rtuAddr, protocolName, isOnLine, upBuf, upHex) ;
+ if(toDeal){
+ if(protocolName == null){
+ protocolName = TcpSessionCache.getTcpProtocolName(rtuAddr) ;
+ }
+
+ //璁剧疆鏀跺埌鏁版嵁鏃跺埢
+ TcpSessionCache.cacheUpDataTime(rtuAddr);
+
+ if(protocolName != null){
+ //瀵逛笂琛屾暟鎹繘琛屽鐞�
+ this.dealUpData(session, rtuAddr, protocolName, isOnLine, upBuf, upHex) ;
+ }
}
}
}
--
Gitblit v1.8.0