From ff3d35c172c5cf5f3ebf8ed710643f8038c3675b Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期三, 07 五月 2025 11:27:52 +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/p206V202404/TkPreGenObjsV202404.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkPreGenObjsV202404.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkPreGenObjsV202404.java index 21a6d95..7ef41eb 100644 --- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkPreGenObjsV202404.java +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkPreGenObjsV202404.java @@ -43,9 +43,9 @@ Data d = (Data)data ; String rtuAddr = d.getRtuAddr() ;//TkRtuData閲屽垽鏂簡rtuAddr涓虹┖ if(d.subData != null && d.subData instanceof DataV202404){ - DataV202404 dataV1 = (DataV202404)d.subData ; - if(dataV1.subData != null && dataV1.subData instanceof DataCd02Vo){ - //杩囨护鎺夊績璺虫暟鎹� + DataV202404 dataV202404 = (DataV202404)d.subData ; + if(dataV202404.subData != null && (dataV202404.subData instanceof DataCd8AVo || dataV202404.subData instanceof DataCd02Vo)){ + //杩囨护鎺夌櫥褰曞拰蹇冭烦鏁版嵁锛屼絾绗竴娆′笉杩囨护 if(onceUpDataRtus.containsKey(rtuAddr)){ return ; } -- Gitblit v1.8.0