From ee711d38f66222915bc81332c98af677fa5cd96c Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期二, 16 七月 2024 22:17:02 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkPreGenObjs.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkPreGenObjs.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkPreGenObjs.java
index 536a3db..8c39b08 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkPreGenObjs.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkPreGenObjs.java
@@ -20,8 +20,12 @@
import java.text.ParseException;
import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
public class TkPreGenObjs extends TaskSurpport {
+
+ private static final Map<String, Boolean> onceUpDataRtus = new HashMap<>();
private static final Logger log = LogManager.getLogger(TkPreGenObjs.class.getName()) ;
@@ -36,6 +40,19 @@
public void execute(Object data) throws ParseException {
Data d = (Data)data ;
String rtuAddr = d.getRtuAddr() ;//TkRtuData閲屽垽鏂簡rtuAddr涓虹┖
+ if(d.subData != null && d.subData instanceof DataV1_0_1){
+ DataV1_0_1 dataV1_0_1 = (DataV1_0_1)d.subData ;
+ if(dataV1_0_1.subData != null && dataV1_0_1.subData instanceof DataCd02Vo){
+ //杩囨护鎺夊績璺虫暟鎹�
+ if(onceUpDataRtus.containsKey(rtuAddr)){
+ return ;
+ }
+ }
+ }
+ if(!onceUpDataRtus.containsKey(rtuAddr)){
+ onceUpDataRtus.put(rtuAddr, true) ;
+ }
+
DbSv sv = (DbSv)SpringContextUtil.getBean(DbSv.class) ;
if(sv != null){
PrController controller = sv.getControllersByRtuAddrAndIntakeNotNull(rtuAddr) ;
@@ -53,8 +70,7 @@
}
}else{
if(d.subData != null && d.subData instanceof DataV1_0_1){
- DataV1_0_1 d1 = (DataV1_0_1)d.subData ;
- clientVo = this.getClient(sv, d1);
+ clientVo = this.getClient(sv, (DataV1_0_1)d.subData);
}
}
//涓嶈鏄惁涓烘祦娴帶鍒跺櫒锛圧TU瀹炰綋锛夛紝閮借杩涜涓嬫宸ヤ綔锛岃褰曞叾涓婃姤鐨勪竴浜涙暟鎹紝褰撶粦瀹氭帶鍒跺櫒鍚庯紝鏁版嵁鑷姩鏈変簡褰掑睘
--
Gitblit v1.8.0