From ad11539a5a924ffdae6eab96a74f1ab81475eb8f Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期一, 02 九月 2024 14:23:56 +0800
Subject: [PATCH] 优化代码 指定时间段开发时间超过指定值的农户         指定时间段开发时间低于指定值的农户

---
 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